summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kügel <skuegel@web.de>2021-05-20 23:29:14 +0200
committerStefan Kügel <skuegel@web.de>2021-05-20 23:29:14 +0200
commitea17362d031de5c3a550cc1a15c84c6457eaad5c (patch)
tree434e47e8cf1584e2087534b31edeb7a1d77194c0
parentd8b4babb307a97ac00039c5e97235577c8983ff9 (diff)
parenta5bedb7db9ceaa0342306f12f900914a8e9b4155 (diff)
downloadtaler-merchant-demos-ea17362d031de5c3a550cc1a15c84c6457eaad5c.tar.gz
taler-merchant-demos-ea17362d031de5c3a550cc1a15c84c6457eaad5c.tar.bz2
taler-merchant-demos-ea17362d031de5c3a550cc1a15c84c6457eaad5c.zip
Merge branch 'master' of ssh://git.taler.net/taler-merchant-demos
-rw-r--r--talermerchantdemos/blog/blog.py12
-rw-r--r--translations/it/LC_MESSAGES/messages.po16
-rw-r--r--translations/ru/LC_MESSAGES/messages.po12
-rw-r--r--translations/zh_Hant/LC_MESSAGES/messages.po4
4 files changed, 23 insertions, 21 deletions
diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py
index c84ab47..9722206 100644
--- a/talermerchantdemos/blog/blog.py
+++ b/talermerchantdemos/blog/blog.py
@@ -286,11 +286,13 @@ def render_article(article_name, lang, data, order_id, refundable):
# @param lang which language to use
#
def post_order(article_name, lang):
+ name_decoded = urllib.parse.unquote(article_name).replace("_", " ")
+ summary = f"Essay: {name_decoded}"
order = dict(
amount=ARTICLE_AMOUNT,
extra=dict(article_name=article_name),
fulfillment_url=flask.request.base_url,
- summary="Essay: " + article_name.replace("_", " "),
+ summary=summary,
# FIXME: add support for i18n of summary!
# 10 minutes time for a refund
wire_transfer_deadline=dict(t_ms=1000 * int(time.time() + 15 * 30)),
@@ -397,12 +399,8 @@ def article(article_name, lang=None, data=None):
# Redirect the browser to a page where the wallet can
# run the payment protocol.
response = flask.redirect(pay_status["order_status_url"])
- response.set_cookie(
- "order_id", order_id, path=f"/essay/{article_name}"
- )
- response.set_cookie(
- "order_id", order_id, path=f"/{lang}/essay/{article_name}"
- )
+ response.set_cookie("order_id", order_id, path=f"/essay/{article_name}")
+ response.set_cookie("order_id", order_id, path=f"/{lang}/essay/{article_name}")
return response
diff --git a/translations/it/LC_MESSAGES/messages.po b/translations/it/LC_MESSAGES/messages.po
index 9ce4727..1c2ee9b 100644
--- a/translations/it/LC_MESSAGES/messages.po
+++ b/translations/it/LC_MESSAGES/messages.po
@@ -6,17 +6,18 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
"POT-Creation-Date: 2021-03-12 18:42+0100\n"
-"PO-Revision-Date: 2021-02-24 18:05+0000\n"
-"Last-Translator: MS <ms@taler.net>\n"
+"PO-Revision-Date: 2021-05-13 21:09+0000\n"
+"Last-Translator: Stefan <eintritt@hotmail.com>\n"
+"Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler/"
+"demonstration-pages/it/>\n"
"Language: it\n"
-"Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler"
-"/demonstration-pages/it/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.4.2\n"
"Generated-By: Babel 2.6.0\n"
#: talermerchantdemos/blog/blog.py:114
@@ -276,7 +277,7 @@ msgstr "Donazioni"
#: talermerchantdemos/survey/templates/menu.html.j2:18
#: talermerchantdemos/templates/menu.html.j2:18
msgid "Tipping/Survey"
-msgstr "Guadagna con il questionario"
+msgstr "Dare la mancia/Sondaggio"
#: talermerchantdemos/blog/templates/menu.html.j2:21
#: talermerchantdemos/donations/templates/menu.html.j2:21
@@ -700,4 +701,3 @@ msgstr "Invia sondaggio"
#~ msgid "Swedish [sv]"
#~ msgstr "Svedese [sv]"
-
diff --git a/translations/ru/LC_MESSAGES/messages.po b/translations/ru/LC_MESSAGES/messages.po
index c7a50d3..2614817 100644
--- a/translations/ru/LC_MESSAGES/messages.po
+++ b/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
"POT-Creation-Date: 2021-03-12 18:42+0100\n"
-"PO-Revision-Date: 2021-05-05 17:37+0000\n"
+"PO-Revision-Date: 2021-05-17 14:25+0000\n"
"Last-Translator: Yulia Greben <yulia.greben@gmail.com>\n"
"Language-Team: Russian <http://weblate.taler.net/projects/gnu-taler/"
"demonstration-pages/ru/>\n"
@@ -69,7 +69,7 @@ msgstr "Страница не найдена"
#: talermerchantdemos/blog/templates/article_frame.html.j2:9
msgid "Taler allows merchants to offer refunds to customers."
-msgstr "Taler устанавливает право для продавцов на возврат товара покупателями."
+msgstr "Taler позволяет продавцам принимать возврат от покупатей."
#: talermerchantdemos/blog/templates/article_frame.html.j2:10
msgid ""
@@ -111,8 +111,8 @@ msgid ""
"The book is <a href=\"{shop}\">published by the FSF</a> and available "
"gratis at <a href=\"{gnu}\">gnu.org</a>."
msgstr ""
-"Книга <a href=\"{shop}\">опубликована ФСПО («Фонд свободного программного "
-"обеспечения»)</a>. Бесплатную версию книги можно найти на сайте <a href=\""
+"Книга <a href=\"{shop}\">опубликована ФСПО (Фонд свободного программного "
+"обеспечения)</a>. Бесплатную версию книги можно найти на сайте <a href=\""
"{gnu}\">www.gnu.org</a>."
#: talermerchantdemos/blog/templates/confirm_refund.html.j2:3
@@ -446,7 +446,7 @@ msgstr ""
"заложили ошибку в опцию «5 {currency}»: продавец попытается предложить вам "
"внести добровольные средства в размере 6 {currency} вместо 5 {currency}, "
"заявленных в поле. Не беспокойтесь, у вас будет возможность проверить "
-"окончательную сумму в кошельке Taler. Таким образом Taler защищает вас от "
+"окончательную сумму в кошельке Taler. Таким образом Taler защищает вас от "
"совершения ошибочных платежей."
#: talermerchantdemos/donations/templates/provider-not-supported.html.j2:4
@@ -548,7 +548,7 @@ msgid ""
"To withdraw {currency} coins you must first create an account at our <a "
"href=\"{bank}\">bank</a>."
msgstr ""
-"Для того, чтобы вывести монеты {currency}, сначала вы должны открыть счет в "
+"Для того, чтобы вывести монеты {currency}, сначала вы должны открыть счёт в "
"нашем <a href=\"{bank}\">банке</a>."
#: talermerchantdemos/landing/templates/index.html.j2:24
diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po
index e3b59b8..a09390d 100644
--- a/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -8,7 +8,11 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
"POT-Creation-Date: 2021-03-12 18:42+0100\n"
+<<<<<<< HEAD
"PO-Revision-Date: 2021-05-20 20:47+0000\n"
+=======
+"PO-Revision-Date: 2021-05-16 06:58+0000\n"
+>>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155
"Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
"Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/"
"gnu-taler/demonstration-pages/zh_Hant/>\n"