From 4cc9281da34caa2b0b4a133dac998f7e0f211f6d Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 22 Jan 2018 21:08:24 +0100 Subject: Revert "put currency in all templates" This reverts commit 24adbeccfce4aa11e98abe9c85260c82698a4f95. --- talerdonations/donations/donations.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'talerdonations/donations/donations.py') diff --git a/talerdonations/donations/donations.py b/talerdonations/donations/donations.py index dc0657b..5ba4628 100644 --- a/talerdonations/donations/donations.py +++ b/talerdonations/donations/donations.py @@ -40,9 +40,6 @@ CURRENCY = TC["taler"]["currency"].value_string(required=True) app.config.from_object(__name__) -# Will be available in templates -flask.g.currency = CURRENCY - @app.context_processor def utility_processor(): def env(name, default=None): @@ -102,7 +99,7 @@ def internal_error(e): @app.route("/") def index(): - return flask.render_template("templates/index.html") + return flask.render_template("templates/index.html", merchant_currency=CURRENCY) @app.route("/javascript") def javascript_licensing(): @@ -118,7 +115,8 @@ def checkout(): "templates/checkout.html", donation_amount=amount, donation_receiver=donation_receiver, - donation_donor=donation_donor) + donation_donor=donation_donor, + merchant_currency=CURRENCY) @app.route("/provider-not-supported") @@ -167,7 +165,8 @@ def fulfillment(receiver): donation_receiver=extra["receiver"], donation_amount=extra["amount"], donation_donor=extra["donor"], - order_id=order_id) + order_id=order_id, + currency=CURRENCY) # no pay_redirect but article not paid, this should never happen! err_abort(500, message="Internal error, invariant failed", json=pay_status) -- cgit v1.2.3