[taler-taler-merchant-demos] branch master updated: fix bank linking

[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 8f37405  fix bank linking
8f37405 is described below

commit 8f374050a7a341fcc35d0d004ed1b51b80b71f2a
Author: MS <ms@taler.net>
AuthorDate: Fri Apr 23 16:58:15 2021 +0200

    fix bank linking
---
 talermerchantdemos/landing/landing.py              | 5 ++++-
 talermerchantdemos/templates/landing-index.html.j2 | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/talermerchantdemos/landing/landing.py 
b/talermerchantdemos/landing/landing.py
index e158d3d..58b111f 100644
--- a/talermerchantdemos/landing/landing.py
+++ b/talermerchantdemos/landing/landing.py
@@ -129,8 +129,10 @@ def start(lang):
 
     if x := os.environ.get("TALER_ENV_URL_BANK"):
         bank_register_url = "/".join([x.strip("/"), f"{lang}/register"])
+        bank_public_accounts_url = "/".join([x.strip("/"), 
f"{lang}/public-accounts"])
     else:
         bank_register_url = "#"
+        bank_public_accounts_url = "#"
 
     if x := os.environ.get("TALER_ENV_URL_MERCHANT_BLOG"):
         merchant_blog_url = "/".join([x.strip("/"), lang])
@@ -150,7 +152,8 @@ def start(lang):
     return flask.render_template(
         "landing-index.html.j2",
         merchant_currency=CURRENCY,
-        bank_url=bank_register_url,
+        bank_register_url=bank_register_url,
+        bank_public_accounts_url=bank_public_accounts_url,
         merchant_blog_url=merchant_blog_url,
         merchant_donations_url=merchant_donations_url,
         merchant_survey_url=merchant_survey_url,
diff --git a/talermerchantdemos/templates/landing-index.html.j2 
b/talermerchantdemos/templates/landing-index.html.j2
index 16145e3..a86d02d 100644
--- a/talermerchantdemos/templates/landing-index.html.j2
+++ b/talermerchantdemos/templates/landing-index.html.j2
@@ -20,7 +20,7 @@
       <p>
         {{
           gettext('In this demo you are paying with {currency}, an imaginary 
currency.').format(currency=merchant_currency) + "<br>" +
-          gettext('To withdraw {currency} coins you must first create an 
account at our <a 
href="{bank}">bank</a>.').format(currency=merchant_currency,bank=bank_url) + 
"<br>" +
+          gettext('To withdraw {currency} coins you must first create an 
account at our <a 
href="{bank}">bank</a>.').format(currency=merchant_currency,bank=bank_register_url)
 + "<br>" +
           gettext('Signing up only requires you to pick a username and 
password.') + "<br>" +
           gettext('When you create an account at our bank, you will be 
credited 100 {currency} for signing up.').format(currency=merchant_currency) + 
"<br>" +
           gettext("Afterwards, use the bank's Web interface to authorize the 
transfer of {currency} to your wallet.").format(currency=merchant_currency)
@@ -56,7 +56,7 @@
       <h2>{{ gettext("Step 4: Check money flow") }}</h2>
         <p>
         {{
-          gettext('You can see the wire transfers from the escrow account of 
the exchange to the merchants on the <a href="{bank}/public-accounts">public 
accounts page</a> of the bank.').format(bank=bank_url) + "<br>" +
+          gettext('You can see the wire transfers from the escrow account of 
the exchange to the merchants on the <a href="{bank}/public-accounts">public 
accounts page</a> of the bank.').format(bank=bank_public_accounts_url) + "<br>" 
+
           gettext('Note that only accounts configured to be publicly viewable 
are shown on that page.')
         }}
         </p>

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