make language and active page available in all templates

1 files changed, 13 insertions, 11 deletions

diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py
index 19f1372..85ab9ec 100644
--- a/talermerchantdemos/donations/donations.py
+++ b/talermerchantdemos/donations/donations.py
@@ -99,7 +99,13 @@ def utility_processor():
     def env(name, default=None):
         return os.environ.get(name, default)
 
-    return dict(env=env)
+    def getactive():
+        return "donations"
+
+    def getlang():
+        return get_locale()
+
+    return dict(env=env, getlang=getlang, getactive=getactive)
 
 
 ##
@@ -108,7 +114,7 @@ def utility_processor():
 # @param abort_status_code status code to return along the response.
 # @param params _kw_ arguments to passed verbatim to the templating engine.
 def err_abort(abort_status_code, **params):
-    t = flask.render_template("donations-error.html.j2", lang=get_locale(), **params)
+    t = flask.render_template("donations-error.html.j2", **params)
     flask.abort(flask.make_response(t, abort_status_code))
 
 
@@ -160,7 +166,6 @@ def internal_error(e):
     return flask.render_template(
         "donations-error.html.j2",
         message=gettext("Internal error"),
-        lang=get_locale(),
         stack=traceback.format_exc(),
     )
 
@@ -197,7 +202,7 @@ def index():
 @app.route("/<lang>/")
 def start(lang):
     return flask.render_template(
-        "donations-index.html.j2", lang=lang, merchant_currency=CURRENCY
+        "donations-index.html.j2", merchant_currency=CURRENCY
     )
 
 
@@ -217,7 +222,6 @@ def checkout(lang):
         donation_amount=amount,
         donation_receiver=donation_receiver,
         donation_donor=donation_donor,
-        lang=lang,
         merchant_currency=CURRENCY,
     )
 
@@ -229,7 +233,7 @@ def checkout(lang):
 # @return response object about the mentioned impossibility.
 @app.route("/<lang>/provider-not-supported")
 def provider_not_supported(lang):
-    return flask.render_template("donations-provider-not-supported.html.j2", lang=lang)
+    return flask.render_template("donations-provider-not-supported.html.j2")
 
 
 ##
@@ -246,11 +250,10 @@ def donate(lang):
     donation_donor = expect_parameter("donation_donor")
     payment_system = expect_parameter("payment_system")
     if payment_system != "taler":
-        return flask.redirect(flask.url_for("provider_not_supported", lang=lang))
+        return flask.redirect(flask.url_for("provider_not_supported"))
     fulfillment_url = flask.url_for(
         "fulfillment",
         timestamp=str(time.time()),
-        lang=lang,
         receiver=donation_receiver,
         _external=True,
     )
@@ -270,7 +273,7 @@ def donate(lang):
     order_id = order_resp["order_id"]
     return flask.redirect(
         flask.url_for(
-            "fulfillment", receiver=donation_receiver, lang=lang, order_id=order_id
+            "fulfillment", receiver=donation_receiver, order_id=order_id
         )
     )
 
@@ -298,7 +301,6 @@ def fulfillment(lang, receiver):
             donation_amount=extra["amount"],
             donation_donor=extra["donor"],
             order_id=order_id,
-            lang=lang,
             currency=CURRENCY,
         )
     return flask.redirect(pay_status["order_status_url"])
@@ -307,5 +309,5 @@ def fulfillment(lang, receiver):
 @app.errorhandler(404)
 def handler(e):
     return flask.render_template(
-        "donations-error.html.j2", lang=get_locale(), message=gettext("Page not found")
+        "donations-error.html.j2", message=gettext("Page not found")
     )