Remove I18N for now. It's incompatible with caching proxy setups.

11 files changed, 87 insertions, 105 deletions

diff --git a/cpanfile b/cpanfile
index 248b3eb..ce057eb 100644
--- a/cpanfile
+++ b/cpanfile
@@ -10,7 +10,6 @@ requires 'List::UtilsBy';
 requires 'LWP::UserAgent';
 requires 'LWP::Protocol::https';
 requires 'Mojolicious';
-requires 'Mojolicious::Plugin::I18N';
 requires 'Travel::Status::DE::DBWagenreihung', '0.06';
 requires 'Travel::Status::DE::HAFAS', '>= 5.03';
 requires 'Travel::Status::DE::IRIS';
diff --git a/lib/DBInfoscreen.pm b/lib/DBInfoscreen.pm
index a3f22bf..c33a703 100644
--- a/lib/DBInfoscreen.pm
+++ b/lib/DBInfoscreen.pm
@@ -38,12 +38,6 @@ sub startup {
 	chomp $self->config->{version};
 	$self->defaults( version => $self->config->{version} // 'UNKNOWN' );
 
-	$self->plugin(
-		I18N => {
-			default => 'de',
-		},
-	);
-
 	# Generally, the reverse proxy handles compression.
 	# Also, Mojolicious compression breaks legacy callback-based JSON endpoints
 	# for some clients.
@@ -62,18 +56,6 @@ sub startup {
 				if ( $cookie->name eq 'theme' ) {
 					$self->session( theme => $cookie->value );
 				}
-				elsif ( $cookie->name eq 'lang' ) {
-					my $l = $cookie->value;
-					if ( $l eq 'de' or $l eq 'en' ) {
-						$self->languages($l);
-					}
-				}
-			}
-
-			if ( my $l = $self->param('lang') ) {
-				if ( $l eq 'de' or $l eq 'en' ) {
-					$self->languages($l);
-				}
 			}
 		}
 	);
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 757790d..cff1ff8 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -833,9 +833,9 @@ sub render_train {
 
 	my %opt = ( train => $result );
 
-	if ( $self->languages =~ m{^en} ) {
-		$opt{language} = 'en';
-	}
+	#if ( $self->languages =~ m{^en} ) {
+	#	$opt{language} = 'en';
+	#}
 
 	$self->hafas->get_route_p(%opt)->then(
 		sub {
@@ -1117,9 +1117,9 @@ sub train_details {
 		$opt{service} = $hafas;
 	}
 
-	if ( $self->languages =~ m{^en} ) {
-		$opt{language} = 'en';
-	}
+	#if ( $self->languages =~ m{^en} ) {
+	#	$opt{language} = 'en';
+	#}
 
 	if ( my $date = $self->param('date') ) {
 		if ( $date
diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm
index 35df7a2..1708285 100644
--- a/lib/DBInfoscreen/Controller/Wagenreihung.pm
+++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm
@@ -225,15 +225,15 @@ sub wagen {
 		);
 	}
 
-	my $title = $self->l('Wagen ') . $wagon_id;
+	my $title = 'Wagen ' . $wagon_id;
 
 	if ( $wref->{tt} and $wref->{tn} ) {
 		$title = sprintf( '%s %s', $wref->{tt}, $wref->{tn} );
 		if ($wagon_no) {
-			$title .= ' ' . $self->l('Wagen ') . $wagon_no;
+			$title .= ' Wagen ' . $wagon_no;
 		}
 		else {
-			$title .= ' ' . $self->l('Wagen ') . $wagon_id;
+			$title .= ' Wagen ' . $wagon_id;
 		}
 	}
 
diff --git a/templates/_map_infobox.html.ep b/templates/_map_infobox.html.ep
index 4f9a644..7372802 100644
--- a/templates/_map_infobox.html.ep
+++ b/templates/_map_infobox.html.ep
@@ -4,40 +4,40 @@ data-req="<%= stash('ajax_req') =~ s{#}{%23}gr %>"
 data-route="<%= stash('ajax_route') %>"
 data-poly="<%= stash('ajax_polyline') %>"
 >
-	%= l 'Fahrt'
+	Fahrt
 	% if (stash('train_no')) {
 		<strong><%= stash('train_no') %></strong>
 	% }
-	<%= l 'von' %> <strong><%= stash('origin')->{name} %></strong>
-	<%= l 'nach' %> <strong><%= stash('destination')->{name} %></strong>
+	von <strong><%= stash('origin')->{name} %></strong>
+	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}) {
-		<%= l 'Aufenthalt in' %> <strong><%= $next->{station}->loc->name %></strong>
+		Aufenthalt in <strong><%= $next->{station}->loc->name %></strong>
 		% if ($next->{station}{platform}) {
-			<%= l 'an Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			an Gleis <strong><%= $next->{station}{platform} %></strong>
 		% }
-		<%= l 'bis' %> <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
+		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}) {
-		<%= l 'Abfahrt in' %> <strong><%= $next->{station}->loc->name %></strong>
+		Abfahrt in <strong><%= $next->{station}->loc->name %></strong>
 		% if ($next->{station}{platform}) {
-			<%= l 'von Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			von Gleis <strong><%= $next->{station}{platform} %></strong>
 		% }
-		<%= l 'um' %> <strong><%= $next->{station}{dep}->strftime('%H:%M') %></strong>
+		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}) {
-		%= l 'Endstation erreicht um'
+		Endstation erreicht um
 		<strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
 		% if ($next->{station}{platform}) {
-			<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			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}) {
-			<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			auf Gleis <strong><%= $next->{station}{platform} %></strong>
 		% }
 	% }
 	% elsif ($next->{type} eq 'next' and $next->{station}{arr}) {
-		%= l 'Nächster Halt:'
+		Nächster Halt:
 		<strong><%= $next->{station}->loc->name %></strong>
-		<%= l 'um' %> <strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
+		um <strong><%= $next->{station}{arr}->strftime('%H:%M') %></strong>
 		% if ($next->{station}{arr_delay}) {
 			%= sprintf('(%+d)', $next->{station}{arr_delay})
 		% }
 		% if ($next->{station}{platform}) {
-			<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			auf Gleis <strong><%= $next->{station}{platform} %></strong>
 		% }
 	% }
 	% elsif ($next->{type} eq 'next') {
-		%= l 'Nächster Halt:'
+		Nächster Halt:
 		<strong><%= $next->{station}->loc->name %></strong>
 		% if ($next->{station}{platform}) {
-			<%= l 'auf Gleis' %> <strong><%= $next->{station}{platform} %></strong>
+			auf Gleis <strong><%= $next->{station}{platform} %></strong>
 		% }
 	% }
 	</div>
diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep
index 07a705b..24d2d55 100644
--- a/templates/_train_details.html.ep
+++ b/templates/_train_details.html.ep
@@ -20,27 +20,27 @@
     <div>
     <div class="arrival <%= $departure->{arrival_hidden} ? 'timehidden' : q{} %>">
 %     if ($departure->{is_cancelled} and $departure->{sched_arrival}) {
-        <span class="minfo"><%= l 'An:' %> ––:––</span><br/><%= l 'Plan:' %> <%= $departure->{sched_arrival} %>
+        <span class="minfo">An: ––:––</span><br/>Plan: <%= $departure->{sched_arrival} %>
 %     }
 %     elsif ($departure->{arrival_is_cancelled}) {
-        <span class="minfo">Beginnt hier</span><br/><%= l 'Plan:' %> <%= $departure->{sched_arrival} %>
+        <span class="minfo">Beginnt hier</span><br/>Plan: <%= $departure->{sched_arrival} %>
 %     }
 %     elsif ($departure->{arrival}) {
 %       if ($departure->{arrival} ne $departure->{sched_arrival}) {
           % if (($departure->{delay} // 0) < 0) {
-            <%= l 'An:' %> <span class="undelay"><%= $departure->{arrival} %></span>
+            An: <span class="undelay"><%= $departure->{arrival} %></span>
           % }
           % else {
-            <%= l 'An:' %> <span class="minfo"><%= $departure->{arrival} %></span>
+            An: <span class="minfo"><%= $departure->{arrival} %></span>
           % }
-          <br/><%= l 'Plan:' %> <%= $departure->{sched_arrival} %>
+          <br/>Plan: <%= $departure->{sched_arrival} %>
 %       }
 %       else {
-          <%= l 'An:' %> <%= $departure->{arrival} %>
+          An: <%= $departure->{arrival} %>
 %       }
 %     }
 %     elsif ($departure->{sched_arrival}) {
-        <%= l 'An:' %> <%= $departure->{sched_arrival} %>
+        An: <%= $departure->{sched_arrival} %>
 %     }
 %     elsif ($departure->{prep_time}) {
         Ein: <%= $departure->{prep_time} %>
@@ -73,10 +73,10 @@
 %     }
 %     if ($departure->{scheduled_platform} and $departure->{platform}
 %         and $departure->{scheduled_platform} ne $departure->{platform}) {
-        <span class="minfo"><%= $left %><%= l 'Gleis' %> <%= $departure->{platform} %><%= $right %></span>
+        <span class="minfo"><%= $left %>Gleis <%= $departure->{platform} %><%= $right %></span>
 %     }
 %     elsif ($departure->{scheduled_platform} or $departure->{platform}) {
-        <%= $left %><%= l 'Gleis' %> <%= $departure->{platform} // $departure->{scheduled_platform} %><%= $right %>
+        <%= $left %>Gleis <%= $departure->{platform} // $departure->{scheduled_platform} %><%= $right %>
 %     }
 %   }
 %   if ($departure->{arrival_hidden} and not $departure->{prep_time}) {
@@ -90,22 +90,22 @@
     <div>
     <div class="departure <%= $departure->{departure_hidden} ? 'timehidden' : q{} %>">
 %     if ($departure->{is_cancelled} and $departure->{sched_departure}) {
-        <span class="minfo"><%= l 'Ab:' %> ––:––</span><br/><%= l 'Plan:' %> <%= $departure->{sched_departure} %>
+        <span class="minfo">Ab: ––:––</span><br/>Plan: <%= $departure->{sched_departure} %>
 %     }
 %     elsif ($departure->{departure_is_cancelled}) {
-        <span class="minfo">Endet hier</span><br/><%= l 'Plan:' %> <%= $departure->{sched_departure} %>
+        <span class="minfo">Endet hier</span><br/>Plan: <%= $departure->{sched_departure} %>
 %     }
 %     elsif ($departure->{departure}) {
 %       if ($departure->{departure} ne $departure->{sched_departure}) {
-          <%= l 'Ab:' %> <span class="minfo"><%= $departure->{departure} %></span>
-          <br/><%= l 'Plan:' %> <%= $departure->{sched_departure} %>
+          Ab: <span class="minfo"><%= $departure->{departure} %></span>
+          <br/>Plan: <%= $departure->{sched_departure} %>
 %       }
 %       else {
-          <%= l 'Ab:' %> <%= $departure->{departure} %>
+          Ab: <%= $departure->{departure} %>
 %       }
 %     }
 %     elsif ($departure->{sched_departure}) {
-        <%= l 'Ab:' %> <%= $departure->{sched_departure} %>
+        Ab: <%= $departure->{sched_departure} %>
 %     }
     </div>
     </div>
@@ -139,10 +139,10 @@
     <div class="verbose">
 %     if ($departure->{trip_id}) {
 %       if (stash('station_name')) {
-          <a class="smallbutton" href="/map/<%= $departure->{trip_id} =~ s{#}{%23}gr %>/<%= $departure->{train_line} // 0 %>?from=<%= stash('station_name') %>&amp;hafas=<%= param('hafas') // q{} %>"><i class="material-icons" aria-hidden="true">map</i> <%= l 'Karte' %></a>
+          <a class="smallbutton" href="/map/<%= $departure->{trip_id} =~ s{#}{%23}gr %>/<%= $departure->{train_line} // 0 %>?from=<%= stash('station_name') %>&amp;hafas=<%= param('hafas') // q{} %>"><i class="material-icons" aria-hidden="true">map</i> Karte</a>
 %       }
 %       else {
-          <a class="smallbutton" href="/map/<%= $departure->{trip_id} =~ s{#}{%23}gr %>/<%= $departure->{train_line} // 0 %>?hafas=<%= param('hafas') // q{} %>"><i class="material-icons" aria-hidden="true">map</i> <%= l 'Karte' %></a>
+          <a class="smallbutton" href="/map/<%= $departure->{trip_id} =~ s{#}{%23}gr %>/<%= $departure->{train_line} // 0 %>?hafas=<%= param('hafas') // q{} %>"><i class="material-icons" aria-hidden="true">map</i> Karte</a>
 %       }
 %     }
 %     if ($departure->{wr_link}) {
@@ -161,13 +161,13 @@
 %     if (my $u = $departure->{utilization}) {
         <div class="verbose">
 %         my ($text, $icon1, $icon2) = utilization_icon($u);
-          <%= l $text %><span style="padding-right: 0.5em;">.</span> 1. <i class="material-icons" aria-hidden="true" style="padding-right: 0.5em; vertical-align: bottom;"><%= $icon1 %></i> 2. <i class="material-icons" aria-hidden="true" style="vertical-align: bottom;"><%= $icon2 %></i>
+          <%= $text %><span style="padding-right: 0.5em;">.</span> 1. <i class="material-icons" aria-hidden="true" style="padding-right: 0.5em; vertical-align: bottom;"><%= $icon1 %></i> 2. <i class="material-icons" aria-hidden="true" style="vertical-align: bottom;"><%= $icon2 %></i>
         </div>
 %     }
 %     elsif (my $o = $departure->{occupancy}) {
         <div class="verbose">
 %         my ($text, $icon) = occupancy_icon($o);
-          <%= 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>
+          <%= $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>
 %     }
 %   }
@@ -184,7 +184,7 @@
 %   }
 
 %   if ($departure->{moreinfo} and @{$departure->{moreinfo}}) {
-%=    l 'Meldungen'
+      Meldungen
       <ul class="messages">
 %     for my $pair (@{$departure->{moreinfo}}) {
         <li>
@@ -221,7 +221,7 @@
 %   }
 %   if ($departure->{route_pre_diff} and $departure->{route_post_diff}) {
 %     if ($departure->{date}) {
-%=      l 'Fahrtverlauf am'
+        Fahrtverlauf am
 %       if (stash('train') !~ m{[|]}) {
           <a href="<%= url_for('train', train => stash('train'))->query({detailed => param('detailed'), past => param('past'), rt => param('rt'), hafas => param('hafas'), date => $departure->{date}->clone->subtract(days => 1)->strftime('%d.%m.%Y'), highlight => param('highlight') // stash('station')}) %>">◀</a>
 %       }
@@ -317,7 +317,7 @@
       </ul> <!-- mroute -->
 %   }
 %   if ($departure->{operator}) {
-     <div class="details"><%= l 'Betrieb' %>: <%= $departure->{operator} %></div>
+     <div class="details">Betrieb: <%= $departure->{operator} %></div>
 %   }
 %   if ($departure->{details} and @{$departure->{details}}) {
       <div class="details">Details:
diff --git a/templates/landingpage.html.ep b/templates/landingpage.html.ep
index 0a977a8..82128ca 100644
--- a/templates/landingpage.html.ep
+++ b/templates/landingpage.html.ep
@@ -1,6 +1,6 @@
 % if (stash 'show_intro') {
 <div class="container">
-% if (languages() =~ m{^en}) {
+% if (0) {
   <p>
     DBF is an unofficial departure monitor for regional and long-distance trains within Germany, aiming to combine multiple data sources in a useful manner.
     It also has limited support for local transit and traffic outside of Germany.
@@ -21,10 +21,10 @@
   </p>
 % }
 <p class="geolink">
-<a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>"><%= l 'Stationen in der Umgebung suchen' %></a>
+<a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>">Stationen in der Umgebung suchen</a>
 </p>
 <p>
-%= l 'Oder hier angeben:'
+Oder hier angeben:
 </p>
 </div>
 % }
diff --git a/templates/layouts/app.html.ep b/templates/layouts/app.html.ep
index ab4dffa..94e0930 100644
--- a/templates/layouts/app.html.ep
+++ b/templates/layouts/app.html.ep
@@ -102,8 +102,8 @@
 </div>
 % }
 % elsif (stash('stationlist')) {
-<div class="error"><strong><%= l 'Mehrdeutige Eingabe' %>.</strong>
-<%= l 'Bitte eine Station aus der Liste auswählen' %></div>
+<div class="error"><strong>Mehrdeutige Eingabe.</strong>
+Bitte eine Station aus der Liste auswählen</div>
 % }
 </div>
 
@@ -119,35 +119,35 @@
 %= form_for _redirect => begin
 <div>
   <div class="field">
-    <div class="desc"><%= l 'Zug / Station' %></div>
+    <div class="desc">Zug / Station</div>
     <div>
 % if (stash('stationlist')) {
       %= select_field input => stash('stationlist')
 % }
 % elsif (stash('input')) {
-      %= text_field 'input', class => 'station', placeholder => l 'Zug, Stationsname oder Ril100-Kürzel', id => 'stationinput'
+      %= text_field 'input', class => 'station', placeholder => 'Zug, Stationsname oder Ril100-Kürzel', id => 'stationinput'
 % }
 % else {
-      %= text_field 'input', class => 'station', placeholder => l 'Zug, Stationsname oder Ril100-Kürzel', id => 'stationinput', autofocus => 'autofocus'
+      %= text_field 'input', class => 'station', placeholder => 'Zug, Stationsname oder Ril100-Kürzel', id => 'stationinput', autofocus => 'autofocus'
 % }
     </div>
   </div>
   <div class="field">
-    %= submit_button l('Abfahrtstafel')
+    %= submit_button 'Abfahrtstafel'
   </div>
   % if (stash('input')) {
     <div class="geolink">
-      <a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>"><%= l 'Stationen in der Umgebung suchen' %></a>
+      <a class="button" href="<%= url_for('_autostop')->to_abs->scheme('https') %>">Stationen in der Umgebung suchen</a>
     </div>
   % }
   <div class="break"></div>
-  <div class="moresettings-header moresettings-header-collapsed button button-light"><%= l 'Weitere Einstellungen' %></div>
+  <div class="moresettings-header moresettings-header-collapsed button button-light">Weitere Einstellungen</div>
   <div class="moresettings moresettings-collapsed">
     <div class="field">
       <div class="desc">
         %= check_box 'rt' => 1, id => 'id_show_realtime'
         <label for="id_show_realtime">
-          %= l 'Zeiten inkl. Verspätung angeben'
+          Zeiten inkl. Verspätung angeben
         </label>
       </div>
     </div>
@@ -155,7 +155,7 @@
       <div class="desc">
         %= check_box 'hidelowdelay' => 1, id => 'id_hidelowdelay'
         <label for="id_hidelowdelay">
-          %= l 'Verspätungen erst ab 5 Minuten anzeigen'
+          Verspätungen erst ab 5 Minuten anzeigen
         </label>
       </div>
     </div>
@@ -163,7 +163,7 @@
       <div class="desc">
         %= check_box 'detailed' => 1, id => 'id_detailed'
         <label for="id_detailed">
-          %= l 'Mehr Details'
+          Mehr Details
         </label>
       </div>
     </div>
@@ -171,7 +171,7 @@
       <div class="desc">
         %= check_box 'no_related' => 1, id => 'id_no_related'
         <label for="id_no_related">
-          %= l 'Betriebliche Bahnhofstrennungen berücksichtigen (z.B. "Hbf (Fern+Regio)" vs. "Hbf (S)")'
+          Betriebliche Bahnhofstrennungen berücksichtigen (z.B. "Hbf (Fern+Regio)" vs. "Hbf (S)")
         </label>
       </div>
     </div>
@@ -179,7 +179,7 @@
       <div class="desc">
         %= check_box 'past' => 1, id => 'past'
         <label for="past">
-          %= l 'Bereits abgefahrene Züge anzeigen'
+          Bereits abgefahrene Züge anzeigen
         </label>
       </div>
     </div>
@@ -187,21 +187,21 @@
       <div class="desc">
         %= check_box 'hide_opts' => 1, id => 'id_hide_opts'
         <label for="id_hide_opts">
-          %= l 'Formular verstecken'
+          Formular verstecken
         </label>
       </div>
     </div>
     <div class="field">
       <div class="desc">
-        %= l 'Nur Züge über'
+        Nur Züge über
       </div>
       <div>
-        %= text_field 'via', placeholder => l('Bahnhof 1, Bhf2, ... (oder regulärer Ausdruck)'), class => 'station'
+        %= text_field 'via', placeholder => 'Bahnhof 1, Bhf2, ... (oder regulärer Ausdruck)', class => 'station'
       </div>
     </div>
     <div class="field">
       <div class="desc">
-        %= l 'Gleise'
+        Gleise
       </div>
       <div>
         %= text_field 'platforms', placeholder => '1, 2, 5, ...'
@@ -209,10 +209,10 @@
     </div>
     <div class="field">
       <div class="desc">
-        %= l 'Ankunfts- oder Abfahrtszeit anzeigen?'
+        Ankunfts- oder Abfahrtszeit anzeigen?
       </div>
       <div>
-        %= select_field admode => [[l('Abfahrt bevorzugen') => 'deparr'], [l('Nur Abfahrt') => 'dep'], [l('Nur Ankunft') => 'arr']]
+        %= select_field admode => [['Abfahrt bevorzugen' => 'deparr'], ['Nur Abfahrt' => 'dep'], ['Nur Ankunft' => 'arr']]
       </div>
     </div>
     <div class="field">
@@ -224,7 +224,7 @@
       </div>
     </div>
     <div class="field">
-      %= submit_button l('Anzeigen')
+      %= submit_button 'Anzeigen'
     </div>
   </div> <!-- moresettings -->
 </div>
@@ -236,7 +236,7 @@
   <div class="developers-header developers-header-collapsed button button-light">API</div>
   <div class="developers developers-collapsed">
     <ul>
-      % if (languages() =~ m{^en}) {
+      % if (0) {
         <li>You're welcome to embed DBF departure boards as iframes or use them
           in full-screen browser setups. The App frontend works best for
           small screens, whereas the legacy Infoscreen mode is better suited
@@ -300,26 +300,27 @@
 
 <div class="container">
 <div class="config">
-Theme:
-<a onClick="javascript:setTheme('dark')">dark</a>
-·
+Farbschema:
 <a onClick="javascript:setTheme('light')">light</a>
 ·
-<a onClick="javascript:setTheme('default')">device theme</a>
+<a onClick="javascript:setTheme('dark')">dunkel</a>
+·
+<a onClick="javascript:setTheme('default')">automatisch</a>
+<!--Language:
 <br/>
-Language:
 <a onClick="javascript:setLang('de')">DE</a>
 ·
 <a onClick="javascript:setLang('en')">EN</a>
 ·
 <a onClick="javascript:setLang('default')">system language</a>
+-->
 </div>
 <div class="about">
 <a href="_about">DBF</a> v<%= stash('version') // '???' %>
 ·
-<a href="_datenschutz" rel="nofollow"><%= l 'Datenschutz' %></a>
+<a href="_datenschutz" rel="nofollow">Datenschutz</a>
 ·
-<a href="_impressum" rel="nofollow"><%= l 'Impressum' %></a>
+<a href="_impressum" rel="nofollow">Impressum</a>
 </div> <!-- about -->
 </div> <!-- container -->
 % }
diff --git a/templates/route_map.html.ep b/templates/route_map.html.ep
index 502b7fd..447960a 100644
--- a/templates/route_map.html.ep
+++ b/templates/route_map.html.ep
@@ -91,6 +91,6 @@ nicht implementiert.
 
 % if (my $op = stash('operator')) {
 <div class="container" style="margin-top: 1ex; margin-bottom: 1ex; color: #555;">
-<%= l 'Betrieb' %>: <%= $op %>
+Betrieb: <%= $op %>
 </div>
 % }
diff --git a/templates/wagen.html.ep b/templates/wagen.html.ep
index 0bb88c4..efc2e32 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} %> <%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
+			<%= $wref->{s} %> 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/><%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
+				<%= $wref->{s} %><br/>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/><%= l 'Gleis' %> <%= $wref->{p} %> <%= $wref->{ws} %>
+				<%= $wref->{s} %><br/>Gleis <%= $wref->{p} %> <%= $wref->{ws} %>
 			</div>
 		% }
 	% }
diff --git a/templates/wagenreihung.html.ep b/templates/wagenreihung.html.ep
index 7d2e278..493d9c6 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) {
-          <%= l 'Nach' %> <%= $destination->{name} %> <%= l 'in Abschnitt' %> <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
+          Nach <%= $destination->{name} %> in Abschnitt <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
        % }
       </div>
     % }
-    <%= $wr->station_name %> <%= l 'Gleis' %> <%= $wr->platform %><br/>
+    <%= $wr->station_name %> 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}}))) {
-          <%= l 'in Abschnitt' %> <%= join(q{}, sort @{$desc->{sections}}) %>
+          in Abschnitt <%= join(q{}, sort @{$desc->{sections}}) %>
         % }
         <br/>
       % }