From 653273496e1ef06a3eff9107b3633b77340ff233 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 11 Nov 2020 18:53:33 +0100 Subject: [PATCH 1/6] refine wording --- scheduler/main/templates/main/invitation_form.html | 4 ++-- scheduler/main/views.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scheduler/main/templates/main/invitation_form.html b/scheduler/main/templates/main/invitation_form.html index 9f04cfa..6189dbc 100644 --- a/scheduler/main/templates/main/invitation_form.html +++ b/scheduler/main/templates/main/invitation_form.html @@ -4,13 +4,13 @@ {% block title %}{% translate "Schedule appointment" %}{% endblock %} {% block content %} -

{% blocktranslate with schedule=object.schedule %}Schedule appointment for {{ schedule }}{% endblocktranslate %}

+

{{ object.schedule }}

{% csrf_token %} {% bootstrap_form_errors form %} -

{% translate 'Please select one of the available timeslots to make an appointment. You will still be able to change your selection later.' %}

+

{% translate 'Please select one of the available timeslots to make an appointment. You will still be able to change your selection later using this link.' %}

diff --git a/scheduler/main/views.py b/scheduler/main/views.py index 7469402..c3d6685 100644 --- a/scheduler/main/views.py +++ b/scheduler/main/views.py @@ -128,7 +128,7 @@ class InvitationUpdateView(UpdateView): )) ok = r.ok if ok: - messages.success(self.request, _('Your reservation has been saved.')) + messages.success(self.request, _('Your booking has been stored.')) else: self.object.timeslot = None self.object.save() -- GitLab From 58c2992b72f804b773db0566da53535cd48b1b8b Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 11 Nov 2020 18:53:38 +0100 Subject: [PATCH 2/6] translations --- scheduler/locale/de/LC_MESSAGES/django.po | 27 +++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/scheduler/locale/de/LC_MESSAGES/django.po b/scheduler/locale/de/LC_MESSAGES/django.po index b9317bf..34c5802 100644 --- a/scheduler/locale/de/LC_MESSAGES/django.po +++ b/scheduler/locale/de/LC_MESSAGES/django.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-03 15:34+0000\n" +"POT-Creation-Date: 2020-11-11 17:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +49,7 @@ msgstr "Kürzel" msgid "Timeslot" msgstr "Termin" -#: scheduler/main/templates/base.html:27 +#: scheduler/main/templates/base.html:28 msgid "Logout" msgstr "Abmelden" @@ -58,17 +57,13 @@ msgstr "Abmelden" msgid "Schedule appointment" msgstr "Termin buchen" -#: scheduler/main/templates/main/invitation_form.html:7 -#, python-format -msgid "Schedule appointment for %(schedule)s" -msgstr "Termin für %(schedule)s buchen" - #: scheduler/main/templates/main/invitation_form.html:13 msgid "" "Please select one of the available timeslots to make an appointment. You " -"will still be able to change your selection later." +"will still be able to change your selection later using this link." msgstr "" -"Bitte wäheln Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch danach jederzeit ändern." +"Bitte wäheln Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch " +"danach jederzeit über diesen Link ändern." #: scheduler/main/templates/main/invitation_form.html:41 msgid "Reset" @@ -139,10 +134,14 @@ msgstr "Anmelden" msgid "Login" msgstr "Anmeldung" -#: scheduler/main/views.py:49 +#: scheduler/main/views.py:59 msgid "Data has been saved." msgstr "Daten wurden gespeichert." -#: scheduler/main/views.py:110 -msgid "Your reservation has been saved." -msgstr "Ihre Reservierung wurde gespeichert." +#: scheduler/main/views.py:131 +msgid "Your booking has been stored." +msgstr "Ihre Buchung wurde gespeichert." + +#: scheduler/main/views.py:135 +msgid "An error occured." +msgstr "Ein Fehler ist aufgetreten." -- GitLab From 837a829bdf849e1db20198c3cbdc37ae43e482e6 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 11 Nov 2020 18:54:25 +0100 Subject: [PATCH 3/6] typo: TITEL --- scheduler/context_processors.py | 2 +- scheduler/main/templates/base.html | 4 ++-- scheduler/settings/default.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scheduler/context_processors.py b/scheduler/context_processors.py index 90d33ed..54bb213 100644 --- a/scheduler/context_processors.py +++ b/scheduler/context_processors.py @@ -21,6 +21,6 @@ from django.conf import settings def get_settings(request): return { - 'TITEL': settings.TITEL, + 'TITLE': settings.TITLE, 'NAV': settings.NAV, } diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html index a76507c..ec3ce56 100644 --- a/scheduler/main/templates/base.html +++ b/scheduler/main/templates/base.html @@ -6,7 +6,7 @@ - {% block title %}{{ TITEL }}{% endblock %} + {% block title %}{{ TITLE }}{% endblock %} @@ -16,7 +16,7 @@
-- GitLab From ff7878d0120987cc13c533b1f3d6920e2ee9a2c2 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Mon, 23 Nov 2020 14:06:01 +0100 Subject: [PATCH 5/6] typo --- scheduler/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/locale/de/LC_MESSAGES/django.po b/scheduler/locale/de/LC_MESSAGES/django.po index 0020aca..9518c2a 100644 --- a/scheduler/locale/de/LC_MESSAGES/django.po +++ b/scheduler/locale/de/LC_MESSAGES/django.po @@ -62,7 +62,7 @@ msgid "" "Please select one of the available timeslots to make an appointment. You " "will still be able to change your selection later." msgstr "" -"Bitte wäheln Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch " +"Bitte wählen Sie einen der verfügbaren Termine. Sie können Ihre Auswahl auch " "danach jederzeit ändern." #: scheduler/main/templates/main/invitation_form.html:41 -- GitLab From d17d6429332a411bbe0d61413e27f4c676750c27 Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 25 Nov 2020 12:38:51 +0100 Subject: [PATCH 6/6] s/stored/saved/g --- scheduler/locale/de/LC_MESSAGES/django.po | 2 +- scheduler/main/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler/locale/de/LC_MESSAGES/django.po b/scheduler/locale/de/LC_MESSAGES/django.po index 9518c2a..e8f5db2 100644 --- a/scheduler/locale/de/LC_MESSAGES/django.po +++ b/scheduler/locale/de/LC_MESSAGES/django.po @@ -139,7 +139,7 @@ msgid "Data has been saved." msgstr "Daten wurden gespeichert." #: scheduler/main/views.py:131 -msgid "Your booking has been stored." +msgid "Your booking has been saved." msgstr "Ihre Buchung wurde gespeichert." #: scheduler/main/views.py:135 diff --git a/scheduler/main/views.py b/scheduler/main/views.py index c3d6685..6f59f9b 100644 --- a/scheduler/main/views.py +++ b/scheduler/main/views.py @@ -128,7 +128,7 @@ class InvitationUpdateView(UpdateView): )) ok = r.ok if ok: - messages.success(self.request, _('Your booking has been stored.')) + messages.success(self.request, _('Your booking has been saved.')) else: self.object.timeslot = None self.object.save() -- GitLab