ui: language menu

* Changes languages translation in menu selector. * Closes rero#349 Co-Authored-by: Bertrand Zuchuat <[email protected]>
Garfield-fr · Jun 27, 2019 · 1a3dcc4 · 1a3dcc4
1 parent 3327862
commit 1a3dcc4
Show file tree

Hide file tree

Showing 10 changed files with 332,310 additions and 332,233 deletions.
diff --git a/data/10k.json b/data/10k.json
diff --git a/data/300.json b/data/300.json
diff --git a/rero_ils/manual_translations.txt b/rero_ils/manual_translations.txt
@@ -41,3 +41,9 @@ _('video')
 _('gnd')
 _('bnf')
 _('rero')
+
+# Menu language
+_('ui_language_en')
+_('ui_language_fr')
+_('ui_language_de')
+_('ui_language_it')
diff --git a/rero_ils/translations/de/LC_MESSAGES/messages.po b/rero_ils/translations/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.1.0a22\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2019-06-19 13:06+0200\n"
+"POT-Creation-Date: 2019-06-24 11:44+0200\n"
 "PO-Revision-Date: 2018-09-03 13:16+0000\n"
 "Last-Translator: Nicolas Prongué <[email protected]>, 2019\n"
 "Language: de\n"
@@ -236,6 +236,22 @@ msgstr "BNF"
 msgid "rero"
 msgstr "RERO"
 
+#: rero_ils/manual_translations.txt:46
+msgid "ui_language_en"
+msgstr "English"
+
+#: rero_ils/manual_translations.txt:47
+msgid "ui_language_fr"
+msgstr "Français"
+
+#: rero_ils/manual_translations.txt:48
+msgid "ui_language_de"
+msgstr "Deutsch"
+
+#: rero_ils/manual_translations.txt:49
+msgid "ui_language_it"
+msgstr "Italiano"
+
 #: rero_ils/views.py:65
 msgid "Menu"
 msgstr "Menü"

diff --git a/rero_ils/translations/en/LC_MESSAGES/messages.po b/rero_ils/translations/en/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.1.0a22\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2019-06-19 13:06+0200\n"
+"POT-Creation-Date: 2019-06-24 11:44+0200\n"
 "PO-Revision-Date: 2018-09-03 13:16+0000\n"
 "Last-Translator: Nicolas Prongué <[email protected]>, 2019\n"
 "Language: en\n"
@@ -236,6 +236,22 @@ msgstr "BNF"
 msgid "rero"
 msgstr "RERO"
 
+#: rero_ils/manual_translations.txt:46
+msgid "ui_language_en"
+msgstr "English"
+
+#: rero_ils/manual_translations.txt:47
+msgid "ui_language_fr"
+msgstr "Français"
+
+#: rero_ils/manual_translations.txt:48
+msgid "ui_language_de"
+msgstr "Deutsch"
+
+#: rero_ils/manual_translations.txt:49
+msgid "ui_language_it"
+msgstr "Italiano"
+
 #: rero_ils/views.py:65
 msgid "Menu"
 msgstr "Menu"

diff --git a/rero_ils/translations/fr/LC_MESSAGES/messages.po b/rero_ils/translations/fr/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.1.0a22\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2019-06-19 13:06+0200\n"
+"POT-Creation-Date: 2019-06-24 11:44+0200\n"
 "PO-Revision-Date: 2018-09-03 13:16+0000\n"
 "Last-Translator: Nicolas Prongué <[email protected]>, 2019\n"
 "Language: fr\n"
@@ -235,6 +235,22 @@ msgstr "BNF"
 msgid "rero"
 msgstr "RERO"
 
