diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-10-11 15:05:16 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-10-11 15:05:16 +0200 |
commit | a984947846c7b83d3151fc4987ca615edcb168ef (patch) | |
tree | b03a1524a55d2a0255f0b9c1e56061bca9358e02 /talermerchantdemos/blog | |
parent | 1ae0306a3cf2ea27f60b2d205789994d260c2cce (diff) | |
download | taler-merchant-demos-a984947846c7b83d3151fc4987ca615edcb168ef.tar.gz taler-merchant-demos-a984947846c7b83d3151fc4987ca615edcb168ef.tar.bz2 taler-merchant-demos-a984947846c7b83d3151fc4987ca615edcb168ef.zip |
i18n for survey
Diffstat (limited to 'talermerchantdemos/blog')
-rw-r--r-- | talermerchantdemos/blog/blog.py | 17 | ||||
-rw-r--r-- | talermerchantdemos/blog/templates/base.html.j2 | 9 | ||||
-rw-r--r-- | talermerchantdemos/blog/templates/confirm_refund.html.j2 | 2 |
3 files changed, 21 insertions, 7 deletions
diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py index 7112b33..ba6571b 100644 --- a/talermerchantdemos/blog/blog.py +++ b/talermerchantdemos/blog/blog.py @@ -61,6 +61,7 @@ BASE_DIR = os.path.dirname(os.path.abspath(__file__)) app = flask.Flask( __name__, template_folder=BASE_DIR, static_folder=BASE_DIR + "/../static/" ) +app.debug = True app.secret_key = base64.b64encode(os.urandom(64)).decode("utf-8") LOGGER = logging.getLogger(__name__) @@ -81,7 +82,8 @@ babel = Babel(app) print("Using translations from:") print(list(babel.translation_directories)) translations = [str(translation) for translation in babel.list_translations()] -translations.append('en') +if not 'en' in translations: + translations.append('en') print("Operating with the following translations available:") print(translations) @@ -126,6 +128,19 @@ def index(): target = flask.request.accept_languages.best_match(translations, default) return flask.redirect("/" + target + "/", code=302) +## +# Serve the /favicon.ico requests. +# +# @return the favicon.ico file. +@app.route("/favicon.ico") +def favicon(): + LOGGER.info("will look into: " + os.path.join(app.root_path, 'static')) + return flask.send_from_directory( + os.path.join(app.root_path, 'static'), + "favicon.ico", + mimetype="image/vnd.microsoft.ico" + ) + @babel.localeselector def get_locale(): parts = request.path.split('/', 2) diff --git a/talermerchantdemos/blog/templates/base.html.j2 b/talermerchantdemos/blog/templates/base.html.j2 index 58ce857..1303276 100644 --- a/talermerchantdemos/blog/templates/base.html.j2 +++ b/talermerchantdemos/blog/templates/base.html.j2 @@ -69,8 +69,8 @@ <body> <header class="demobar" style="display: flex; flex-direction: column;"> - <h1><span class="tt adorn-brackets">Taler Demo</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">Shop</a></span></h1> + <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo")}}</span></h1> + <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">{{ gettext("Shop") }}</a></span></h1> <p>{{ gettext("On this page you can buy articles using an imaginary currency.") + "<br>" + gettext("The articles are chapters from Richard Stallman's book "Free Software, Free Society".") + "<br>" + @@ -82,9 +82,9 @@ <nav class="demolist"> <a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">{{gettext("Introduction")}}</a> <a href="{{ env('TALER_ENV_URL_BANK', '#') }}">{{gettext("Bank")}}</a> - <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}" class="active">{{gettext("Essay Shop")}}</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">{{gettext("Essay Shop")}}</a> <a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}">{{gettext("Donations")}}</a> - <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">{{gettext("Tipping/Survey")}}</a> + <a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}" class="active">{{gettext("Tipping/Survey")}}</a> <!-- a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') }}">{{gettext("Back-office")}}</a --> <span class="right"> {{ gettext("English [en]") }} @@ -102,7 +102,6 @@ </span> </nav> </div> - <!-- <input type="checkbox" class="r"><label>test</label> --> <section id="main" class="content"> {% block main %} diff --git a/talermerchantdemos/blog/templates/confirm_refund.html.j2 b/talermerchantdemos/blog/templates/confirm_refund.html.j2 index 09f3730..a371645 100644 --- a/talermerchantdemos/blog/templates/confirm_refund.html.j2 +++ b/talermerchantdemos/blog/templates/confirm_refund.html.j2 @@ -17,6 +17,6 @@ <form action="{{ url_for('refund', order_id=order_id) }}" method="POST"> <input type="text" name="article_name" value={{ article_name}} hidden> - <input type="submit" value="Request refund"> + <input type="submit" value="{{gettext("Request refund")}}"> </form> {% endblock main %} |