[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: fix again
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: fix again |
|
Date: |
Sun, 31 Mar 2024 14:55:00 +0200 |
This is an automated email from the git hooks/post-receive script.
nora-grothoff pushed a commit to branch master
in repository taler-ops-www.
The following commit(s) were added to refs/heads/master by this push:
new 7d139f4 fix again
7d139f4 is described below
commit 7d139f4db76cb4051c9ceaea8abaedd51aec6205
Author: Nullptrderef <nullptrderef@proton.me>
AuthorDate: Sun Mar 31 14:54:56 2024 +0200
fix again
---
locale/de/LC_MESSAGES/messages.po | 30 +++++++++++++++---------------
locale/en/LC_MESSAGES/messages.po | 30 +++++++++++++++---------------
locale/fr/LC_MESSAGES/messages.po | 30 +++++++++++++++---------------
locale/messages.pot | 30 +++++++++++++++---------------
static/scss/util.scss | 4 +++-
template/fees.html.j2 | 5 ++++-
6 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 8eb14bc..7fc1f4e 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/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: 2024-03-31 13:19+0200\n"
+"POT-Creation-Date: 2024-03-31 14:54+0200\n"
"PO-Revision-Date: 2024-02-24 20:06+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -133,11 +133,11 @@ msgstr "Taler Operations AG - Kunden"
msgid "Information about the fees Taler does, and does not collect."
msgstr ""
-#: template/fees.html.j2:18
+#: template/fees.html.j2:21
msgid "Wire transfer fee"
msgstr ""
-#: template/fees.html.j2:22
+#: template/fees.html.j2:25
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged by Taler Operations on "
"outgoing wire transfers when Taler is used to deposit funds into a bank "
@@ -149,11 +149,11 @@ msgid ""
"week. The fee is simply subtracted from the total amount wired."
msgstr ""
-#: template/fees.html.j2:36
+#: template/fees.html.j2:39
msgid "Deposit fees"
msgstr ""
-#: template/fees.html.j2:40
+#: template/fees.html.j2:43
msgid ""
"Withdrawing 5 CHF creates electronic coins with denominations of "
"0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF, 1.28 CHF, "
@@ -162,7 +162,7 @@ msgid ""
"with 0.01 CHF returned as change."
msgstr ""
-#: template/fees.html.j2:51
+#: template/fees.html.j2:54
msgid ""
"<b>Deposit fees</b> charged by Taler payment providers depend on the "
"electronic coins used in the transaction. Merchants can offer to pay deposit "
@@ -171,22 +171,22 @@ msgid ""
"applicable deposit fees they have to pay before every transaction."
msgstr ""
-#: template/fees.html.j2:62
+#: template/fees.html.j2:65
#, fuzzy
#| msgid "Tokenization"
msgid "Coin denomination"
msgstr "Tokenization"
-#: template/fees.html.j2:63
+#: template/fees.html.j2:66
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:79
+#: template/fees.html.j2:82
msgid ""
"The above table shows the deposit fee structure used by Taler Operations"
msgstr ""
-#: template/fees.html.j2:86
+#: template/fees.html.j2:89
msgid ""
"Merchants can set the merchant backend if they want to cover customary fees. "
"The backend will then over-approximate typical deposit and wire fees, "
@@ -195,11 +195,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:113
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:114
+#: template/fees.html.j2:117
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -209,18 +209,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:123
+#: template/fees.html.j2:126
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:132
+#: template/fees.html.j2:135
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:136
+#: template/fees.html.j2:139
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index d5d472e..0c08250 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 13:19+0200\n"
+"POT-Creation-Date: 2024-03-31 14:54+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"
@@ -114,11 +114,11 @@ msgstr ""
msgid "Information about the fees Taler does, and does not collect."
msgstr ""
-#: template/fees.html.j2:18
+#: template/fees.html.j2:21
msgid "Wire transfer fee"
msgstr ""
-#: template/fees.html.j2:22
+#: template/fees.html.j2:25
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged by Taler Operations on "
"outgoing wire transfers when Taler is used to deposit funds into a bank "
@@ -130,11 +130,11 @@ msgid ""
"week. The fee is simply subtracted from the total amount wired."
msgstr ""
-#: template/fees.html.j2:36
+#: template/fees.html.j2:39
msgid "Deposit fees"
msgstr ""
-#: template/fees.html.j2:40
+#: template/fees.html.j2:43
msgid ""
"Withdrawing 5 CHF creates electronic coins with denominations of "
"0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF, 1.28 CHF, "
@@ -143,7 +143,7 @@ msgid ""
"with 0.01 CHF returned as change."
msgstr ""
-#: template/fees.html.j2:51
+#: template/fees.html.j2:54
msgid ""
"<b>Deposit fees</b> charged by Taler payment providers depend on the "
"electronic coins used in the transaction. Merchants can offer to pay deposit "
@@ -152,20 +152,20 @@ msgid ""
"applicable deposit fees they have to pay before every transaction."
msgstr ""
-#: template/fees.html.j2:62
+#: template/fees.html.j2:65
msgid "Coin denomination"
msgstr ""
-#: template/fees.html.j2:63
+#: template/fees.html.j2:66
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:79
+#: template/fees.html.j2:82
msgid ""
"The above table shows the deposit fee structure used by Taler Operations"
msgstr ""
-#: template/fees.html.j2:86
+#: template/fees.html.j2:89
msgid ""
"Merchants can set the merchant backend if they want to cover customary fees. "
"The backend will then over-approximate typical deposit and wire fees, "
@@ -174,11 +174,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:113
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:114
+#: template/fees.html.j2:117
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -188,18 +188,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:123
+#: template/fees.html.j2:126
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:132
+#: template/fees.html.j2:135
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:136
+#: template/fees.html.j2:139
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 95a35b7..1bc6533 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/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: 2024-03-31 13:19+0200\n"
+"POT-Creation-Date: 2024-03-31 14:54+0200\n"
"PO-Revision-Date: 2024-02-12 18:13+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: French <https://weblate.taler.net/projects/taler-ops/website/";
@@ -128,11 +128,11 @@ msgstr "Taler Operations AG - Pour les clients"
msgid "Information about the fees Taler does, and does not collect."
msgstr ""
-#: template/fees.html.j2:18
+#: template/fees.html.j2:21
msgid "Wire transfer fee"
msgstr ""
-#: template/fees.html.j2:22
+#: template/fees.html.j2:25
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged by Taler Operations on "
"outgoing wire transfers when Taler is used to deposit funds into a bank "
@@ -144,11 +144,11 @@ msgid ""
"week. The fee is simply subtracted from the total amount wired."
msgstr ""
-#: template/fees.html.j2:36
+#: template/fees.html.j2:39
msgid "Deposit fees"
msgstr ""
-#: template/fees.html.j2:40
+#: template/fees.html.j2:43
msgid ""
"Withdrawing 5 CHF creates electronic coins with denominations of "
"0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF, 1.28 CHF, "
@@ -157,7 +157,7 @@ msgid ""
"with 0.01 CHF returned as change."
msgstr ""
-#: template/fees.html.j2:51
+#: template/fees.html.j2:54
msgid ""
"<b>Deposit fees</b> charged by Taler payment providers depend on the "
"electronic coins used in the transaction. Merchants can offer to pay deposit "
@@ -166,20 +166,20 @@ msgid ""
"applicable deposit fees they have to pay before every transaction."
msgstr ""
-#: template/fees.html.j2:62
+#: template/fees.html.j2:65
msgid "Coin denomination"
msgstr ""
-#: template/fees.html.j2:63
+#: template/fees.html.j2:66
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:79
+#: template/fees.html.j2:82
msgid ""
"The above table shows the deposit fee structure used by Taler Operations"
msgstr ""
-#: template/fees.html.j2:86
+#: template/fees.html.j2:89
msgid ""
"Merchants can set the merchant backend if they want to cover customary fees. "
"The backend will then over-approximate typical deposit and wire fees, "
@@ -188,11 +188,11 @@ msgid ""
"amounts."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:113
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:114
+#: template/fees.html.j2:117
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations to "
"wire transfers that return funds to customers when either the Taler wallet "
@@ -202,18 +202,18 @@ msgid ""
"transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:123
+#: template/fees.html.j2:126
msgid ""
"To avoid paying bounce fees payers should be careful when entering the wire "
"transfer subject, and ensure that their wallet is online within a month of "
"initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:132
+#: template/fees.html.j2:135
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:136
+#: template/fees.html.j2:139
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> validity "
"period. One month before the expiration date, you wallet should "
diff --git a/locale/messages.pot b/locale/messages.pot
index 9b8a4a3..5f1f009 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-03-31 13:19+0200\n"
+"POT-Creation-Date: 2024-03-31 14:54+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"
@@ -114,11 +114,11 @@ msgstr ""
msgid "Information about the fees Taler does, and does not collect."
msgstr ""
-#: template/fees.html.j2:18
+#: template/fees.html.j2:21
msgid "Wire transfer fee"
msgstr ""
-#: template/fees.html.j2:22
+#: template/fees.html.j2:25
msgid ""
"A <b>wire fee</b> of <b>0.1 CHF</b> is charged by Taler Operations "
"on outgoing wire transfers when Taler is used to deposit funds into a "
@@ -131,11 +131,11 @@ msgid ""
"amount wired."
msgstr ""
-#: template/fees.html.j2:36
+#: template/fees.html.j2:39
msgid "Deposit fees"
msgstr ""
-#: template/fees.html.j2:40
+#: template/fees.html.j2:43
msgid ""
"Withdrawing 5 CHF creates electronic coins with denominations of "
"0.04 CHF, 0.16 CHF, 0.32 CHF, 0.64 CHF, "
@@ -144,7 +144,7 @@ msgid ""
"total of 3.24 CHF with 0.01 CHF returned as change."
msgstr ""
-#: template/fees.html.j2:51
+#: template/fees.html.j2:54
msgid ""
"<b>Deposit fees</b> charged by Taler payment providers depend on the "
"electronic coins used in the transaction. Merchants can offer to pay "
@@ -154,19 +154,19 @@ msgid ""
"transaction."
msgstr ""
-#: template/fees.html.j2:62
+#: template/fees.html.j2:65
msgid "Coin denomination"
msgstr ""
-#: template/fees.html.j2:63
+#: template/fees.html.j2:66
msgid "Fee per Coin"
msgstr ""
-#: template/fees.html.j2:79
+#: template/fees.html.j2:82
msgid "The above table shows the deposit fee structure used by Taler
Operations"
msgstr ""
-#: template/fees.html.j2:86
+#: template/fees.html.j2:89
msgid ""
"Merchants can set the merchant backend if they want to cover customary "
"fees. The backend will then over-approximate typical deposit and wire "
@@ -175,11 +175,11 @@ msgid ""
"transaction amounts."
msgstr ""
-#: template/fees.html.j2:110
+#: template/fees.html.j2:113
msgid "Bounce fee"
msgstr ""
-#: template/fees.html.j2:114
+#: template/fees.html.j2:117
msgid ""
"A <b>bounce fee</b> of <b>0.1 CHF</b> is charged by Taler Operations"
" to wire transfers that return funds to customers when either the Taler "
@@ -189,18 +189,18 @@ msgid ""
"amount transferred back to the original account."
msgstr ""
-#: template/fees.html.j2:123
+#: template/fees.html.j2:126
msgid ""
"To avoid paying bounce fees payers should be careful when entering the "
"wire transfer subject, and ensure that their wallet is online within a "
"month of initiating the withdrawal."
msgstr ""
-#: template/fees.html.j2:132
+#: template/fees.html.j2:135
msgid "Possible loss of e-money due to expiration"
msgstr ""
-#: template/fees.html.j2:136
+#: template/fees.html.j2:139
msgid ""
"Taler eCHF is issued by Taler Operations with a <b>1 year</b> "
"validity period. One month before the expiration date, you wallet should "
diff --git a/static/scss/util.scss b/static/scss/util.scss
index 92cfeb7..3040e22 100644
--- a/static/scss/util.scss
+++ b/static/scss/util.scss
@@ -4,7 +4,9 @@
main#maincontent:not(.no-auto-width) {
// @apply max-w-screen-xl px-8 md:px-16;
@apply max-w-screen-xl px-8 sm:overflow-x-hidden;
- max-width: calc(100vw - 6rem);
+ &:not(.no-x-scroll-w-fix) {
+ max-width: calc(100vw - 6rem);
+ }
}
main#maincontent:not(.no-auto-margin) {
@apply my-12;
diff --git a/template/fees.html.j2 b/template/fees.html.j2
index f6c92ba..012876c 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -12,7 +12,10 @@
<script src="{{ url_static('js/toggleable.ts') }}" defer></script>
<link href="{{ url_static('scss/pages/fees.scss') }}" rel="stylesheet" />
{% endblock %} {% block body_content %}
-<main id="maincontent" class="fess-page standard-layout-render">
+<main
+ id="maincontent"
+ class="fess-page standard-layout-render no-x-scroll-w-fix max-w-[90vw]
no-auto-width"
+>
<section class="toggleable max-w-screen-xl w-[90vw]">
<h2 class="toggle-trigger" tabindex="0">
{% trans %}Wire transfer fee{% endtrans %}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-ops-www] branch master updated: fix again,
gnunet <=