Unverified Commit 8ef4fbba authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

localization: use pre-/postfix for boarding, arrival, departure 

See #278
parent f15ea967

share/locales/de_DE.po

+25 −5
Original line number Diff line number Diff line
@@ -357,24 +357,38 @@ msgstr "Teilen" 
msgid "status.check-out"

msgstr "Auschecken"



msgid "status.boarding-in"

#, noun or verb

msgid "status.boarding-in.pre"

msgstr "Einfahrt in"



#, noun or verb

msgid "status.boarding-in.post"

msgstr " "



#, noun or verb

msgid "status.boarding-soon"

msgstr "fährt ein"



#, noun or verb

msgid "status.departure-in"

msgid "status.departure-in.pre"

msgstr "Abfahrt in"



#, noun or verb

msgid "status.departure-in.post"

msgstr " "



#, noun or verb

msgid "status.departure-soon"

msgstr "Abfahrt in weniger als einer Minute"



#, noun or verb

msgid "status.arrival-in"

msgid "status.arrival-in.pre"

msgstr "Ankunft in"



#, noun or verb

msgid "status.arrival-in.post"

msgstr " "



#, noun or verb

msgid "status.arrival-soon"

msgstr "Ankunft in weniger als einer Minute"
@@ -385,12 +399,18 @@ msgstr "Ankunft unbekannt" 
msgid "status.arrived"

msgstr "Ziel erreicht"



msgid "status.depart-from"

msgid "status.depart-from.pre"

msgstr "von"



msgid "status.arrive-on"

msgid "status.depart-from.post"

msgstr " "



msgid "status.arrive-on.pre"

msgstr "auf"



msgid "status.arrive-on.post"

msgstr " "



msgid "status.delayed-auto-checkout"

msgstr "Der automatische Checkout erfolgt etwa zehn Minuten nach der Ankunft."

share/locales/en_GB.po

+25 −5
Original line number Diff line number Diff line
@@ -357,24 +357,38 @@ msgstr "Share" 
msgid "status.check-out"

msgstr "check out"



msgid "status.boarding-in"

#, noun or verb

msgid "status.boarding-in.pre"

msgstr "boarding in"



#, noun or verb

msgid "status.boarding-in.post"

msgstr " "



#, noun or verb

msgid "status.boarding-soon"

msgstr "now arriving"



#, noun or verb

msgid "status.departure-in"

msgid "status.departure-in.pre"

msgstr "departs in"



#, noun or verb

msgid "status.departure-in.post"

msgstr " "



#, noun or verb

msgid "status.departure-soon"

msgstr "departs in less than one minute"



#, noun or verb

msgid "status.arrival-in"

msgid "status.arrival-in.pre"

msgstr "arrives in"



#, noun or verb

msgid "status.arrival-in.post"

msgstr " "



#, noun or verb

msgid "status.arrival-soon"

msgstr "now arriving"
@@ -385,12 +399,18 @@ msgstr "Arrival unknown" 
msgid "status.arrived"

msgstr "arrived"



msgid "status.depart-from"

msgid "status.depart-from.pre"

msgstr "from"



msgid "status.arrive-on"

msgid "status.depart-from.post"

msgstr " "



msgid "status.arrive-on.pre"

msgstr "on"



msgid "status.arrive-on.post"

msgstr " "



msgid "status.delayed-auto-checkout"

msgstr "You will be automatically checked out about ten minutes after the expected arrival time."

templates/_checked_in.html.ep

+5 −5
Original line number Diff line number Diff line
@@ -19,20 +19,20 @@ 
					data-dest="<%= $journey->{arr_name} %>"

					>

					% if ($journey->{boarding_countdown} > 60) {

						<%= L('status.boarding-in') %> <%= journeys->min_to_human(int($journey->{boarding_countdown} / 60)) %><br/>

						<%= L('status.boarding-in.pre') %> <%= journeys->min_to_human(int($journey->{boarding_countdown} / 60)) %> <%= L('status.boarding-in.post') %><br/>

					% }

					% elsif ($journey->{boarding_countdown} > 0) {

						<%= L('status.boarding-soon') %><br/>

					% }

					% if ($journey->{departure_countdown} > 60) {

						<%= L('status.departure-in') %> <%= journeys->min_to_human(int($journey->{departure_countdown} / 60)) %>

						<%= L('status.departure-in.pre') %> <%= journeys->min_to_human(int($journey->{departure_countdown} / 60)) %> <%= L('status.departure-in.post') %>

					% }

					% elsif ($journey->{departure_countdown} > 0) {

						%= L('status.departure-soon')

					% }

					% elsif (defined $journey->{arrival_countdown}) {

						% if ($journey->{arrival_countdown} > 60) {

							<%= L('status.arrival-in') %> <%= journeys->min_to_human(int($journey->{arrival_countdown} / 60)) %>

							<%= L('status.arrival-in.pre') %> <%= journeys->min_to_human(int($journey->{arrival_countdown} / 60)) %> <%= L('status.arrival-in.post') %> 

						% }

						% elsif ($journey->{arrival_countdown} > 0) {

							%= L('status.arrival-soon')
@@ -48,7 +48,7 @@ 
								<br/>◀ <%= $journey->{platform_type} %> <%= $journey->{arr_platform} %>

							% }

							% else {

								<br/><%= L('status.arrive-on') %> <%= $journey->{platform_type} %> <%= $journey->{arr_platform} %>

								<br/><%= L('status.arrive-on.pre') %> <%= $journey->{platform_type} %> <%= $journey->{arr_platform} %> <%= L('status.arrive-on.post') %>

							% }

						% }

					% }
@@ -63,7 +63,7 @@ 
							<br/>◀ <%= $journey->{platform_type} %> <%= $journey->{dep_platform} %>

						% }

						% else {

							<br/><%= L('status.depart-from') %> <%= $journey->{platform_type} %> <%= $journey->{dep_platform} %>

							<br/><%= L('status.depart-from.pre') %> <%= $journey->{platform_type} %> <%= $journey->{dep_platform} %> <%= L('status.depart-from.post') %>

						% }

					% }

					% if (my $wr = $journey->{wagonorder}) {