+#: rero_ils/manual_translations.txt:46
+msgid "ui_language_en"
+msgstr "English"
+
+#: rero_ils/manual_translations.txt:47
+msgid "ui_language_fr"
+msgstr "Français"
+
+#: rero_ils/manual_translations.txt:48
+msgid "ui_language_de"
+msgstr "Deutsch"
+
+#: rero_ils/manual_translations.txt:49
+msgid "ui_language_it"
+msgstr "Italiano"
+
 #: rero_ils/views.py:65
 msgid "Menu"
 msgstr "Menu"

diff --git a/rero_ils/translations/it/LC_MESSAGES/messages.po b/rero_ils/translations/it/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: 2019-06-19 13:06+0200\n"
+"POT-Creation-Date: 2019-06-24 11:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: it\n"
@@ -240,6 +240,22 @@ msgstr "BNF"
 msgid "rero"
 msgstr "RERO"
 
+#: rero_ils/manual_translations.txt:46
+msgid "ui_language_en"
+msgstr "English"
+
+#: rero_ils/manual_translations.txt:47
+msgid "ui_language_fr"
+msgstr "Français"
+
+#: rero_ils/manual_translations.txt:48
+msgid "ui_language_de"
+msgstr "Deutsch"
+
+#: rero_ils/manual_translations.txt:49
+msgid "ui_language_it"
+msgstr "Italiano"
+
 #: rero_ils/views.py:65
 msgid "Menu"
 msgstr "Menù"

diff --git a/rero_ils/translations/messages.pot b/rero_ils/translations/messages.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rero-ils 0.1.0a22\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2019-06-19 13:06+0200\n"
+"POT-Creation-Date: 2019-06-24 11:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -228,6 +228,22 @@ msgstr ""
 msgid "rero"
 msgstr ""
 
+#: rero_ils/manual_translations.txt:46
+msgid "ui_language_en"
+msgstr ""
+
+#: rero_ils/manual_translations.txt:47
+msgid "ui_language_fr"
+msgstr ""
+
+#: rero_ils/manual_translations.txt:48
+msgid "ui_language_de"
+msgstr ""
+
+#: rero_ils/manual_translations.txt:49
+msgid "ui_language_it"
+msgstr ""
+
 #: rero_ils/views.py:65
 msgid "Menu"
 msgstr ""

diff --git a/rero_ils/utils.py b/rero_ils/utils.py
@@ -24,7 +24,7 @@
 
 """Utilities functions for rero-ils."""
 
-from flask import current_app, render_template
+from flask import render_template
 from flask_mail import Message
 from flask_security.utils import config_value
 from invenio_mail.tasks import send_email as _send_mail
@@ -62,15 +62,6 @@ def send_mail(subject, recipients, template, language, **context):
     _send_mail.delay(msg.__dict__)
 
 
-def i18n_to_str(language):
-    """Transform i18n languages to string."""
-    i18n_languages = current_app.config['I18N_LANGUAGES']
-    for i18n_language in i18n_languages:
-        if language in i18n_language:
-            return i18n_language[1]
-    return 'English'
-
-
 def unique_list(data):
     """Unicity of list."""
     return list(dict.fromkeys(data))
diff --git a/rero_ils/views.py b/rero_ils/views.py
@@ -42,7 +42,6 @@
 from rero_ils.modules.patrons.api import Patron
 
 from .modules.babel_extractors import translate
-from .utils import i18n_to_str
 from .version import __version__
 
 blueprint = Blueprint(
@@ -79,13 +78,14 @@ def hide_language(lang):
         item = current_menu.submenu(
             'main.menu.lang_{language}'.format(
                 language=language_item.language))
+        ui_language = 'ui_language_{lang}'.format(lang=language_item.language)
         item.register(
             endpoint='invenio_i18n.set_lang',
             endpoint_arguments_constructor=partial(
                 return_language, language_item.language),
             text='{icon} {language}'.format(
                 icon='<i class="fa fa-language"></i>',
-                language=_(i18n_to_str(language_item.language))
+                language=_(ui_language)
             ),
             visible_when=partial(hide_language, language_item.language),
             order=order