[taler-taler-merchant-demos] branch master updated (cfab8e3 -> 62cf0bf)

[gnunet]

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

ms pushed a change to branch master
in repository taler-merchant-demos.

    from cfab8e3  provide link default
     new a438dfc  Language switch.
     new 62cf0bf  Italian: change donations site heading.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 talermerchantdemos/blog/blog.py                    |  4 +-
 talermerchantdemos/httpcommon/__init__.py          |  1 +
 .../translations/it/LC_MESSAGES/messages.po        | 61 +++++++++++++++-------
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py
index d8bf6d6..c257eb8 100644
--- a/talermerchantdemos/blog/blog.py
+++ b/talermerchantdemos/blog/blog.py
@@ -395,14 +395,14 @@ def article(article_name, lang=None, data=None):
             "order_id",
             ai,
             path=urllib.parse.quote(
-                flask.request.environ["SCRIPT_NAME"] + f"/essay/{article_name}"
+                flask.request.environ.get("SCRIPT_NAME", "") + 
f"/essay/{article_name}"
             )
         )
         response.set_cookie(
             "order_id",
             ai,
             path=urllib.parse.quote(
-                flask.request.environ["SCRIPT_NAME"] + 
f"/{lang}/essay/{article_name}"
+                flask.request.environ.get("SCRIPT_NAME", "") + 
f"/{lang}/essay/{article_name}"
             )
         )
         return response
diff --git a/talermerchantdemos/httpcommon/__init__.py 
b/talermerchantdemos/httpcommon/__init__.py
index 01b5c84..a8ac5b1 100644
--- a/talermerchantdemos/httpcommon/__init__.py
+++ b/talermerchantdemos/httpcommon/__init__.py
@@ -195,6 +195,7 @@ def make_utility_processor(pagename):
             getlang=getlang,
             all_languages=all_languages,
             static=static,
+            script_name=request.environ.get("SCRIPT_NAME", ""),
         )
 
     return utility_processor
diff --git a/talermerchantdemos/translations/it/LC_MESSAGES/messages.po 
b/talermerchantdemos/translations/it/LC_MESSAGES/messages.po
index d58cd9a..1d882e5 100644
--- a/talermerchantdemos/translations/it/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/it/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
-"POT-Creation-Date: 2021-06-11 07:56+0200\n"
+"POT-Creation-Date: 2021-11-26 21:19+0100\n"
 "PO-Revision-Date: 2021-05-13 21:09+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
 "Language: it\n"
@@ -17,56 +17,56 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
-#: talermerchantdemos/blog/blog.py:126 talermerchantdemos/landing/landing.py:93
+#: talermerchantdemos/blog/blog.py:128 talermerchantdemos/landing/landing.py:95
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: talermerchantdemos/blog/blog.py:186
+#: talermerchantdemos/blog/blog.py:188
 msgid "Cannot refund unpaid article"
 msgstr "Impossibile rimborsare un articolo non pagato"
 
-#: talermerchantdemos/blog/blog.py:193
+#: talermerchantdemos/blog/blog.py:195
 msgid "Article is not anymore refundable"
 msgstr "L'articolo non è più rimborsabile"
 
-#: talermerchantdemos/blog/blog.py:229
+#: talermerchantdemos/blog/blog.py:231
 msgid "You did not pay for this article (nice try!)"
 msgstr "Non hai pagato questo articolo (bel tentativo!)"
 
-#: talermerchantdemos/blog/blog.py:234
+#: talermerchantdemos/blog/blog.py:236
 msgid "Item not refundable (anymore)"
 msgstr "Articolo non (più) rimborsabile"
 
-#: talermerchantdemos/blog/blog.py:260
+#: talermerchantdemos/blog/blog.py:262
 msgid "Internal error: Files for article ({}) not found."
 msgstr "Errore interno: File per l'articolo ({}) non trovati."
 
