[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] branch master updated: fix url join
From: |
gnunet |
Subject: |
[taler-taler-merchant-demos] branch master updated: fix url join |
Date: |
Wed, 24 Feb 2021 11:25:15 +0100 |
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 9e86589 fix url join
9e86589 is described below
commit 9e865890b62b67af41e6ded2da23e23702e88e8b
Author: MS <ms@taler.net>
AuthorDate: Wed Feb 24 11:25:06 2021 +0100
fix url join
---
talermerchantdemos/landing/landing.py | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/talermerchantdemos/landing/landing.py
b/talermerchantdemos/landing/landing.py
index 4c1c925..170a950 100644
--- a/talermerchantdemos/landing/landing.py
+++ b/talermerchantdemos/landing/landing.py
@@ -142,15 +142,26 @@ def index():
@app.route("/<lang>/", methods=["GET"])
def start(lang):
- bank_url = os.environ.get("TALER_ENV_URL_BANK", "#")
- if bank_url != "#":
- bank_url = urljoin(bank_url, f"/{lang}/register")
+ if x:= os.environ.get("TALER_ENV_URL_BANK"): bank_register_url =
"/".join([x.strip("/"), f"{lang}/register"])
+ else: bank_register_url = "#"
+
+ if x:= os.environ.get("TALER_ENV_URL_MERCHANT_BLOG"): merchant_blog_url =
"/".join([x.strip("/"), lang])
+ else: merchant_blog_url = "#"
+
+ if x:= os.environ.get("TALER_ENV_URL_MERCHANT_DONATIONS"):
merchant_donations_url = "/".join([x.strip("/"), lang])
+ else: merchant_donations_url = "#"
+
+ if x:= os.environ.get("TALER_ENV_URL_MERCHANT_SURVEY"):
merchant_survey_url = "/".join([x.strip("/"), lang])
+ else: merchant_survey_url = "#"
+
return flask.render_template(
"templates/index.html.j2",
merchant_currency=CURRENCY,
lang=lang,
- bank_url=bank_url,
- merchant_blog_url=os.environ.get("TALER_ENV_URL_MERCHANT_BLOG", "#")
+ bank_url=bank_register_url,
+ merchant_blog_url=merchant_blog_url,
+ merchant_donations_url=merchant_donations_url,
+ merchant_survey_url=merchant_survey_url
)
@app.errorhandler(404)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-merchant-demos] branch master updated: fix url join,
gnunet <=