[taler-www] branch master updated: enable new style formatting

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new ab0ba57  enable new style formatting
ab0ba57 is described below

commit ab0ba5737d689aa8a37f65702b3a79275ef2849f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Dec 1 20:25:37 2020 +0100

    enable new style formatting
---
 make_site.py          |  1 +
 template/docs.html.j2 | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/make_site.py b/make_site.py
index c7d2615..3397844 100755
--- a/make_site.py
+++ b/make_site.py
@@ -27,6 +27,7 @@ env = 
jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).p
                          trim_blocks=True,
                          undefined=jinja2.StrictUndefined,
                          autoescape=False)
+env.newstyle_gettext = True
 
 if len(sys.argv) >= 2 and sys.argv[1] == "-vv":
     DEBUG=1
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index a8c01bb..6c84c44 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -40,7 +40,7 @@
       {% trans %}
         Tutorial and manual for operating a merchant.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-merchant-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-merchant-manual.pdf") 
}}
     </div>
 
     <div class="col-3">
@@ -51,7 +51,7 @@
       {% trans %}
         Tutorial for processing Taler payments using the merchant backend API.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-merchant-api-tutorial.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-merchant-api-tutorial.pdf") }}
     </div>
 
     <div class="col-3">
@@ -62,7 +62,7 @@
       {% trans %}
         Operator&#39;s manual for the GNU Taler exchange.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-exchange-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-exchange-manual.pdf") 
}}
     </div>
 
     <div class="col-3">
@@ -73,7 +73,7 @@
       {% trans %}
         Manual for tightly integrating Taler with banking applications.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-bank-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + "/pdf/taler-bank-manual.pdf") }}
     </div>
   </div>
 
@@ -102,7 +102,7 @@
       {% trans %}
         Manual to run the back-office Web application.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-backoffice-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-backoffice-manual.pdf") }}
     </div>
 
     <div class="col-3">
@@ -113,7 +113,7 @@
       {% trans %}
         Manual for configuring and using the point of sale app.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-merchant-pos-terminal.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + 
"/pdf/taler-merchant-pos-terminal.pdf") }}
     </div>
 
     <div class="col-3">
@@ -158,7 +158,7 @@
       {% trans %}
         Description of our taler.net setup and how to contribute.
       {% endtrans %}
-      {{ gettext('Also available as <a 
href="%(link)s">PDF</a>.')|format(link="https://"; + siteconfitem['docshost'] + 
"/pdf/developers-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', 
link="https://"; + siteconfitem['docshost'] + "/pdf/developers-manual.pdf") }}
     </div>
   </div>
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.