summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/DBInfoscreen/Controller/Wagenreihung.pm6
-rw-r--r--lib/DBInfoscreen/I18N/en.pm20
-rw-r--r--templates/_map_infobox.html.ep34
-rw-r--r--templates/_train_details.html.ep4
-rw-r--r--templates/route_map.html.ep2
-rw-r--r--templates/wagen.html.ep6
-rw-r--r--templates/wagenreihung.html.ep6
7 files changed, 49 insertions, 29 deletions
diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index 5d48705..3287d85 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -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;
}
}
diff --git a/lib/DBInfoscreen/I18N/en.pm b/lib/DBInfoscreen/I18N/en.pm
index d009b12..20c4440 100644
--- a/lib/DBInfoscreen/I18N/en.pm
+++ b/lib/DBInfoscreen/I18N/en.pm
@@ -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;
diff --git a/templates/_map_infobox.html.ep b/templates/_map_infobox.html.ep
index 42e121d..a94cb27 100644
--- a/templates/_map_infobox.html.ep
+++ b/templates/_map_infobox.html.ep
@@ -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>
diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep
index 80e1a74..849af3b 100644
--- a/templates/_train_details.html.ep
+++ b/templates/_train_details.html.ep
@@ -43,7 +43,7 @@
% }
% }
% elsif ($departure->{sched_arrival}) {
- <%= l 'An:' %><%= $departure->{sched_arrival} %>
+ <%= l 'An:' %> <%= $departure->{sched_arrival} %>
% }
% elsif ($departure->{prep_time}) {
Ein: <%= $departure->{prep_time} %>
@@ -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>
% }
% }
diff --git a/templates/route_map.html.ep b/templates/route_map.html.ep
index 2f35b54..2822b6c 100644
--- a/templates/route_map.html.ep
+++ b/templates/route_map.html.ep
@@ -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>
% }
diff --git a/templates/wagen.html.ep b/templates/wagen.html.ep
index efc2e32..0bb88c4 100644
--- a/templates/wagen.html.ep
+++ b/templates/wagen.html.ep
@@ -1,13 +1,13 @@
<div class="container singlewagon">
% if (not $wref->{e} and $wref->{s} and $wref->{p} and $wref->{ws}) {
<p>
- <%= $wref->{s} %> Gleis <%= $wref->{p} %> <%= $wref->{ws} %>
+ <%= $wref->{s} %> <%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
</p>
% }
% if ($wref->{e} eq 'u') {
% if ($wref->{s} and $wref->{p} and $wref->{ws}) {
<div class="platform">
- <%= $wref->{s} %><br/>Gleis <%= $wref->{p} %> <%= $wref->{ws} %>
+ <%= $wref->{s} %><br/><%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
<div class="sign-left"><i class="material-icons">arrow_upward</i></div>
<div class="sign-right"><i class="material-icons">arrow_upward</i></div>
</div>
@@ -47,7 +47,7 @@
<div class="sign-right"><i class="material-icons">arrow_downward</i></div>
% if ($wref->{s} and $wref->{p} and $wref->{ws}) {
<div class="platform">
- <%= $wref->{s} %><br/>Gleis <%= $wref->{p} %> <%= $wref->{ws} %>
+ <%= $wref->{s} %><br/><%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
</div>
% }
% }
diff --git a/templates/wagenreihung.html.ep b/templates/wagenreihung.html.ep
index 493d9c6..7d2e278 100644
--- a/templates/wagenreihung.html.ep
+++ b/templates/wagenreihung.html.ep
@@ -24,16 +24,16 @@
% if ($has_multi_dest) {
<div style="text-align: center;">
% for my $destination ($wr->destinations) {
- Nach <%= $destination->{name} %> in Abschnitt <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
+ <%= l 'Nach' %> <%= $destination->{name} %> <%= l 'in Abschnitt' %> <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
% }
</div>
% }
- <%= $wr->station_name %> Gleis <%= $wr->platform %><br/>
+ <%= $wr->station_name %> <%= l 'Gleis' %> <%= $wr->platform %><br/>
% for my $desc ($wr->train_descriptions) {
% if ($desc->{text}) {
%= $desc->{text}
% if ($has_multi_desc and length(join(q{}, sort @{$desc->{sections}}))) {
- in Abschnitt <%= join(q{}, sort @{$desc->{sections}}) %>
+ <%= l 'in Abschnitt' %> <%= join(q{}, sort @{$desc->{sections}}) %>
% }
<br/>
% }
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 22:31:50 +0000