[taler-bank] branch master updated: Fix i18n.

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new e3e296a  Fix i18n.
e3e296a is described below

commit e3e296a3490a77db3db120af9a7737cc9ce12f7a
Author: MS <ms@taler.net>
AuthorDate: Mon Oct 19 12:12:42 2020 +0200

    Fix i18n.
---
 setup.py                                      | 1 +
 talerbank/app/locale/it/LC_MESSAGES/django.po | 3 ++-
 talerbank/jinja2.py                           | 4 ++--
 talerbank/settings.py                         | 4 +---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 1d81207..8b82b8c 100755
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ setup(name='talerbank',
       scripts=["./bin/taler-bank-manage"],
       package_data={
         'talerbank.app': [
+            'locale/*/LC_MESSAGES/django.mo',
             'templates/*.html',
             'templates/registration/*.html',
             'static/web-common/*.css',
diff --git a/talerbank/app/locale/it/LC_MESSAGES/django.po 
b/talerbank/app/locale/it/LC_MESSAGES/django.po
index a35a2d8..c1c670b 100644
--- a/talerbank/app/locale/it/LC_MESSAGES/django.po
+++ b/talerbank/app/locale/it/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-10-16 14:23+0000\n"
+"POT-Creation-Date: 2020-10-19 09:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 #: talerbank/app/templates/login.html:29
 msgid "Please login!"
 msgstr "Accedi!"
diff --git a/talerbank/jinja2.py b/talerbank/jinja2.py
index 6f66de0..0f18f74 100644
--- a/talerbank/jinja2.py
+++ b/talerbank/jinja2.py
@@ -26,7 +26,7 @@ from urllib.parse import urlparse
 from django.urls import reverse, get_script_prefix
 from django.conf import settings
 from jinja2 import Environment
-from gettext import gettext
+from django.utils.translation import ugettext
 
 ##
 # Check if a URL is absolute or not.
@@ -140,7 +140,7 @@ def environment(**options):
             "is_valid_amount": is_valid_amount,
             "amount_stringify": amount_stringify,
             "tojson": tojson,
-            "_": gettext,
+            "_": ugettext,
         }
     )
     return env
diff --git a/talerbank/settings.py b/talerbank/settings.py
index f33f9be..360b812 100644
--- a/talerbank/settings.py
+++ b/talerbank/settings.py
@@ -67,10 +67,10 @@ INSTALLED_APPS = [
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
-    "django.middleware.locale.LocaleMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
@@ -157,8 +157,6 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
-LANGUAGE_CODE = "en-us"
-
 TIME_ZONE = "UTC"
 
 USE_I18N = True

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.