-#: talermerchantdemos/blog/blog.py:267
+#: talermerchantdemos/blog/blog.py:269
 msgid "Supplemental file ({}) for article ({}) not found."
 msgstr "File supplementare ({}) per l'articolo ({}) non trovato."
 
-#: talermerchantdemos/blog/blog.py:345 talermerchantdemos/blog/blog.py:359
+#: talermerchantdemos/blog/blog.py:348 talermerchantdemos/blog/blog.py:362
 msgid "Direct access forbidden"
 msgstr "Accesso diretto vietato"
 
-#: talermerchantdemos/blog/blog.py:411
+#: talermerchantdemos/blog/blog.py:434
 msgid "Internal server error"
 msgstr "Errore del server"
 
-#: talermerchantdemos/blog/blog.py:419
-#: talermerchantdemos/donations/donations.py:284
-#: talermerchantdemos/landing/landing.py:166
-#: talermerchantdemos/survey/survey.py:162
+#: talermerchantdemos/blog/blog.py:442
+#: talermerchantdemos/donations/donations.py:286
+#: talermerchantdemos/landing/landing.py:168
+#: talermerchantdemos/survey/survey.py:164
 msgid "Page not found"
 msgstr "Pagina non trovata"
 
-#: talermerchantdemos/donations/donations.py:125
+#: talermerchantdemos/donations/donations.py:127
 msgid "parameter '{}' required"
 msgstr "parametro '{}' richiesto"
 
-#: talermerchantdemos/donations/donations.py:242
+#: talermerchantdemos/donations/donations.py:244
 msgid "Backend could not create the order"
 msgstr ""
 
@@ -85,8 +85,8 @@ msgstr "Impossibile analizzare la risposta del backend"
 msgid "Backend returned error status"
 msgstr "Il backend ha segnalato uno stato di errore"
 
-#: talermerchantdemos/landing/landing.py:174
-#: talermerchantdemos/survey/survey.py:170
+#: talermerchantdemos/landing/landing.py:176
+#: talermerchantdemos/survey/survey.py:172
 msgid "HTTP method not allowed for this page"
 msgstr "Il metodo HTTP non è permesso in questa pagina"
 
@@ -108,6 +108,23 @@ msgstr ""
 msgid "This article can't be refunded anymore."
 msgstr "Articolo non (più) rimborsabile"
 
+#: talermerchantdemos/templates/blog-article-refunded.html.j2:4
+msgid "Refunded"
+msgstr ""
+
+#: talermerchantdemos/templates/blog-article-refunded.html.j2:8
+msgid ""
+"Your payment (order ID <tt>{order}<tt>) for the article \"{article}\" has"
+" been refunded."
+msgstr ""
+
+#: talermerchantdemos/templates/blog-article-refunded.html.j2:14
+#, fuzzy
+msgid "You will not be able to read the article until you pay for it again."
+msgstr ""
+"Dopo aver ottenuto un rimborso, non sarà più possibile leggere questo "
+"articolo."
+
 #: talermerchantdemos/templates/blog-base.html.j2:9
 msgid "Essay shop"
 msgstr "Negozio di saggistica"
@@ -378,7 +395,7 @@ msgstr "Puoi sempre fare <a href=\"{link}\">altre 
donazioni</a>."
 
 #: talermerchantdemos/templates/donations-index.html.j2:4
 msgid "Donate to Free Software projects"
-msgstr "Dona al progetto Free Software"
+msgstr "Dona a progetti Free Software"
 
 #: talermerchantdemos/templates/donations-index.html.j2:8
 msgid ""
@@ -632,6 +649,10 @@ msgstr ""
 "Lasciare la mancia è un modo di offrire ricompense in denaro che vanno "
 "direttamente nel portafoglio dell'utente."
 
+#: talermerchantdemos/templates/survey-error-graceful.html.j2:3
+msgid "Unexpected result"
+msgstr ""
+
 #: talermerchantdemos/templates/survey-index.html.j2:6
 msgid ""
 "Please participate in our survey about payment systems and receive a tip "

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