From 97ef8b73f78e354bd0365117b9edca1da212118a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 13 Feb 2020 08:08:57 +0100 Subject: [PATCH 1/3] Update translations Run ./manage.py makemessages -l de --- locale/de/LC_MESSAGES/django.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 54816bc..e017c3f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-01-16 13:53+0100\n" +"POT-Creation-Date: 2020-02-13 08:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -559,6 +559,7 @@ msgstr[1] "" #: bla/lib/python3.7/site-packages/django/forms/formsets.py:371 #: bla/lib/python3.7/site-packages/django/forms/formsets.py:373 +#: bla/lib/python3.7/site-packages/wagtailorderable/modeladmin/mixins.py:82 msgid "Order" msgstr "" @@ -1375,7 +1376,7 @@ msgstr "Kontakt" msgid "Information" msgstr "Information" -#: mpicms/base/blocks.py:28 mpicms/base/mixins.py:89 +#: mpicms/base/blocks.py:28 mpicms/base/mixins.py:92 msgid "Editor" msgstr "Editor" @@ -1408,15 +1409,15 @@ msgstr "Menü" msgid "Show table of content" msgstr "Generiere Inhaltsverzeichnis" -#: mpicms/base/mixins.py:78 +#: mpicms/base/mixins.py:81 msgid "Page not available in " msgstr "Seite nicht verfügbar in " -#: mpicms/base/mixins.py:91 mpicms/personal/wagtail_hooks.py:78 +#: mpicms/base/mixins.py:94 mpicms/personal/wagtail_hooks.py:78 msgid "Contacts" msgstr "Kontakte" -#: mpicms/base/mixins.py:92 +#: mpicms/base/mixins.py:95 msgid "Sidebar Content" msgstr "Inhalt der Seitenleiste" @@ -1457,27 +1458,27 @@ msgstr "Grundseite" msgid "root pages" msgstr "Grundseiten" -#: mpicms/base/models.py:108 +#: mpicms/base/models.py:109 msgid "homepage" msgstr "Startseite" -#: mpicms/base/models.py:109 +#: mpicms/base/models.py:110 msgid "homepages" msgstr "Startseiten" -#: mpicms/base/models.py:119 +#: mpicms/base/models.py:121 msgid "wiki page" msgstr "Wikiseite" -#: mpicms/base/models.py:120 +#: mpicms/base/models.py:122 msgid "wiki pages" msgstr "Wikiseiten" -#: mpicms/base/models.py:130 +#: mpicms/base/models.py:132 msgid "Phonelist" msgstr "Telefonliste" -#: mpicms/base/models.py:131 +#: mpicms/base/models.py:133 msgid "Phonelists" msgstr "Telefonlisten" From 4676194c1a2f2c32e570d84b4e50e788fc968b5b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 13 Feb 2020 08:34:14 +0100 Subject: [PATCH 2/3] translations: Page not available in %s Allow different word order in the phrase and update German translation. --- locale/de/LC_MESSAGES/django.po | 7 ++++--- mpicms/base/mixins.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e017c3f..9feebf5 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-13 08:07+0100\n" +"POT-Creation-Date: 2020-02-13 08:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1410,8 +1410,9 @@ msgid "Show table of content" msgstr "Generiere Inhaltsverzeichnis" #: mpicms/base/mixins.py:81 -msgid "Page not available in " -msgstr "Seite nicht verfügbar in " +#, python-format +msgid "Page not available in %s" +msgstr "Seite auf %s nicht vorhanden" #: mpicms/base/mixins.py:94 mpicms/personal/wagtail_hooks.py:78 msgid "Contacts" diff --git a/mpicms/base/mixins.py b/mpicms/base/mixins.py index 80e7a7c..1a757a3 100644 --- a/mpicms/base/mixins.py +++ b/mpicms/base/mixins.py @@ -78,7 +78,7 @@ def preview_text(self): def serve(self, request): lang = request.LANGUAGE_CODE if not getattr(self, 'body_' + lang) and self.body: - messages.info(request, _('Page not available in ') + get_language_info(lang)['name_local']) + messages.info(request, _('Page not available in %s') % get_language_info(lang)['name_local']) return super().serve(request) From 561a87bc2d7c99e1379f2daa26b5f14e248c9853 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 13 Feb 2020 08:39:10 +0100 Subject: [PATCH 3/3] translations: Show translated language name On a preview we came up with "Page not available in Deutsch", which is obivously wrong. Translate the language name as well, so that it fits to the rest of the phrase. --- mpicms/base/mixins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpicms/base/mixins.py b/mpicms/base/mixins.py index 1a757a3..7696505 100644 --- a/mpicms/base/mixins.py +++ b/mpicms/base/mixins.py @@ -78,7 +78,7 @@ def preview_text(self): def serve(self, request): lang = request.LANGUAGE_CODE if not getattr(self, 'body_' + lang) and self.body: - messages.info(request, _('Page not available in %s') % get_language_info(lang)['name_local']) + messages.info(request, _('Page not available in %s') % get_language_info(lang)['name_translated']) return super().serve(request)