Unverified Commit 508e9ee6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'networkException-copy-checkin'

parents 4569273f ce1beda1

share/locales/de_DE.po

+3 −0
Original line number Diff line number Diff line
@@ -839,6 +839,9 @@ msgstr "Teilen" 
msgid "status.check-out"

msgstr "Auschecken"



msgid "status.copy-checkin"

msgstr "Mitfahren"



#, noun or verb

msgid "status.boarding-in.pre"

msgstr "Einfahrt in"

share/locales/en_GB.po

+3 −0
Original line number Diff line number Diff line
@@ -836,6 +836,9 @@ msgstr "Share" 
msgid "status.check-out"

msgstr "check out"



msgid "status.copy-checkin"

msgstr "Join in"



#, noun or verb

msgid "status.boarding-in.pre"

msgstr "arrives in"

templates/_public_status_card.html.ep

+25 −0
Original line number Diff line number Diff line
@@ -294,6 +294,31 @@ 
				</div>

			% }

		</div>

		% if (is_user_authenticated() and not get_user_status()->{checked_in}) {

			<div class="card-action" style="display: flex; justify-content: end">

				<a class="blue-text action-checkin" style="margin-right: 0;"

					% if ( $journey->{is_dbris} ) {

						data-dbris="<%= $journey->{backend_name} %>"

					% }

					% elsif ( $journey->{is_efa} ) {

						data-efa="<%= $journey->{backend_name} %>"

					% }

					% elsif ( $journey->{is_hafas} ) {

						data-hafas="<%= $journey->{backend_name} %>"

					% }

					% elsif ( $journey->{is_motis} ) {

						data-motis="<%= $journey->{backend_name} %>"

					% }

					data-station="<%= $journey->{dep_eva} %>"

					data-dest="<%= $journey->{arr_eva} %>"

					data-train="<%= $journey->{train_id} %>"

					data-ts="<%= ( $journey->{sched_departure} // $journey->{real_departure} )->epoch %>"

				>

					<i class="material-icons left">send</i>

					%= L('status.copy-checkin')

				</a>

			</div>

		% }

	</div>

% }

% else {