diff options
Diffstat (limited to 'talermerchantdemos/landing')
-rw-r--r-- | talermerchantdemos/landing/landing.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/talermerchantdemos/landing/landing.py b/talermerchantdemos/landing/landing.py index b8514f0..13c8dc4 100644 --- a/talermerchantdemos/landing/landing.py +++ b/talermerchantdemos/landing/landing.py @@ -31,7 +31,7 @@ from flask_babel import force_locale from flask_babel import gettext from werkzeug.middleware.proxy_fix import ProxyFix import traceback -from taler.util.talerconfig import TalerConfig, ConfigurationError +from ..util.talerconfig import TalerConfig, ConfigurationError from ..httpcommon import ( backend_get, backend_post, @@ -136,9 +136,9 @@ def start(lang): raise werkzeug.exceptions.NotFound() if x := os.environ.get("TALER_ENV_URL_BANK"): - bank_url = "/".join([x.strip("/"), f"?lang={lang}"]) + bank_url = x bank_register_url = bank_url - bank_public_accounts_url = bank_url + "#/public-accounts" + bank_public_accounts_url = bank_url + "#public-accounts" else: bank_register_url = "#" bank_url = "#" @@ -154,21 +154,15 @@ def start(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( "landing-index.html.j2", merchant_currency=CURRENCY, page_title=gettext("GNU Taler Demo"), bank_register_url=bank_register_url, bank_url=bank_url, - bank_public_account_url=bank_public_accounts_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, ) |