From e35a2a70a3ddb21751b15e7a9e107af827d86798 Mon Sep 17 00:00:00 2001 From: Grollicus <cccvgitlab.db5c7b60@grollmann.eu> Date: Mon, 28 Dec 2020 23:06:11 +0100 Subject: [PATCH] changed timezone warning text --- src/plainui/jinja2/plainui/fahrplan.html | 2 +- src/plainui/jinja2/plainui/my_fahrplan.html | 2 +- src/plainui/jinja2/plainui/public_fahrplan.html | 2 +- src/plainui/locale/de/LC_MESSAGES/django.po | 4 ++-- src/plainui/locale/en/LC_MESSAGES/django.po | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plainui/jinja2/plainui/fahrplan.html b/src/plainui/jinja2/plainui/fahrplan.html index a97b49290..661aa14ed 100644 --- a/src/plainui/jinja2/plainui/fahrplan.html +++ b/src/plainui/jinja2/plainui/fahrplan.html @@ -9,7 +9,7 @@ share_url = url('plainui:fahrplan', conf_slug=conf.slug), report_url = url('plainui:fahrplan', conf_slug=conf.slug)) }} {% if timezone_warning %} - <div class="text-warning">{{ _("Warning, your timezone is configured to %(user_timezone)s and does not match the conference timezone %(conf_timezone)s", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> + <div class="text-warning">{{ _("Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> {% endif %} diff --git a/src/plainui/jinja2/plainui/my_fahrplan.html b/src/plainui/jinja2/plainui/my_fahrplan.html index 60d5bd108..f35eaef21 100644 --- a/src/plainui/jinja2/plainui/my_fahrplan.html +++ b/src/plainui/jinja2/plainui/my_fahrplan.html @@ -8,7 +8,7 @@ share_url = url('plainui:my_fahrplan', conf_slug=conf.slug), report_url = url('plainui:my_fahrplan', conf_slug=conf.slug)) }} {% if timezone_warning %} - <div class="text-warning">{{ _("Warning, your timezone is configured to %(user_timezone)s and does not match the conference timezone %(conf_timezone)s", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> + <div class="text-warning">{{ _("Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> {% endif %} {# TODO: Download options diff --git a/src/plainui/jinja2/plainui/public_fahrplan.html b/src/plainui/jinja2/plainui/public_fahrplan.html index 913a0f146..f9d5d35ec 100644 --- a/src/plainui/jinja2/plainui/public_fahrplan.html +++ b/src/plainui/jinja2/plainui/public_fahrplan.html @@ -18,7 +18,7 @@ <body class="rc3-fahrplan__pub-body p-4"> <h1 class="h2">{{ _("%(conf)s Fahrplan", conf=conf.name) }}</h1> {% if timezone_warning %} - <div class="text-warning">{{ _("Warning, your timezone is configured to %(user_timezone)s and does not match the conference timezone %(conf_timezone)s", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> + <div class="text-warning">{{ _("Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div> {% endif %} {% if mode == 'list' %} diff --git a/src/plainui/locale/de/LC_MESSAGES/django.po b/src/plainui/locale/de/LC_MESSAGES/django.po index 9d5c6719a..fde3b1023 100644 --- a/src/plainui/locale/de/LC_MESSAGES/django.po +++ b/src/plainui/locale/de/LC_MESSAGES/django.po @@ -779,8 +779,8 @@ msgid "schedule" msgstr "Zeitplan" #, python-format -msgid "Warning, your timezone is configured to %(user_timezone)s and does not match the conference timezone %(conf_timezone)s" -msgstr "Achtung, deine Zeitzone ist auf %(user_timezone)s eingestellt und entspricht nicht der Konferenzzeitzone %(conf_timezone)s" +msgid "Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone" +msgstr "Deine Zeitzone ist auf %(user_timezone)s eingestellt, die Konferenzzeitzone ist %(conf_timezone)s - zeige Uhrzeiten in deiner Zeitzone" #, python-format msgid "Day %(n)s" diff --git a/src/plainui/locale/en/LC_MESSAGES/django.po b/src/plainui/locale/en/LC_MESSAGES/django.po index 6536c1adb..e4cdd8bec 100644 --- a/src/plainui/locale/en/LC_MESSAGES/django.po +++ b/src/plainui/locale/en/LC_MESSAGES/django.po @@ -779,7 +779,7 @@ msgid "schedule" msgstr "" #, python-format -msgid "Warning, your timezone is configured to %(user_timezone)s and does not match the conference timezone %(conf_timezone)s" +msgid "Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone" msgstr "" #, python-format -- GitLab