i18n for map and wagon order (b31c7533) · Commits · derf / db-infoscreen

lib/DBInfoscreen/Controller/Wagenreihung.pm

+3 −3

Original line number	Diff line number	Diff line
		@@ -333,15 +333,15 @@ sub wagen {
		);
		}

		my $title = "Wagen $wagon_id";
		my $title = $self->l('Wagen ') . $wagon_id;

		if ( $wref->{tt} and $wref->{tn} ) {
		$title = sprintf( '%s %s', $wref->{tt}, $wref->{tn} );
		if ($wagon_no) {
		$title .= " Wagen $wagon_no";
		$title .= ' ' . $self->l('Wagen ') . $wagon_no;
		}
		else {
		$title .= " Wagen $wagon_id";
		$title .= ' ' . $self->l('Wagen ') . $wagon_id;
		}
		}

lib/DBInfoscreen/I18N/en.pm

+20 −0

Original line number	Diff line number	Diff line
		@@ -45,11 +45,31 @@ our %Lexicon = (
		'Hohe Auslastung' => 'High occupancy',
		'Sehr hohe Auslastung' => 'Very high occupancy',
		'Zug ist ausgebucht' => 'Fully booked',
		'Geringe Auslastung erwartet' => 'Low occupancy expected',
		'Hohe Auslastung erwartet' => 'High occupancy expected',
		'Sehr hohe Auslastung erwartet' => 'Very high occupancy expected',
		'Meldungen' => 'Messages',
		'Fahrtverlauf' => 'Route',
		'Betrieb' => 'Operator',
		'Karte' => 'Map',
		'Wagen' => 'Composition',
		# wagon order
		'Nach' => 'To',
		'in Abschnitt' => 'in sections',
		'Wagen ' => 'carriage ',
		# map
		'Fahrt' => 'Trip',
		'von' => 'from',
		'nach' => 'to',
		'Nächster Halt:' => 'Next stop:',
		'um' => 'at',
		'auf Gleis' => 'on platform',
		'Aufenthalt in' => 'Stopped in',
		'an Gleis' => 'on platform',
		'bis' => 'until',
		'Abfahrt in' => 'Departs',
		'von Gleis' => 'from platform',
		'Endstation erreicht um' => 'Terminus reached at',
		);

		1;

templates/_map_infobox.html.ep

+17 −17

Original line number	Diff line number	Diff line
		@@ -4,40 +4,40 @@ data-req="<%= stash('ajax_req') %>"
		data-route="<%= stash('ajax_route') %>"
		data-poly="<%= stash('ajax_polyline') %>"
		>
		Fahrt
		%= l 'Fahrt'
		% if (stash('train_no')) {
		<strong><%= stash('train_no') %></strong>
		% }
		von <strong><%= stash('origin')->{name} %></strong>
		nach <strong><%= stash('destination')->{name} %></strong>
		<%= l 'von' %> <strong><%= stash('origin')->{name} %></strong>
		<%= l 'nach' %> <strong><%= stash('destination')->{name} %></strong>
		</div>
		% if (my $next = stash('next_stop')) {
		<div class="nextstop">
		% if ($next->{type} eq 'present' and $next->{station}{dep} and $next->{station}{arr}) {
		Aufenthalt in <strong><%= $next->{station}{name} %></strong>
		<%= l 'Aufenthalt in' %> <strong><%= $next->{station}{name} %></strong>
		% if ($next->{station}{platform}) {
		an Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'an Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		bis <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
		<%= l 'bis' %> <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
		% if ($next->{station}{dep_delay}) {
		%= sprintf('(%+d)', $next->{station}{dep_delay})
		% }
		% }
		% elsif ($next->{type} eq 'present' and $next->{station}{dep}) {
		Abfahrt in <strong><%= $next->{station}{name} %></strong>
		<%= l 'Abfahrt in' %> <strong><%= $next->{station}{name} %></strong>
		% if ($next->{station}{platform}) {
		von Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'von Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		um <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
		<%= l 'um' %> <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
		% if ($next->{station}{dep_delay}) {
		%= sprintf('(%+d)', $next->{station}{dep_delay})
		% }
		% }
		% elsif ($next->{type} eq 'present' and $next->{station}{arr}) {
		Endstation erreicht um
		%= l 'Endstation erreicht um'
		<strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
		% if ($next->{station}{platform}) {
		auf Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		% if ($next->{station}{arr_delay}) {
		%= sprintf('(%+d)', $next->{station}{arr_delay})
		@@ -47,25 +47,25 @@ data-poly="<%= stash('ajax_polyline') %>"
		Zug steht in
		<strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
		% if ($next->{station}{platform}) {
		auf Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		% }
		% elsif ($next->{type} eq 'next' and $next->{station}{arr}) {
		Nächster Halt:
		%= l 'Nächster Halt:'
		<strong><%= $next->{station}{name} %></strong>
		um <strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
		<%= l 'um' %> <strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
		% if ($next->{station}{arr_delay}) {
		%= sprintf('(%+d)', $next->{station}{arr_delay})
		% }
		% if ($next->{station}{platform}) {
		auf Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		% }
		% elsif ($next->{type} eq 'next') {
		Nächster Halt:
		%= l 'Nächster Halt:'
		<strong><%= $next->{station}{name} %></strong>
		% if ($next->{station}{platform}) {
		auf Gleis <strong><%= $next->{station}{platform} %></strong>
		<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
		% }
		% }
		</div>

templates/_train_details.html.ep

+2 −2

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@
		% elsif (my $o = $departure->{occupancy}) {
		<div class="verbose">
		% my ($text, $icon) = occupancy_icon($o);
		<%= $text %><span style="padding-right: 0.5em;">.</span> <i class="material-icons" aria-hidden="true" style="padding-right: 0.5em; vertical-align: bottom;"><%= $icon %></i></i>
		<%= l $text %><span style="padding-right: 0.5em;">.</span> <i class="material-icons" aria-hidden="true" style="padding-right: 0.5em; vertical-align: bottom;"><%= $icon %></i></i>
		</div>
		% }
		% }

templates/route_map.html.ep

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,6 @@ nicht implementiert.

		% if (my $op = stash('operator')) {
		<div class="container" style="margin-top: 1ex; margin-bottom: 1ex; color: #555;">
		Betrieb: <%= $op %>
		<%= l 'Betrieb' %>: <%= $op %>
		</div>
		% }

Admin message