[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] branch master updated: -update README
|
From: |
gnunet |
|
Subject: |
[taler-taler-merchant-demos] branch master updated: -update README |
|
Date: |
Sat, 24 Sep 2022 17:13:24 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository taler-merchant-demos.
The following commit(s) were added to refs/heads/master by this push:
new d77ef92 -update README
d77ef92 is described below
commit d77ef92d17bb1fc655abc1d89a2ed245008b3b49
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Sep 24 17:13:22 2022 +0200
-update README
---
README.md | 12 ++++++------
talermerchantdemos/templates/common-base.html.j2 | 10 +++++++---
talermerchantdemos/translations/ar/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/de/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/en/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/es/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/fr/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/hi/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/it/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/ja/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/ko/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/messages.pot | 4 ++--
talermerchantdemos/translations/pt/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/ru/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/sv/LC_MESSAGES/messages.po | 4 ++--
talermerchantdemos/translations/tr/LC_MESSAGES/messages.po | 4 ++--
.../translations/zh_Hant/LC_MESSAGES/messages.po | 4 ++--
17 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/README.md b/README.md
index ac313e2..5c2e367 100644
--- a/README.md
+++ b/README.md
@@ -113,11 +113,11 @@ This makes the blog speak UWSGI over TCP:
> ```
> [frontends]
-> backend_apikey = "ApiKey Sandbox"
-> backend = https://backend.test.taler.net/
+> backend_apikey = "secret-token:secret"
+> backend = https://backend.demo.taler.net/
>
> [taler]
-> currency = TESTKUDOS
+> currency = KUDOS
>
> [blog]
> serve = uwsgi
@@ -131,11 +131,11 @@ This makes the blog speak UWSGI over unix domain socket:
> ```
> [frontends]
-> backend_apikey = "ApiKey Sandbox"
-> backend = https://backend.test.taler.net/
+> backend_apikey = "secret-token:secret"
+> backend = https://backend.demo.taler.net/
>
> [taler]
-> currency = TESTKUDOS
+> currency = KUDOS
>
> [blog]
> serve = uwsgi
diff --git a/talermerchantdemos/templates/common-base.html.j2
b/talermerchantdemos/templates/common-base.html.j2
index 07fd5c9..95cb601 100644
--- a/talermerchantdemos/templates/common-base.html.j2
+++ b/talermerchantdemos/templates/common-base.html.j2
@@ -62,11 +62,15 @@
<div class="nav" style="position: absolute; background: #0042b2;
max-height: 60vh; overflow-y: scroll">
<br>
{% for lang_code, lang_display in all_languages.items() %}
- {% if lang_code != getlang() %}
- <a href="{{ script_name }}/{{ lang_code }}/" class="navbtn
langbtn">{{ lang_display }}</a>
+ {% if lang_code != getlang() %}
+ {% if lang_code != None %}
+ <a href="{{ script_name }}/{{ lang_code }}/" class="navbtn langbtn">{{
lang_display }}</a>
+ {% else %}
+ <a href="/{{ lang_code }}/" class="navbtn langbtn">{{ lang_display
}}</a>
+ {% endif %}
<br>
{% endif %}
- {% endfor %}
+ {% endfor %}
</div>
</div>
</div>
diff --git a/talermerchantdemos/translations/ar/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/ar/LC_MESSAGES/messages.po
index 7b7c9be..da1ed0e 100644
--- a/talermerchantdemos/translations/ar/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/ar/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2021-03-26 12:18+0000\n"
"Last-Translator: Maisa I <maisa.translator@gmail.com>\n"
"Language: ar\n"
@@ -286,7 +286,7 @@ msgstr "تبرعات"
msgid "Tipping/Survey"
msgstr "استطلاع الآراء"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/de/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/de/LC_MESSAGES/messages.po
index 1da3a76..20dbd4f 100644
--- a/talermerchantdemos/translations/de/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: taler-merchant-demos\n"
"Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
-"POT-Creation-Date: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-04-18 06:48+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language: de\n"
@@ -306,7 +306,7 @@ msgstr "Spenden"
msgid "Tipping/Survey"
msgstr "Tipping/Umfrage"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/en/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/en/LC_MESSAGES/messages.po
index 56c0c39..f08f92c 100644
--- a/talermerchantdemos/translations/en/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@@ -261,7 +261,7 @@ msgstr ""
msgid "Tipping/Survey"
msgstr ""
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/es/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/es/LC_MESSAGES/messages.po
index 38efc9a..e0c1097 100644
--- a/talermerchantdemos/translations/es/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/es/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-02-11 16:14+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: es\n"
@@ -287,7 +287,7 @@ msgstr "Donaciones"
msgid "Tipping/Survey"
msgstr "Consejos/Encuestas"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/fr/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/fr/LC_MESSAGES/messages.po
index 627f37e..4712076 100644
--- a/talermerchantdemos/translations/fr/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/fr/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-02-11 13:46+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: fr\n"
@@ -291,7 +291,7 @@ msgstr "Dons"
msgid "Tipping/Survey"
msgstr "Conseils/Sondage"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/hi/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/hi/LC_MESSAGES/messages.po
index aba50d7..f79cbf5 100644
--- a/talermerchantdemos/translations/hi/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/hi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language: hi\n"
@@ -265,7 +265,7 @@ msgstr ""
msgid "Tipping/Survey"
msgstr ""
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/it/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/it/LC_MESSAGES/messages.po
index 1740401..cea20d6 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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2021-05-13 21:09+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: it\n"
@@ -295,7 +295,7 @@ msgstr "Donazioni"
msgid "Tipping/Survey"
msgstr "Dare la mancia/Sondaggio"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/ja/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/ja/LC_MESSAGES/messages.po
index 49757c9..5b01f27 100644
--- a/talermerchantdemos/translations/ja/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/ja/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-02-22 21:41+0000\n"
"Last-Translator: Mizuhashi Lexee <nekohamushi@outlook.jp>\n"
"Language: ja\n"
@@ -270,7 +270,7 @@ msgstr "寄付"
msgid "Tipping/Survey"
msgstr "チップ/調査"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/ko/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/ko/LC_MESSAGES/messages.po
index 558d960..9c72f01 100644
--- a/talermerchantdemos/translations/ko/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/ko/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-04-16 07:04+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language: ko\n"
@@ -272,7 +272,7 @@ msgstr "기부"
msgid "Tipping/Survey"
msgstr "팁 / 설문조사"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/messages.pot
b/talermerchantdemos/translations/messages.pot
index bfcf2a3..5115f16 100644
--- a/talermerchantdemos/translations/messages.pot
+++ b/talermerchantdemos/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -264,7 +264,7 @@ msgstr ""
msgid "Tipping/Survey"
msgstr ""
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/pt/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/pt/LC_MESSAGES/messages.po
index 2126694..a2cf57a 100644
--- a/talermerchantdemos/translations/pt/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/pt/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2021-02-24 11:17+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: pt\n"
@@ -292,7 +292,7 @@ msgstr "Doações"
msgid "Tipping/Survey"
msgstr "Gorjeta/Inquérito"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/ru/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/ru/LC_MESSAGES/messages.po
index 99637f2..b3966cd 100644
--- a/talermerchantdemos/translations/ru/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/ru/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-02-10 21:59+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: ru\n"
@@ -295,7 +295,7 @@ msgstr "Поддержать проект"
msgid "Tipping/Survey"
msgstr "Опрос"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/sv/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/sv/LC_MESSAGES/messages.po
index 88925ef..671ba34 100644
--- a/talermerchantdemos/translations/sv/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/sv/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-02-11 12:43+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language: sv\n"
@@ -291,7 +291,7 @@ msgstr "Donationer"
msgid "Tipping/Survey"
msgstr "Enkät/Belöning"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/tr/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/tr/LC_MESSAGES/messages.po
index e4267da..ef85f28 100644
--- a/talermerchantdemos/translations/tr/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/tr/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2022-04-08 08:50+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language: tr\n"
@@ -288,7 +288,7 @@ msgstr "Bağışlar"
msgid "Tipping/Survey"
msgstr "Ödül/Anket"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
diff --git a/talermerchantdemos/translations/zh_Hant/LC_MESSAGES/messages.po
b/talermerchantdemos/translations/zh_Hant/LC_MESSAGES/messages.po
index 74802d3..4962433 100644
--- a/talermerchantdemos/translations/zh_Hant/LC_MESSAGES/messages.po
+++ b/talermerchantdemos/translations/zh_Hant/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: 2022-09-24 16:56+0200\n"
+"POT-Creation-Date: 2022-09-24 17:12+0200\n"
"PO-Revision-Date: 2021-07-29 21:30+0000\n"
"Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
"Language: zh_Hant\n"
@@ -270,7 +270,7 @@ msgstr "捐款"
msgid "Tipping/Survey"
msgstr "小費/調查"
-#: talermerchantdemos/templates/common-base.html.j2:85
+#: talermerchantdemos/templates/common-base.html.j2:89
msgid ""
"You can learn more about GNU Taler on our main <a "
"href=\"{site}\">website</a>."
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-merchant-demos] branch master updated: -update README,
gnunet <=