[GNUnet-SVN] [taler-docs-landing] branch master updated: Fix.

[gnunet]

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

marcello pushed a commit to branch master
in repository docs-landing.

The following commit(s) were added to refs/heads/master by this push:
     new 138421b  Fix.
138421b is described below

commit 138421b715866de2541f8dec68e17780b3d92d10
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue May 21 16:31:47 2019 +0200

    Fix.
    
    Do not put '{{ name }}' inside '{% trans %}' blocks.
---
 index.html.j2 | 34 +++++++++++++++++-----------------
 template.py   |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/index.html.j2 b/index.html.j2
index efcdedc..490c37e 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -15,69 +15,69 @@
 
   <div class="pure-g linkrow">
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/merchant/backend/html/manual.html">
+    <a href="https://{{ docshost }}/merchant/backend/html/manual.html">
     <img src={{ static_content("icon-backend.svg") }} height=60>
     <h3>Merchant Backend Administration</h3>
     </a>
     {{ _("Tutorial and manual for operating a merchant") }}.
-    {{ _("Also available as") }} <a href="https://{{ docsite 
}}/merchant/backend/pdf/manual.pdf">PDF</a>.
+    {{ _("Also available as") }} <a href="https://{{ docshost 
}}/merchant/backend/pdf/manual.pdf">PDF</a>.
     </div>
 
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite 
}}/merchant/backend/html/merchant-api-curl.html">
+    <a href="https://{{ docshost 
}}/merchant/backend/html/merchant-api-curl.html">
     <img src={{ static_content("icon-market.svg") }} height=60>
     <h3>{{ _("Merchant API Tutorial (Command Line)") }}</h3>
     </a>
     {% trans %}
     Tutorial for processing Taler payments using the merchant backend's API, 
with command line (and cURL) examples.
     Also available as
-    {% endtrans %} <a href="https://{{ docsite 
}}/merchant/backend/pdf/merchant-api-curl.pdf">PDF</a>.
+    {% endtrans %} <a href="https://{{ docshost 
}}/merchant/backend/pdf/merchant-api-curl.pdf">PDF</a>.
     </div>
 
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite 
}}/merchant/backend/html/merchant-api-python.html">
+    <a href="https://{{ docshost 
}}/merchant/backend/html/merchant-api-python.html">
     <img src={{ static_content("icon-market.svg") }} height=60>
     <h3>Merchant API Tutorial (Python)</h3>
     </a>
     {% trans %}
     Tutorial for processing Taler payments using the merchant backend's API, 
with Python 3 examples.
     Also available as 
-    {% endtrans %} <a href="https://{{ docsite 
}}/merchant/backend/pdf/merchant-api-python.pdf">PDF</a>.
+    {% endtrans %} <a href="https://{{ docshost 
}}/merchant/backend/pdf/merchant-api-python.pdf">PDF</a>.
     </div>
   </div>
 
   <div class="pure-g linkrow">
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/exchange/html/taler-exchange.html">
+    <a href="https://{{ docshost }}/exchange/html/taler-exchange.html">
     <img src={{ static_content("icon-exchange.svg") }} height=60>
     <h3>Exchange</h3>
     </a>
     {% trans %}
     Operator's manual for the GNU Taler exchange.
     Also available as
-    {% endtrans %} <a href="https://{{ docsite 
}}/exchange/pdf/taler-exchange.pdf">PDF</a>.
+    {% endtrans %} <a href="https://{{ docshost 
}}/exchange/pdf/taler-exchange.pdf">PDF</a>.
     </div>
 
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/bank/html/taler-bank.html">
+    <a href="https://{{ docshost }}/bank/html/taler-bank.html">
     <img src={{ static_content("icon-bank.svg") }} height=60>
     <h3>{{ _("Bank Integration") }}</h3>
     </a>
     {% trans %}
     Manual for tightly integrating Taler with banking applications.
     Also available as
-    {% endtrans %} <a href="https://{{ docsite 
}}/bank/pdf/taler-bank.pdf">PDF</a>.
+    {% endtrans %} <a href="https://{{ docshost 
}}/bank/pdf/taler-bank.pdf">PDF</a>.
     </div>
 
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/backoffice/html/manual.html">
+    <a href="https://{{ docshost }}/backoffice/html/manual.html">
     <img src={{ static_content("icon-backoffice.svg") }} height=60>
     <h3>{{ _("Back office") }}</h3>
     </a>
     {% trans %}
     Manual to run the back-office Web application.
     Also available as
-    {% endtrans %} <a href="https://{{ docsite 
}}/backoffice/pdf/manual.pdf">PDF</a>.
+    {% endtrans %} <a href="https://{{ docshost 
}}/backoffice/pdf/manual.pdf">PDF</a>.
     </div>
 
   </div>
@@ -86,22 +86,22 @@
 
   <div class="pure-g linkrow">
     <div class="pure-u-1-2">
-    <a href="https://{{ docsite }}/api/index.html">
+    <a href="https://{{ docshost }}/api/index.html">
     <img src={{ static_content("icon-api.svg") }} height=60>
     <h3>HTTP API</h3>
     </a>
     {{ _("Reference for the HTTP-based API for Taler components.") }}
     </div>
     <div class="pure-u-1-2">
-    <a href="https://{{ docsite }}/onboarding/html/onboarding.html">
+    <a href="https://{{ docshost }}/onboarding/html/onboarding.html">
     <img src={{ static_content("icon-developers.svg") }} height=60>
     <h3>{{ _("Onboarding") }}</h3>
     </a>
     {% trans %}
     Description of our taler.net setup and how to contribute.
     Also available as
-    <a href="https://{{ docsite }}/onboarding/pdf/onboarding.pdf">PDF</a>.
     {% endtrans %} 
+    <a href="https://{{ docshost }}/onboarding/pdf/onboarding.pdf">PDF</a>.
     </div>
   </div>
 
@@ -136,7 +136,7 @@
 
   <div class="pure-g linkrow">
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/code/exchange/index.html">
+    <a href="https://{{ docshost }}/code/exchange/index.html">
     <img src={{ static_content("icon-code.svg") }} height=60>
     <h3>{{ _("Code (Exchange)") }}</h3>
     </a>
@@ -144,7 +144,7 @@
     </div>
 
     <div class="pure-u-1-3">
-    <a href="https://{{ docsite }}/code/merchant/index.html">
+    <a href="https://{{ docshost }}/code/merchant/index.html">
     <img src={{ static_content("icon-code.svg") }} height=60>
     <h3>{{ _("Code (Merchant backend)") }}</h3>
     </a>
diff --git a/template.py b/template.py
index 482b09d..444ae46 100755
--- a/template.py
+++ b/template.py
@@ -75,13 +75,13 @@ for in_file in glob.glob("*.j2"):
             print("warning: locale {} not found".format(locale))
         
         ctx = dict(
-                docsite=DOCSITE,
                 lang=locale,
                 lang_full=langs[locale],
                 url=url,
                 self_localized=self_localized,
                 url_localized=url_localized,
                 static_content=static_content,
+                docshost=DOCSITE,
                 filename=name + "." + ext)
         ctx.update(default_ctx)
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden