Skip to content
Snippets Groups Projects
Commit 525a2bfc authored by Mikko Raula's avatar Mikko Raula
Browse files

merged with earlier commits

parents 39735ccd 1a0d95c2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
server/__main__.py
+ 1
− 1
View file @ 525a2bfc
#!/usr/bin/python #!/usr/bin/env python
# coding=utf-8 # coding=utf-8
import sys import sys
......
server/app.py
+ 5
− 4
View file @ 525a2bfc
...@@ -203,20 +203,21 @@ def apiStopInfo(version): ...@@ -203,20 +203,21 @@ def apiStopInfo(version):
# Get info on a specific bus: used in the map view when a bus is focused # Get info on a specific bus: used in the map view when a bus is focused
# URI: /api/v1/bus/<busId>/ # URI: /api/v1/bus/<busId>/
@app.route('/api/v<int:version>/bus/')
@app.route('/api/v<int:version>/bus/<busId>/')
@app.route('/api/v<int:version>/bus/<busId>/<getShape>/') @app.route('/api/v<int:version>/bus/<busId>/<getShape>/')
def apiBusInfo(version, busId, getShape): def apiBusInfo(version, busId = None, getShape = "false"):
if int(version) == 1: # busId is falsely optional here so that we can easily use url_for() for this endpoint in js
if int(version) == 1 and busId != None:
lastModified, dynamicData = locator.getLastResponse() lastModified, dynamicData = locator.getLastResponse()
# for now return a static json
data = dynamicData["result"]["vehicles"][busId] data = dynamicData["result"]["vehicles"][busId]
# add shape to the data # add shape to the data
# route_short_name = lineref from data # route_short_name = lineref from data
if (getShape == "true"): if (getShape == "true"):
data["shape"] = gtfs.getShape(data["lineref"]) data["shape"] = gtfs.getShape(data["lineref"])
if data: if data:
return jsonify(data) return jsonify(data)
......
static/css/stylesheet.css
+ 31
− 0
View file @ 525a2bfc
...@@ -29,6 +29,11 @@ body { height: 100%; overflow-y: scroll; } ...@@ -29,6 +29,11 @@ body { height: 100%; overflow-y: scroll; }
@media only screen and (max-width: 768px) { @media only screen and (max-width: 768px) {
.flex-grow { width: 100%; } .flex-grow { width: 100%; }
/* Column count for the Fli info page */
.card-columns {
column-count: 1;
}
} }
/* sticky footer and header: fixed position (for display units, doesn't scroll) */ /* sticky footer and header: fixed position (for display units, doesn't scroll) */
...@@ -244,6 +249,27 @@ body { ...@@ -244,6 +249,27 @@ body {
right: 0; right: 0;
} }
/* Fli info page cards */
.foli-card {
border: 1px solid #FF9900;
}
.foli-card .card-header {
background-color: #FF9900;
}
th .text-muted {
font-size: 14px;
font-style: normal;
margin: 0;
}
/* Info page cards */
.info-card {
height: 600px;
background-color: #FF9900;
border: 1px solid #FF9900;
margin-bottom: 30px;
}
/* larger screen layout */ /* larger screen layout */
@media (min-width: 768px) { @media (min-width: 768px) {
.header { min-height: 33.63rem; /* 33.63rem = 538.5px, font-size 16 (half of the current image height) */ } .header { min-height: 33.63rem; /* 33.63rem = 538.5px, font-size 16 (half of the current image height) */ }
...@@ -268,4 +294,9 @@ body { ...@@ -268,4 +294,9 @@ body {
width: 80px; width: 80px;
height: 55px; height: 55px;
} }
/* Column count for the Fli info page */
.card-columns {
column-count: 2;
}
} }
templates/foli.html
+ 34
− 46
View file @ 525a2bfc
...@@ -6,16 +6,15 @@ ...@@ -6,16 +6,15 @@
{% set content_lang = 'fi' %} {% set content_lang = 'fi' %}
{% block content %} {% block content %}
<!-- the use of the grid here has some scaling issues on mobile device -->
<div class="container"> <div class="container">
<h1>Föli - Turun seudun joukkoliikenne</h1> <h1>Föli - Turun seudun joukkoliikenne</h1>
<h2>Hinnat</h2> <h2>Hinnat</h2>
<p>Bussissa voit ostaa kertalipun tai ladata matkakortin käteisellä. Samalla lipulla tai matkakortilla on vaihtoaikaa 2 tuntia.</p> <p>Bussissa voit ostaa kertalipun tai ladata matkakortin käteisellä. Samalla lipulla tai matkakortilla on vaihtoaikaa 2 tuntia.</p>
<div class="card-columns" style="column-count: 2;"> <div class="card-columns">
<!-- Single ticket prices --> <!-- Single ticket prices -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Kertaliput</h3> <h3 class="card-title">Kertaliput</h3>
</div> </div>
...@@ -51,14 +50,14 @@ ...@@ -51,14 +50,14 @@
</table> </table>
</div> </div>
<!-- Foli card prices --> <!-- Foli card prices -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Arvokortit</h3> <h3 class="card-title">Arvokortit</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Haltijakohtainen</h4> <h4 class="card-title">Haltijakohtainen</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="3">Aikuiset (&ge; 20 v)</th> <th colspan="3">Aikuiset (&ge; 20 v)</th>
...@@ -80,7 +79,7 @@ ...@@ -80,7 +79,7 @@
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Henkilökohtaiset</h4> <h4 class="card-title">Henkilökohtaiset</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="3">Lapset (alle 15 v)</th> <th colspan="3">Lapset (alle 15 v)</th>
...@@ -99,10 +98,10 @@ ...@@ -99,10 +98,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="3">Nuoret (15-19 v) ja opiskelijat</th> <th colspan="3">Nuoret (15-19 v) ja opiskelijat<br /><p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -118,13 +117,10 @@ ...@@ -118,13 +117,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="card-body"> <table class="table table-striped">
<p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p>
</div>
<table class="table">
<thead> <thead>
<tr> <tr>
<th colspan="3">Seniorit (&ge; 65 v) ja vammaiset</th> <th colspan="3">Seniorit (&ge; 65 v) ja vammaiset<br /><p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -140,22 +136,19 @@ ...@@ -140,22 +136,19 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="card-body">
<p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p>
</div>
<div class="card-footer"> <div class="card-footer">
<p>*ma-pe klo 9:00-12:59, **klo 23:00-04:00</p> <p>*ma-pe klo 9:00-12:59, **klo 23:00-04:00</p>
</div> </div>
</div> </div>
<!-- Foli season pass prices --> <!-- Foli season pass prices -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Kausikortit</h3> <h3 class="card-title">Kausikortit</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Haltijakohtaiset</h4> <h4 class="card-title">Haltijakohtaiset</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="4">Aikuiset (&ge; 20 v)</th> <th colspan="4">Aikuiset (&ge; 20 v)</th>
...@@ -188,7 +181,7 @@ ...@@ -188,7 +181,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="3">Haltijakohtainen erikoiskortti</th> <th colspan="3">Haltijakohtainen erikoiskortti</th>
...@@ -205,7 +198,7 @@ ...@@ -205,7 +198,7 @@
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Henkilökohtaiset</h4> <h4 class="card-title">Henkilökohtaiset</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="4">Lapset (alle 15 v)</th> <th colspan="4">Lapset (alle 15 v)</th>
...@@ -226,10 +219,10 @@ ...@@ -226,10 +219,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="4">Nuoret (15-19 v) ja opiskelijat</th> <th colspan="4">Nuoret (15-19 v) ja opiskelijat<br /><p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -245,15 +238,12 @@ ...@@ -245,15 +238,12 @@
<td>33 &euro;</td> <td>33 &euro;</td>
<td>8</td> <td>8</td>
</tr> </tr>
<tr>
<td colspan="4" class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</td>
</tr>
</tbody> </tbody>
</table> </table>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="4">Seniorit (&ge; 65 v) ja vammaiset</th> <th colspan="4">Seniorit (&ge; 65 v) ja vammaiset<br /><p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -269,21 +259,18 @@ ...@@ -269,21 +259,18 @@
<td>33 &euro;</td> <td>33 &euro;</td>
<td>8</td> <td>8</td>
</tr> </tr>
<tr>
<td colspan="4" class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<!-- Foli double card prices --> <!-- Foli double card prices -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Tuplakortit</h3> <h3 class="card-title">Tuplakortit</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Haltijakohtainen</h4> <h4 class="card-title">Haltijakohtainen</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="2">Aikuiset (&ge; 20 v)</th> <th colspan="2">Aikuiset (&ge; 20 v)</th>
...@@ -299,10 +286,10 @@ ...@@ -299,10 +286,10 @@
<div class="card-body"> <div class="card-body">
<h4 class="card-title">Henkilökohtaiset</h4> <h4 class="card-title">Henkilökohtaiset</h4>
</div> </div>
<table class="table"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th colspan="2">Nuoret (15-19 v) ja opiskelijat</th> <th colspan="2">Nuoret (15-19 v) ja opiskelijat<br /><p class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</p></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -310,21 +297,18 @@ ...@@ -310,21 +297,18 @@
<td>30 pv</td> <td>30 pv</td>
<td>36 &euro;</td> <td>36 &euro;</td>
</tr> </tr>
<tr>
<td colspan="2" class="text-muted">- Henkikirjoilla tai asunto-osoite Turussa, Kaarinassa, Raisiossa, Naantalissa, Liedossa tai Ruskolla.</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<!-- Tourist cards --> <!-- Tourist cards -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Matkailijakortit</h3> <h3 class="card-title">Matkailijakortit</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<p>Myydään myös Turku Touringin matkailuneuvonnassa, Aurakatu 4. Ei myydä busseissa.</p> <p>Myydään myös Turku Touringin matkailuneuvonnassa osoitteessa Aurakatu 4. Ei myydä busseissa.</p>
</div> </div>
<table class="table"> <table class="table table-striped">
<tbody> <tbody>
<tr> <tr>
<td>1 vrk</td> <td>1 vrk</td>
...@@ -354,7 +338,7 @@ ...@@ -354,7 +338,7 @@
</table> </table>
</div> </div>
<!-- Mobile tickets --> <!-- Mobile tickets -->
<div class="card"> <div class="card foli-card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Mobiililippu</h3> <h3 class="card-title">Mobiililippu</h3>
</div> </div>
...@@ -362,13 +346,15 @@ ...@@ -362,13 +346,15 @@
<p> <p>
Mobiilisovelluksessa myydään aikuisten ja lasten kertalippuja sekä erimittaisia matkailijatuotteita. Mobiilisovelluksessa myydään aikuisten ja lasten kertalippuja sekä erimittaisia matkailijatuotteita.
Maksutapoina ovat IQ-maksu, pankki- tai luottokortti sekä matkapuhelinmaksu. Hintaan lisätään Maksutapoina ovat IQ-maksu, pankki- tai luottokortti sekä matkapuhelinmaksu. Hintaan lisätään
maksutapalisä. Ohjeet sovelluksen lataamiseen löydät sivun ylälaidan linkistä "Mobiilisovellus". maksutapalisä. Ohjeet sovelluksen lataamiseen löydät etusivun linkistä "Mobiilisovellus".
</p> </p>
</div> </div>
</div> </div>
<!-- Sale and service locations --> <!-- Sale and service locations -->
<div class="card"> <div class="card foli-card">
<div class="card-header">Myynti- ja palvelupisteet</div> <div class="card-header">
<h3 class="card-title">Myynti- ja palvelupisteet</h3>
</div>
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-4">Turku:</div> <div class="col-4">Turku:</div>
...@@ -397,8 +383,10 @@ ...@@ -397,8 +383,10 @@
</div> </div>
</div> </div>
<!-- Foli card top-up locations --> <!-- Foli card top-up locations -->
<div class="card"> <div class="card foli-card">
<div class="card-header">Latauspisteet</div> <div class="card-header">
<h3 class="card-title">Latauspisteet</h3>
</div>
<div class="card-body"> <div class="card-body">
<div class="col">Turun kaupunginkirjasto</div> <div class="col">Turun kaupunginkirjasto</div>
<div class="col">Sokos Wiklund</div> <div class="col">Sokos Wiklund</div>
......
templates/info.html
+ 37
− 2
View file @ 525a2bfc
{% extends 'internal/base.html' %} {% extends 'internal/base.html' %}
{% set title = 'Info' %} {% set title = 'Info' %}
{% set sticky_banners = g.is_kiosk %} {% set sticky_banners = true %}
{% set localized = false %} {% set localized = false %}
{% set content_lang = 'fi' %} {% set content_lang = 'fi' %}
{% block content %} {% block content %}
<!-- TODO: created to prevent accidental 404 during presentations -->
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="card info-card">
<a class="twitter-timeline" data-height="600" data-dnt="true" data-theme="light" href="https://twitter.com/Turkukaupunki?ref_src=twsrc%5Etfw">Tweets by Turkukaupunki</a>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
</div>
</div>
<div class="col-md-6">
<div class="card info-card">
<div class="card-header">
<h3 class="card-title">Visit Turku -uutiset</h3>
</div>
<script type="text/javascript" src="http://output92.rssinclude.com/output?type=js&amp;id=1172169&amp;hash=c1c032487ad85904644bb22308686454"></script>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="card info-card" style="overflow: auto;">
<div class="card-header">
<h3 class="card-title">AccuWeather</h3>
</div>
<a href="https://www.accuweather.com/en/fi/turku/134768/weather-forecast/134768" class="aw-widget-legal">
</a><div id="awtd1519238716374" class="aw-widget-36hour" data-locationkey="134768" data-unit="c" data-language="fi" data-useip="false" data-uid="awtd1519238716374" data-editlocation="false"></div>
<script type="text/javascript" src="https://oap.accuweather.com/launch.js"></script>
</div>
</div>
<div class="col-md-6">
<!-- Empty spot for another card. -->
</div>
</div>
</div>
{% endblock content %} {% endblock content %}
templates/map.html
+ 25
− 21
View file @ 525a2bfc
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
--> -->
<!-- Show next buses?? --> <!-- Show next buses?? -->
<div class="list-group box-shadow"> <div class="card box-shadow border-foli content-spaced-lg">
<div class="list-group-item list-group-item-foli border-foli"> <div class="list-group list-group-flush">
<div class="list-group-item list-group-item-foli">
<div class="row"> <div class="row">
<span class="col-8"><strong>{{ _("Line") }} / {{ _("Destination") }}</strong></span> <span class="col-8"><strong>{{ _("Line") }} / {{ _("Destination") }}</strong></span>
<span class="col-2 text-center"><strong>{{ _("Time") }}</strong></span> <span class="col-2 text-center"><strong>{{ _("Time") }}</strong></span>
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
</div> </div>
{% for bus in arrivals %} {% for bus in arrivals %}
<div class="list-group-item list-group-item-action border-foli {% if not loop.first %}border-top-0{% endif %}"> <div class="list-group-item list-group-item-action">
<a class="row link-unstyled" href="#"> <a class="row link-unstyled" href="#">
<span class="col-8 text-foli">{{ util.line_name(bus) }}</span> <span class="col-8 text-foli">{{ util.line_name(bus) }}</span>
<span class="col-2 text-center">{{ util.time_short(bus.time) }}</span> <span class="col-2 text-center">{{ util.time_short(bus.time) }}</span>
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div>
<!-- draw the map --> <!-- draw the map -->
<div class="card border-foli box-shadow"> <div class="card border-foli box-shadow">
...@@ -270,14 +272,15 @@ ...@@ -270,14 +272,15 @@
}); });
// get information about the focused bus // get information about the focused bus
var requestFocus = focusedMarker;
$.getJSON( $.getJSON(
// cheat way? need the dynamic busId to the api, don't know how to do it any other way "{{ url_for('apiBusInfo', version = 1, _external = True) }}" + focusedMarker + '/true',
'../api/v1/bus/' + focusedMarker + '/true',
function (data) { function (data) {
// poor man's locking (the A in Ajax is for Asynchronous :))
if (requestFocus !== focusedMarker)
return;
focusedBus = data; focusedBus = data;
//$.each( data, function( key, value ) {
//focusedBus[key] = value;
//});
console.log("found this bus info: ", focusedBus); console.log("found this bus info: ", focusedBus);
...@@ -309,7 +312,8 @@ ...@@ -309,7 +312,8 @@
}; };
var drawOneBus = function() { var drawOneBus = function() {
$.getJSON('../api/v1/bus/' + focusedMarker + '/false', $.getJSON(
"{{ url_for('apiBusInfo', version = 1, _external = True) }}" + focusedMarker + '/false',
function (resultData) { function (resultData) {
// poor man's locking // poor man's locking
if (trackingLoop === null) if (trackingLoop === null)
......
translations/en/LC_MESSAGES/messages.po
+ 27
− 25
View file @ 525a2bfc
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-02-11 10:30+0200\n" "POT-Creation-Date: 2018-02-22 17:25+0200\n"
"PO-Revision-Date: 2018-02-10 01:33+0200\n" "PO-Revision-Date: 2018-02-10 01:33+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n" "Language: en\n"
...@@ -18,7 +18,7 @@ msgstr "" ...@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.3\n" "Generated-By: Babel 2.5.3\n"
#: templates/index.html:3 templates/internal/base.html:104 #: templates/index.html:3 templates/internal/base.html:109
msgid "Home" msgid "Home"
msgstr "" msgstr ""
...@@ -59,82 +59,84 @@ msgstr "" ...@@ -59,82 +59,84 @@ msgstr ""
msgid "Live Bus Traffic Nearby" msgid "Live Bus Traffic Nearby"
msgstr "" msgstr ""
#: templates/timetables.html:10 #: templates/map.html:28 templates/timetables.html:19
msgid "Busses Arriving Soon" #: templates/timetables.html:54
msgstr ""
#: templates/timetables.html:18 templates/timetables.html:53
msgid "Line" msgid "Line"
msgstr "" msgstr ""
#: templates/timetables.html:18 templates/timetables.html:54 #: templates/map.html:28 templates/timetables.html:19
#: templates/timetables.html:55
msgid "Destination" msgid "Destination"
msgstr "" msgstr ""
#: templates/timetables.html:19 #: templates/map.html:29 templates/timetables.html:20
msgid "Time" msgid "Time"
msgstr "" msgstr ""
#: templates/timetables.html:20 #: templates/map.html:30 templates/timetables.html:21
msgid "ETA" msgid "ETA"
msgstr "" msgstr ""
#: templates/timetables.html:38 #: templates/timetables.html:10
msgid "Busses Arriving Soon"
msgstr ""
#: templates/timetables.html:39
msgid "Information last updated a minute ago" msgid "Information last updated a minute ago"
msgstr "" msgstr ""
#: templates/timetables.html:45 #: templates/timetables.html:46
msgid "Today's Schedule" msgid "Today's Schedule"
msgstr "" msgstr ""
#: templates/timetables.html:55 templates/timetables.html:92 #: templates/timetables.html:56 templates/timetables.html:93
msgid "Departure Time" msgid "Departure Time"
msgstr "" msgstr ""
#: templates/internal/base.html:86 templates/timetables.html:82 #: templates/internal/base.html:91 templates/timetables.html:83
#: templates/timetables.html:108 #: templates/timetables.html:109
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: templates/timetables.html:91 #: templates/timetables.html:92
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: templates/internal/base.html:43 #: templates/internal/base.html:45
msgid "Logo" msgid "Logo"
msgstr "" msgstr ""
#: templates/internal/base.html:56 #: templates/internal/base.html:61
msgid "" msgid ""
"The content for this view is not available for your selected language, " "The content for this view is not available for your selected language, "
"the contents are displayed below in their original language." "the contents are displayed below in their original language."
msgstr "" msgstr ""
#: templates/internal/base.html:74 #: templates/internal/base.html:79
msgid "Opening external content" msgid "Opening external content"
msgstr "" msgstr ""
#: templates/internal/base.html:80 #: templates/internal/base.html:85
msgid "This content is available on an external site in the following address:" msgid "This content is available on an external site in the following address:"
msgstr "" msgstr ""
#: templates/internal/base.html:82 #: templates/internal/base.html:87
msgid "Please scan the below code to access it on your personal device:" msgid "Please scan the below code to access it on your personal device:"
msgstr "" msgstr ""
#: templates/internal/base.html:99 #: templates/internal/base.html:104
msgid "Terms" msgid "Terms"
msgstr "" msgstr ""
#: templates/internal/base.html:109 #: templates/internal/base.html:114
msgid "English" msgid "English"
msgstr "" msgstr ""
#: templates/internal/base.html:110 #: templates/internal/base.html:115
msgid "Finnish" msgid "Finnish"
msgstr "" msgstr ""
#: templates/internal/base.html:111 #: templates/internal/base.html:116
msgid "Swedish" msgid "Swedish"
msgstr "" msgstr ""
......
translations/fi/LC_MESSAGES/messages.po
+ 27
− 25
View file @ 525a2bfc
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2018-02-11 10:30+0200\n" "POT-Creation-Date: 2018-02-22 17:25+0200\n"
"PO-Revision-Date: 2018-02-10 01:35+0200\n" "PO-Revision-Date: 2018-02-10 01:35+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fi\n" "Language: fi\n"
...@@ -18,7 +18,7 @@ msgstr "" ...@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.5.3\n" "Generated-By: Babel 2.5.3\n"
#: templates/index.html:3 templates/internal/base.html:104 #: templates/index.html:3 templates/internal/base.html:109
msgid "Home" msgid "Home"
msgstr "Alku" msgstr "Alku"
...@@ -59,52 +59,54 @@ msgstr "Tietoa Fölin palveluista" ...@@ -59,52 +59,54 @@ msgstr "Tietoa Fölin palveluista"
msgid "Live Bus Traffic Nearby" msgid "Live Bus Traffic Nearby"
msgstr "Lähistön reaaliaikainen bussiliikenne" msgstr "Lähistön reaaliaikainen bussiliikenne"
#: templates/timetables.html:10 #: templates/map.html:28 templates/timetables.html:19
msgid "Busses Arriving Soon" #: templates/timetables.html:54
msgstr "Pian saapuvat bussit"
#: templates/timetables.html:18 templates/timetables.html:53
msgid "Line" msgid "Line"
msgstr "Linja" msgstr "Linja"
#: templates/timetables.html:18 templates/timetables.html:54 #: templates/map.html:28 templates/timetables.html:19
#: templates/timetables.html:55
msgid "Destination" msgid "Destination"
msgstr "Määränpää" msgstr "Määränpää"
#: templates/timetables.html:19 #: templates/map.html:29 templates/timetables.html:20
msgid "Time" msgid "Time"
msgstr "Aika" msgstr "Aika"
#: templates/timetables.html:20 #: templates/map.html:30 templates/timetables.html:21
msgid "ETA" msgid "ETA"
msgstr "ETA" msgstr "ETA"
#: templates/timetables.html:38 #: templates/timetables.html:10
msgid "Busses Arriving Soon"
msgstr "Pian saapuvat bussit"
#: templates/timetables.html:39
msgid "Information last updated a minute ago" msgid "Information last updated a minute ago"
msgstr "Tiedot päivitetty viimeksi minuutti sitten" msgstr "Tiedot päivitetty viimeksi minuutti sitten"
#: templates/timetables.html:45 #: templates/timetables.html:46
msgid "Today's Schedule" msgid "Today's Schedule"
msgstr "Päivän aikataulu" msgstr "Päivän aikataulu"
#: templates/timetables.html:55 templates/timetables.html:92 #: templates/timetables.html:56 templates/timetables.html:93
msgid "Departure Time" msgid "Departure Time"
msgstr "Lähtöaika" msgstr "Lähtöaika"
#: templates/internal/base.html:86 templates/timetables.html:82 #: templates/internal/base.html:91 templates/timetables.html:83
#: templates/timetables.html:108 #: templates/timetables.html:109
msgid "Close" msgid "Close"
msgstr "Sulje" msgstr "Sulje"
#: templates/timetables.html:91 #: templates/timetables.html:92
msgid "Stop" msgid "Stop"
msgstr "Pysäkki" msgstr "Pysäkki"
#: templates/internal/base.html:43 #: templates/internal/base.html:45
msgid "Logo" msgid "Logo"
msgstr "Logo" msgstr "Logo"
#: templates/internal/base.html:56 #: templates/internal/base.html:61
msgid "" msgid ""
"The content for this view is not available for your selected language, " "The content for this view is not available for your selected language, "
"the contents are displayed below in their original language." "the contents are displayed below in their original language."
...@@ -112,33 +114,33 @@ msgstr "" ...@@ -112,33 +114,33 @@ msgstr ""
"Tämän näkymän sisältöä ei ole saatavilla valitsemallasi kielellä, " "Tämän näkymän sisältöä ei ole saatavilla valitsemallasi kielellä, "
"sisältö on alla alkuperäisellä kielellään." "sisältö on alla alkuperäisellä kielellään."
#: templates/internal/base.html:74 #: templates/internal/base.html:79
msgid "Opening external content" msgid "Opening external content"
msgstr "Avataan ulkoista sisältöä" msgstr "Avataan ulkoista sisältöä"
#: templates/internal/base.html:80 #: templates/internal/base.html:85
msgid "This content is available on an external site in the following address:" msgid "This content is available on an external site in the following address:"
msgstr "Tämä sisältö on saatavilla ulkoisella sivustolla seuraavassa osoitteessa:" msgstr "Tämä sisältö on saatavilla ulkoisella sivustolla seuraavassa osoitteessa:"
#: templates/internal/base.html:82 #: templates/internal/base.html:87
msgid "Please scan the below code to access it on your personal device:" msgid "Please scan the below code to access it on your personal device:"
msgstr "" msgstr ""
"Ole hyvä ja skannaa alla oleva koodi henkilökohtaisella laitteellasi, " "Ole hyvä ja skannaa alla oleva koodi henkilökohtaisella laitteellasi, "
"avataksesi tämän sisällön:" "avataksesi tämän sisällön:"
#: templates/internal/base.html:99 #: templates/internal/base.html:104
msgid "Terms" msgid "Terms"
msgstr "Termit" msgstr "Termit"
#: templates/internal/base.html:109 #: templates/internal/base.html:114
msgid "English" msgid "English"
msgstr "Englanti" msgstr "Englanti"
#: templates/internal/base.html:110 #: templates/internal/base.html:115
msgid "Finnish" msgid "Finnish"
msgstr "Suomi" msgstr "Suomi"
#: templates/internal/base.html:111 #: templates/internal/base.html:116
msgid "Swedish" msgid "Swedish"
msgstr "Ruotsi" msgstr "Ruotsi"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment