From e62d158b8e48f7054513dabf61ae25d8268ba58a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 7 Feb 2020 09:28:16 +0100 Subject: [PATCH 1/3] Admin: Show current input language Display the expected language of the current streamfield input field in a floating box. --- mpicms/templates/wagtailadmin/pages/edit.html | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/mpicms/templates/wagtailadmin/pages/edit.html b/mpicms/templates/wagtailadmin/pages/edit.html index be8b615..aaa9256 100644 --- a/mpicms/templates/wagtailadmin/pages/edit.html +++ b/mpicms/templates/wagtailadmin/pages/edit.html @@ -1,9 +1,70 @@ {% extends "wagtailadmin/pages/edit.html" %} + +{%block content %} +{{ block.super }} +
+Input language: +
+{% endblock %} + {% block extra_css %} {{ block.super }} {% endblock %} + +{% block extra_js %} +{{ block.super }} + +{% endblock %} From ec47b448e82bf9badc2c65972ad8a1b694b55e05 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 7 Feb 2020 09:37:47 +0100 Subject: [PATCH 2/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..0dae713 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-07 09:35+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 e04d1d794598089d285c62d2665606c1c647d015 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 7 Feb 2020 10:19:33 +0100 Subject: [PATCH 3/3] Add translations to input language hint - Update template file - run `./manage.py maketransaltions -l de` - translate new strings --- locale/de/LC_MESSAGES/django.po | 10 +++++++--- mpicms/templates/wagtailadmin/pages/edit.html | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 0dae713..34dbc4f 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-07 09:35+0100\n" +"POT-Creation-Date: 2020-02-07 10:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1359,11 +1359,11 @@ msgstr "" msgid "Page '{0}' copied." msgstr "" -#: config/settings/base.py:219 +#: config/settings/base.py:219 mpicms/templates/wagtailadmin/pages/edit.html:64 msgid "English" msgstr "Englisch" -#: config/settings/base.py:220 +#: config/settings/base.py:220 mpicms/templates/wagtailadmin/pages/edit.html:67 msgid "German" msgstr "Deutsch" @@ -1775,6 +1775,10 @@ msgstr "Abonniert" msgid "Not subscribed" msgstr "Nicht Abonniert" +#: mpicms/templates/wagtailadmin/pages/edit.html:7 +msgid "Input language" +msgstr "Eingabesprache" + #: mpicms/templates/wagtailusers/users/index.html:5 msgid "Users" msgstr "" diff --git a/mpicms/templates/wagtailadmin/pages/edit.html b/mpicms/templates/wagtailadmin/pages/edit.html index aaa9256..b99f79c 100644 --- a/mpicms/templates/wagtailadmin/pages/edit.html +++ b/mpicms/templates/wagtailadmin/pages/edit.html @@ -1,9 +1,10 @@ {% extends "wagtailadmin/pages/edit.html" %} +{% load i18n %} {%block content %} {{ block.super }}
-Input language: +{% trans "Input language" %}:
{% endblock %} @@ -60,10 +61,10 @@ } $("div#body_en-list, div#sidebar_en-list"). - focusin("English", languageFocusIn). + focusin("{% trans "English" %}", languageFocusIn). focusout(null, languageFocusIn) $("div#body_de-list, div#sidebar_de-list"). - focusin("German", languageFocusIn). + focusin("{% trans "German" %}", languageFocusIn). focusout(null, languageFocusIn) });