[taler-taler-merchant-demos] branch master updated: work on #6656

[gnunet]

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

grothoff pushed a commit to branch master
in repository taler-merchant-demos.

The following commit(s) were added to refs/heads/master by this push:
     new c36ef03  work on #6656
c36ef03 is described below

commit c36ef03de8e3a25a4e8dcfe90b62dfd3e2baa546
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Dec 27 19:46:56 2020 +0100

    work on #6656
---
 talermerchantdemos/templates/footer.html.j2 |  2 +-
 talermerchantdemos/templates/menu.html.j2   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/talermerchantdemos/templates/footer.html.j2 
b/talermerchantdemos/templates/footer.html.j2
index 79c4fd7..7c585bc 100644
--- a/talermerchantdemos/templates/footer.html.j2
+++ b/talermerchantdemos/templates/footer.html.j2
@@ -2,7 +2,7 @@
 <div>
   <p>
     {{
-       gettext('You can learn more about GNU Taler on our main <a 
href="{site}">website</a>.').format(site="https://taler.net/";)
+       gettext('You can learn more about GNU Taler on our main <a 
href="{site}">website</a>.').format(site="https://taler.net/"; + lang + "/")
     }}
   </p>
   <div style="flex-grow:1"></div>
diff --git a/talermerchantdemos/templates/menu.html.j2 
b/talermerchantdemos/templates/menu.html.j2
index e029c4a..c364a2c 100644
--- a/talermerchantdemos/templates/menu.html.j2
+++ b/talermerchantdemos/templates/menu.html.j2
@@ -1,22 +1,22 @@
 {% macro menu(active) -%}
 <div style="display:flex; flex-direction: column;" class="navcontainer">
   <nav class="demolist">
-    <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}"
+    <a href="{{ env('TALER_ENV_URL_INTRO', '#') + lang + '/' }}"
              {% if active == 'landing' %} class="active" {% endif %}
             >{{gettext("Introduction")}}</a>
-    <a href="{{ env('TALER_ENV_URL_BANK', '#') }}"
+    <a href="{{ env('TALER_ENV_URL_BANK', '#') + lang + '/' }}"
              {% if active == 'bank' %} class="active" {% endif %}
             >{{gettext("Bank")}}</a>
-    <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}"
+    <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') + lang + '/' }}"
              {% if active == 'blog' %} class="active" {% endif %}
             >{{gettext("Essay Shop")}}</a>
-    <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}"
+    <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') + lang + '/' }}"
              {% if active == 'donations' %} class="active" {% endif %}
             >{{gettext("Donations")}}</a>
-    <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}"
+    <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') + lang + '/' }}"
              {% if active == 'survey' %} class="active" {% endif %}
             >{{gettext("Tipping/Survey")}}</a>
-    <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') }}"
+    <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') + lang + '/' }}"
              {% if active == 'backoffice' %} class="active" {% endif %}
             >{{gettext("Back-office")}}</a -->
     {% include 'templates/language-switcher.html.j2' %}

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