[taler-taler-merchant-demos] branch master updated: avoid double-slash in languages links

[gnunet]

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

ms 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 3fd189c  avoid double-slash in languages links
3fd189c is described below

commit 3fd189c75c42ef39aff89137a898f63bffac3ca0
Author: MS <ms@taler.net>
AuthorDate: Thu Nov 3 10:40:00 2022 +0100

    avoid double-slash in languages links
---
 talermerchantdemos/httpcommon/__init__.py        | 3 +--
 talermerchantdemos/templates/common-base.html.j2 | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/talermerchantdemos/httpcommon/__init__.py 
b/talermerchantdemos/httpcommon/__init__.py
index 56cfeda..2a6e53d 100644
--- a/talermerchantdemos/httpcommon/__init__.py
+++ b/talermerchantdemos/httpcommon/__init__.py
@@ -203,8 +203,7 @@ def make_utility_processor(pagename,base_url):
             getactive=getactive,
             getlang=getlang,
             all_languages=all_languages,
-            static=static,
-            script_name=base_url,
+            static=static
         )
 
     return utility_processor
diff --git a/talermerchantdemos/templates/common-base.html.j2 
b/talermerchantdemos/templates/common-base.html.j2
index 0964c9c..12c7741 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -86,12 +86,9 @@
         <div style="position: relative; overflow: visible;">
           <div class="nav" style="position: absolute; max-height: 60vh; 
overflow-y: scroll">
             {% for lang_code, lang_display in all_languages.items() %}
-            {% if lang_code != getlang() %}
-            {% if script_name != None %}
-      <a href="{{ script_name }}/{{ lang_code }}/" class="navbtn langbtn">{{ 
lang_display }}</a>
-            {% else %}
-      <a href="/{{ lang_code }}/" class="navbtn langbtn">{{ lang_display }}</a>
-            {% endif %}
+              {% if lang_code != getlang() %}
+               <a href="{{ url_for('index') + lang_code + '/' }}"
+                  class="navbtn langbtn">{{ lang_display }}</a>
             {% endif %}
           {% endfor %}
           </div>

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