diff options
Diffstat (limited to 'talermerchantdemos/blog/blog.py')
| -rw-r--r-- | talermerchantdemos/blog/blog.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py index e8cce32..d1a2865 100644 --- a/talermerchantdemos/blog/blog.py +++ b/talermerchantdemos/blog/blog.py @@ -50,7 +50,7 @@ def err_abort(abort_status_code, **params): @param abort_status_code status code to return along the response. @param params _kw_ arguments to passed verbatim to the templating engine. """ - t = flask.render_template("blog-error.html.j2", lang=get_locale(), **params) + t = flask.render_template("blog-error.html.j2", **params) flask.abort(flask.make_response(t, abort_status_code)) @@ -119,7 +119,13 @@ def utility_processor(): def env(name, default=None): return os.environ.get(name, default) - return dict(env=env) + def getactive(): + return "blog" + + def getlang(): + return get_locale() + + return dict(env=env, getactive=getactive, getlang=getlang) ## @@ -134,7 +140,6 @@ def internal_error(e): "blog-error.html.j2", message=gettext("Internal error"), stack=traceback.format_exc(), - lang=get_locale(), ) @@ -187,7 +192,6 @@ def start(lang): translated = {} return flask.render_template( "blog-index.html.j2", - lang=lang, merchant_currency=CURRENCY, articles=translated.values(), ) @@ -214,13 +218,11 @@ def confirm_refund(lang, order_id): return flask.render_template( "blog-error.html.j2", message=gettext("Article is not anymore refundable"), - lang=get_locale(), ) return flask.render_template( "blog-confirm-refund.html.j2", article_name=article_name, order_id=order_id, - lang=get_locale(), ) @@ -300,7 +302,6 @@ def render_article(article_name, lang, data, order_id, refundable): article_contents=article_contents, article_name=article_name, order_id=order_id, - lang=lang, refundable=refundable, ) @@ -314,7 +315,7 @@ def render_article(article_name, lang, data, order_id, refundable): def post_order(article_name, lang): order = dict( amount=ARTICLE_AMOUNT, - extra=dict(article_name=article_name, lang=lang), + extra=dict(article_name=article_name), fulfillment_url=flask.request.base_url, summary="Essay: " + article_name.replace("_", " "), # FIXME: add support for i18n of summary! @@ -400,7 +401,6 @@ def article(article_name, lang=None, data=None): "blog-article-refunded.html.j2", article_name=article_name, order_id=order_id, - lang=lang, ) response = render_article( article_name, lang, data, order_id, refundable(pay_status) @@ -438,7 +438,6 @@ def handler_500(e): return flask.render_template( "blog-error.html.j2", message=gettext("Internal server error"), - lang=get_locale(), ) @@ -447,7 +446,6 @@ def handler_404(e): return flask.render_template( "blog-error.html.j2", message=gettext("Page not found"), - lang=get_locale(), ) @@ -455,7 +453,6 @@ def handler_404(e): def handler_backend_exception(e): t = flask.render_template( "survey-error.html.j2", - lang=get_locale(), message=e.args[0], json=e.backend_json, status_code=e.backend_status, |