diff --git a/templates/foli/app.html b/templates/foli/app.html index ab6c6d86b97f92d273b04495a57b57eb62dfb583..19d30be885b3e36da52a6522ab827da4dee806ea 100644 --- a/templates/foli/app.html +++ b/templates/foli/app.html @@ -1,7 +1,7 @@ {% extends 'internal/base.html' %} {% set title = 'Föli-Äppi' %} -{% set sticky_banners = true %} +{% set sticky_banners = g.is_kiosk %} {% set localized = false %} {% set content_lang = 'fi' %} diff --git a/templates/foli/index.html b/templates/foli/index.html index 0befdc0bca21373f7e36acd8b5b7c1ebfb0f7fcb..be6aeadb32ce6f486ad04e924b47d5d53bf3b7c1 100644 --- a/templates/foli/index.html +++ b/templates/foli/index.html @@ -1,7 +1,7 @@ {% extends 'internal/base.html' %} {% set title = 'Föli-info' %} -{% set sticky_banners = true %} +{% set sticky_banners = g.is_kiosk %} {% set localized = false %} {% set content_lang = 'fi' %} diff --git a/templates/info.html b/templates/info.html index 824e1454c77f52ae77b46445222f5745f0dddfe9..09340bf561525c218afd4fa17851d2c44336b2bf 100644 --- a/templates/info.html +++ b/templates/info.html @@ -1,7 +1,7 @@ {% extends 'internal/base.html' %} {% set title = 'Info' %} -{% set sticky_banners = true %} +{% set sticky_banners = g.is_kiosk %} {% set localized = false %} {% set content_lang = 'fi' %} diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po index 2e52da21a8e7882e651d9e81078c1d4405704ba9..30db9ab053123f90d82b454a8635330a4b1a02a1 100644 --- a/translations/en/LC_MESSAGES/messages.po +++ b/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-02-28 19:46+0200\n" +"POT-Creation-Date: 2018-03-05 11:58+0200\n" "PO-Revision-Date: 2018-02-10 01:33+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: en\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.3\n" -#: templates/index.html:3 templates/internal/base.html:109 +#: templates/index.html:3 templates/internal/base.html:122 msgid "Home" msgstr "" @@ -44,7 +44,7 @@ msgid "Ticket prices" msgstr "" #: templates/index.html:60 -msgid "Föli application" +msgid "Föli App" msgstr "" #: templates/map.html:18 @@ -69,66 +69,81 @@ msgstr "" msgid "ETA" msgstr "" +#: templates/map.html:57 +msgid "" +"Location information is updated with a 10-30 second delay. Due to network" +" conditions, latency or lost location updates buses may at times appear " +"to move in an unrealistic way." +msgstr "" + #: templates/timetables.html:10 msgid "Busses Arriving Soon" msgstr "" #: templates/timetables.html:39 -msgid "Information last updated a minute ago" +msgid "Information last updated: " msgstr "" #: templates/timetables.html:46 msgid "Today's Schedule" msgstr "" -#: templates/timetables.html:56 templates/timetables.html:93 +#: templates/timetables.html:56 templates/timetables.html:95 msgid "Departure Time" msgstr "" -#: templates/internal/base.html:91 templates/timetables.html:83 -#: templates/timetables.html:109 +#: templates/timetables.html:83 +msgid "Line Schedule" +msgstr "" + +#: templates/timetables.html:83 +msgid "(partial)" +msgstr "" + +#: templates/internal/base.html:104 templates/timetables.html:85 +#: templates/timetables.html:127 msgid "Close" msgstr "" -#: templates/timetables.html:92 +#: templates/timetables.html:94 msgid "Stop" msgstr "" -#: templates/internal/base.html:45 +#: templates/internal/base.html:58 msgid "Logo" msgstr "" -#: templates/internal/base.html:61 +#: templates/internal/base.html:74 msgid "" "The content for this view is not available for your selected language, " "the contents are displayed below in their original language." msgstr "" -#: templates/internal/base.html:79 +#: templates/internal/base.html:92 msgid "Opening external content" msgstr "" -#: templates/internal/base.html:85 +#: templates/internal/base.html:98 msgid "This content is available on an external site in the following address:" msgstr "" -#: templates/internal/base.html:87 +#: templates/internal/base.html:100 msgid "Please scan the below code to access it on your personal device:" msgstr "" -#: templates/internal/base.html:104 +#: templates/internal/base.html:117 msgid "Terms" msgstr "" -#: templates/internal/base.html:114 +#: templates/internal/base.html:127 msgid "English" msgstr "" -#: templates/internal/base.html:115 +#: templates/internal/base.html:128 msgid "Finnish" msgstr "" -#: templates/internal/base.html:116 +#: templates/internal/base.html:129 msgid "Swedish" msgstr "" @@ -155,3 +170,9 @@ msgstr "" #~ msgid "Information about Föli services" #~ msgstr "" +#~ msgid "Föli application" +#~ msgstr "" + +#~ msgid "Information last updated a minute ago" +#~ msgstr "" + diff --git a/translations/fi/LC_MESSAGES/messages.po b/translations/fi/LC_MESSAGES/messages.po index 67dd80ea7e2c5caf00c0c7f110863c00d4a88e77..464c79d996d37c792446d9df0e8703e80331ef2d 100644 --- a/translations/fi/LC_MESSAGES/messages.po +++ b/translations/fi/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-02-28 19:46+0200\n" +"POT-Creation-Date: 2018-03-05 11:58+0200\n" "PO-Revision-Date: 2018-02-10 01:35+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: fi\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.3\n" -#: templates/index.html:3 templates/internal/base.html:109 +#: templates/index.html:3 templates/internal/base.html:122 msgid "Home" msgstr "Alku" @@ -44,8 +44,8 @@ msgid "Ticket prices" msgstr "Lippuhinnat" #: templates/index.html:60 -msgid "Föli application" -msgstr "Föli applikaatio" +msgid "Föli App" +msgstr "" #: templates/map.html:18 msgid "Live Bus Traffic Nearby" @@ -69,36 +69,51 @@ msgstr "Aika" msgid "ETA" msgstr "ETA" +#: templates/map.html:57 +msgid "" +"Location information is updated with a 10-30 second delay. Due to network" +" conditions, latency or lost location updates buses may at times appear " +"to move in an unrealistic way." +msgstr "" + #: templates/timetables.html:10 msgid "Busses Arriving Soon" msgstr "Pian saapuvat bussit" #: templates/timetables.html:39 -msgid "Information last updated a minute ago" -msgstr "Tiedot päivitetty viimeksi minuutti sitten" +msgid "Information last updated: " +msgstr "" #: templates/timetables.html:46 msgid "Today's Schedule" msgstr "Päivän aikataulu" -#: templates/timetables.html:56 templates/timetables.html:93 +#: templates/timetables.html:56 templates/timetables.html:95 msgid "Departure Time" msgstr "Lähtöaika" -#: templates/internal/base.html:91 templates/timetables.html:83 -#: templates/timetables.html:109 +#: templates/timetables.html:83 +msgid "Line Schedule" +msgstr "" + +#: templates/timetables.html:83 +msgid "(partial)" +msgstr "" + +#: templates/internal/base.html:104 templates/timetables.html:85 +#: templates/timetables.html:127 msgid "Close" msgstr "Sulje" -#: templates/timetables.html:92 +#: templates/timetables.html:94 msgid "Stop" msgstr "Pysäkki" -#: templates/internal/base.html:45 +#: templates/internal/base.html:58 msgid "Logo" msgstr "Logo" -#: templates/internal/base.html:61 +#: templates/internal/base.html:74 msgid "" "The content for this view is not available for your selected language, " "the contents are displayed below in their original language." @@ -106,33 +121,33 @@ msgstr "" "Tämän näkymän sisältöä ei ole saatavilla valitsemallasi kielellä, " "sisältö on alla alkuperäisellä kielellään." -#: templates/internal/base.html:79 +#: templates/internal/base.html:92 msgid "Opening external content" msgstr "Avataan ulkoista sisältöä" -#: templates/internal/base.html:85 +#: templates/internal/base.html:98 msgid "This content is available on an external site in the following address:" msgstr "Tämä sisältö on saatavilla ulkoisella sivustolla seuraavassa osoitteessa:" -#: templates/internal/base.html:87 +#: templates/internal/base.html:100 msgid "Please scan the below code to access it on your personal device:" msgstr "" "Ole hyvä ja skannaa alla oleva koodi henkilökohtaisella laitteellasi, " "avataksesi tämän sisällön:" -#: templates/internal/base.html:104 +#: templates/internal/base.html:117 msgid "Terms" msgstr "Termit" -#: templates/internal/base.html:114 +#: templates/internal/base.html:127 msgid "English" msgstr "Englanti" -#: templates/internal/base.html:115 +#: templates/internal/base.html:128 msgid "Finnish" msgstr "Suomi" -#: templates/internal/base.html:116 +#: templates/internal/base.html:129 msgid "Swedish" msgstr "Ruotsi" @@ -159,3 +174,9 @@ msgstr "Seuraava" #~ msgid "Information about Föli services" #~ msgstr "Tietoa Fölin palveluista" +#~ msgid "Föli application" +#~ msgstr "Föli applikaatio" + +#~ msgid "Information last updated a minute ago" +#~ msgstr "Tiedot päivitetty viimeksi minuutti sitten" +