[taler-bank] branch master updated (7d64c07 -> aeb153c)

[gnunet]

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

ms pushed a change to branch master
in repository bank.

    from 7d64c07  implement language switch
     new c0c6072  install MO files
     new aeb153c  link to localized shops

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pyproject.toml                    |  2 ++
 talerbank/app/templates/base.html | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 994024b..da8136f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,6 +4,8 @@ version = "0.8.1"
 description = "Taler demo bank"
 authors = ["Marcello Stanisci <ms@taler.net>", "Florian Dold <dold@taler.net"]
 license = "GPL-3.0-or-later"
+include = ["talerbank/app/locale/*/LC_MESSAGES/django.mo"]
+exclude = ["talerbank/app/locale/*/LC_MESSAGES/django.po"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
diff --git a/talerbank/app/templates/base.html 
b/talerbank/app/templates/base.html
index 148097a..6f757ac 100644
--- a/talerbank/app/templates/base.html
+++ b/talerbank/app/templates/base.html
@@ -76,14 +76,14 @@
       </p>
   </header>
   <div style="display:flex; flex-direction: column;" class="navcontainer">
+    {% set lang = get_locale(request.path) %}
     <nav class="demolist">
-      <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">{{ _("Introduction") 
}}</a>
-      <a href="{{ env('TALER_ENV_URL_BANK', '#') }}" class="active">{{ 
_("Bank") }}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">{{ _("Essay 
Shop") }}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}">{{ 
_("Donations") }}</a>
-      <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">{{ 
_("Tipping/Survey") }}</a>
+      <a href="{{ env('TALER_ENV_URL_INTRO', '#') + lang + '/' }}">{{ 
_("Introduction") }}</a>
+      <a href="{{ env('TALER_ENV_URL_BANK', '#') + lang + '/' }}" 
class="active">{{ _("Bank") }}</a>
+      <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') + lang + '/' }}">{{ 
_("Essay Shop") }}</a>
+      <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') + lang + '/' 
}}">{{ _("Donations") }}</a>
+      <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') + lang  + '/' 
}}">{{ _("Tipping/Survey") }}</a>
       <span class="right">
-        {% set lang = get_locale(request.path) %}
         {{ {"en": _("English [en]"), "es": _("Spanish [es]"), "de": _("German 
[de]"), "sv": _("Swedish [sv]")}[lang] | default("en") }}
         <div class="nav">
         <br>

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