diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/_checked_in.html.ep | 6 | ||||
| -rw-r--r-- | templates/_public_status_card.html.ep | 4 | ||||
| -rw-r--r-- | templates/layouts/default.html.ep | 2 | ||||
| -rw-r--r-- | templates/year_in_review.html.ep | 65 |
4 files changed, 48 insertions, 29 deletions
diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index 659abff..e509549 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -19,20 +19,20 @@ data-dest="<%= $journey->{arr_name} %>" > % if ($journey->{boarding_countdown} > 60) { - <%= L('status.boarding-in.pre') %> <%= journeys->min_to_human(int($journey->{boarding_countdown} / 60)) %> <%= L('status.boarding-in.post') %><br/> + <%= L('status.boarding-in.pre') %> <%= LT(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.pre') %> <%= journeys->min_to_human(int($journey->{departure_countdown} / 60)) %> <%= L('status.departure-in.post') %> + <%= L('status.departure-in.pre') %> <%= LT(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.pre') %> <%= journeys->min_to_human(int($journey->{arrival_countdown} / 60)) %> <%= L('status.arrival-in.post') %> + <%= L('status.arrival-in.pre') %> <%= LT(int($journey->{arrival_countdown} / 60)) %> <%= L('status.arrival-in.post') %> % } % elsif ($journey->{arrival_countdown} > 0) { %= L('status.arrival-soon') diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep index ca5ddf8..834f9a8 100644 --- a/templates/_public_status_card.html.ep +++ b/templates/_public_status_card.html.ep @@ -34,14 +34,14 @@ % } data-arrival="<%= $journey->{real_arrival}->epoch %>"> % if ($journey->{departure_countdown} > 60) { - Abfahrt in <%= journeys->min_to_human(int($journey->{departure_countdown} / 60)) %> + Abfahrt in <%= LT(int($journey->{departure_countdown} / 60)) %> % } % elsif ($journey->{departure_countdown} > 0) { Abfahrt in weniger als einer Minute % } % elsif (defined $journey->{arrival_countdown}) { % if ($journey->{arrival_countdown} > 60) { - <%= L('status.arrival-in.pre') %> <%= journeys->min_to_human(int($journey->{arrival_countdown} / 60)) %> <%= L('status.arrival-in.post') %> + <%= L('status.arrival-in.pre') %> <%= LT(int($journey->{arrival_countdown} / 60)) %> <%= L('status.arrival-in.post') %> % } % elsif ($journey->{arrival_countdown} > 0) { %= L('status.arrival-soon') diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep index e3d4bd7..107c638 100644 --- a/templates/layouts/default.html.ep +++ b/templates/layouts/default.html.ep @@ -13,7 +13,7 @@ % while (my ($key, $value) = each %{stash('opengraph') // {}}) { <meta property="og:<%= $key %>" content="<%= $value %>"> % } - % my $av = 'v103'; # asset version + % my $av = 'v104'; # asset version <link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="/static/<%= $av %>/icons/icon-96x96.png" sizes="96x96"> diff --git a/templates/year_in_review.html.ep b/templates/year_in_review.html.ep index e21fbae..db8aca3 100644 --- a/templates/year_in_review.html.ep +++ b/templates/year_in_review.html.ep @@ -17,12 +17,12 @@ % if ($review->{traveling_min_total} > 525) { %= L('review.travel-time.pre') <strong><%= $review->{traveling_percentage_year} %> <%= L('review.travel-time.of-year') %></strong> - (<%= $review->{traveling_time_year} %>) + (<%= LT($review->{traveling_time_year}) %>) %= L('review.travel-time.post') % } % else { %= L('review.travel-time.pre') - <strong><%= $review->{traveling_time_year} %></strong> + <strong><%= LT($review->{traveling_time_year}) %></strong> %= L('review.travel-time.post') % } </p> @@ -67,7 +67,7 @@ </p> <p> %= L('review.time-distance.pre') - <strong><%= $review->{typical_time} %></strong> + <strong><%= LT($review->{typical_time}) %></strong> %= L('review.time-distance.mid') <strong><%= $review->{typical_km} %> km</strong> (<%= $review->{typical_kmh} %> km/h)<%= L('review.time-distance.post') %> </p> @@ -80,17 +80,17 @@ <p> % if ($review->{typical_delay_arr} < $review->{typical_delay_dep}) { %= L('review.delay-decreasing.pre') - <strong><%= $review->{typical_delay_dep_h} %></strong> + <strong><%= LT($review->{typical_delay_dep}) %></strong> %= L('review.delay-decreasing.mid') - <strong><%= $review->{typical_delay_arr_h} %></strong><%= L('review.delay-decreasing.post') %> + <strong><%= LT($review->{typical_delay_arr}) %></strong><%= L('review.delay-decreasing.post') %> % } % elsif ($review->{typical_delay_arr} == $review->{typical_delay_dep}) { %= L('review.delay-constant.pre') - <strong><%= $review->{typical_delay_dep_h} %></strong><%= L('review.delay-constant.post') %> + <strong><%= LT($review->{typical_delay_dep}) %></strong><%= L('review.delay-constant.post') %> % } % else { %= L('review.delay-increasing.pre') - <strong><%= $review->{typical_delay_dep_h} %></strong> + <strong><%= LT($review->{typical_delay_dep}) %></strong> %= L('review.delay-increasing.mid') <strong>+<%= $review->{typical_delay_arr} %></strong><%= L('review.delay-increasing.post') %> % } @@ -103,7 +103,7 @@ <p> <a href="/journey/<%= $review->{longest_t_id} %>"><%= L('review.high-scores.longest-trip.link') %></a>: %= L('review.high-scores.longest-trip.pre') - <strong><%= $review->{longest_t_time} %></strong> + <strong><%= LT($review->{longest_t_min}) %></strong> %= L('review.high-scores.with') <strong><%= $review->{longest_t_type} %> <%= $review->{longest_t_lineno} %></strong> %= L('review.high-scores.from') @@ -135,7 +135,7 @@ <p> <a href="/journey/<%= $review->{shortest_t_id} %>"><%= L('review.high-scores.shortest-trip.link') %></a>: %= L('review.high-scores.shortest-trip.pre') - <strong><%= $review->{shortest_t_time} %></strong> + <strong><%= LT($review->{shortest_t_min}) %></strong> %= L('review.high-scores.with') <strong><%= $review->{shortest_t_type} %> <%= $review->{shortest_t_lineno} %></strong> %= L('review.high-scores.from') @@ -167,49 +167,68 @@ <div class="carousel-item" href="#four"> <h2>Oepsie Woepsie</h2> % if ($review->{issue1_count}) { - <p><strong><%= $review->{issue_percent} %></strong> aller Fahrten liefen nicht wie vorgesehen ab.<br/> - Die häufigsten Anmerkungen waren:</p> + <p> + %= L('review.annotated-percent.pre') + <strong><%= $review->{issue_percent} %></strong><%= L('review.annotated-percent.post') %><br/> + %= L('review.top-annotations') + </p> % for my $i (1 .. 3) { % if ($review->{"issue${i}_count"}) { <p><strong><%= $review->{"issue${i}_count"} %>×</strong> „<%= $review->{"issue${i}_text"} %>“</p> % } % } % } - <p>Lediglich <strong><%= $review->{punctual_percent_h} %></strong> der Fahrten waren pünktlich auf die Minute.</p> + <p> + %= L('review.punctual-percent.pre') + <strong><%= $review->{punctual_percent_h} %></strong><%= L('review.punctual-percent.post') %> + </p> </div> <div class="carousel-item" href="#five"> <h2>De trein is stukkie wukkie</h2> <p> % if ($review->{fgr_percent} >= 0.1) { - <strong><%= $review->{fgr_percent_h} %></strong> deiner Fahrten hatten mindestens eine Stunde Verspätung + %= L('review.hour-delay-percent.pre') + <strong><%= $review->{fgr_percent_h} %></strong><%= L('review.hour-delay-percent.post') %> % } % if ($review->{cancel_count}) { % if ($review->{fgr_percent} >= 0.1) { - und <strong><%= $review->{cancel_count} %></strong> kamen gar nicht erst am Ziel an. + %= L('review.and-cancelled-percent.pre') + <strong><%= $review->{cancel_count} %></strong><%= L('review.and-cancelled-percent.post') %> % } % else { - <strong><%= $review->{cancel_count} %></strong> deiner geplanten Fahrten sind ausgefallen. + %= L('review.cancelled-percent.pre') + <strong><%= $review->{cancel_count} %></strong><%= L('review.and-cancelled-percent.post') %> % } % } </p> % if ($review->{most_delayed_id}) { <p> - Mit <strong><%= $review->{most_delayed_delay_arr} %></strong> hatte <a href="/journey/<%= $review->{most_delayed_id} %>"><%= $review->{most_delayed_type} %> <%= $review->{most_delayed_lineno} %></a> <%= $review->{most_delayed_from} %> → <%= $review->{most_delayed_to} %> die größte Verspätung. + %= L('review.most-delayed.pre') + <strong><%= LT($review->{most_delayed_delay_arr}) %></strong><%= L('review.most-delayed.mid') %> + <a href="/journey/<%= $review->{most_delayed_id} %>"><%= $review->{most_delayed_type} %> <%= $review->{most_delayed_lineno} %></a> <%= $review->{most_delayed_from} %> → <%= $review->{most_delayed_to} %><%= L('review.most-delayed.post') %> </p> % } % if ($review->{most_delay_id}) { <p> - Die Fahrt mit <a href="/journey/<%= $review->{most_delay_id} %>"><%= $review->{most_delay_type} %> <%= $review->{most_delay_lineno} %></a> - von <%= $review->{most_delay_from} %> nach <%= $review->{most_delay_to} %> verlief besonders gemächlich: - sie dauerte <strong><%= $review->{most_delay_delta} %></strong> länger als geplant. + %= L('review.most-delay.pre') + <a href="/journey/<%= $review->{most_delay_id} %>"><%= $review->{most_delay_type} %> <%= $review->{most_delay_lineno} %></a> + %= L('review.most-delay.from') + %= $review->{most_delay_from} + %= L('review.most-delay.to') + %= $review->{most_delay_to} + %= L('review.most-delay.mid') + <strong><%= LT($review->{most_delay_delta}) %></strong><%= L('review.most-delay.post') %> </p> % } % if ($review->{most_undelay_id}) { <p> - In <a href="/journey/<%= $review->{most_undelay_id} %>"><%= $review->{most_undelay_type} %> <%= $review->{most_undelay_lineno} %></a> - wurde hingegen Vmax ausgereizt und die Strecke von - <%= $review->{most_undelay_from} %> nach <%= $review->{most_undelay_to} %> - <strong><%= $review->{most_undelay_delta} %></strong> schneller absolviert als vorgesehen. + %= L('review.most-undelay.pre') + <a href="/journey/<%= $review->{most_undelay_id} %>"><%= $review->{most_undelay_type} %> <%= $review->{most_undelay_lineno} %></a> + %= L('review.most-undelay.from') + %= $review->{most_undelay_from} + %= L('review.most-undelay.to') + %= $review->{most_undelay_to} + <strong><%= LT($review->{most_undelay_delta}) %></strong><%= L('review.most-undelay.post') %> </p> % } </div> |