[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] 01/04: resolve borked syntax
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] 01/04: resolve borked syntax |
|
Date: |
Sat, 30 Mar 2024 22:36:10 +0100 |
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.
commit e2be20fc03d4dd2c3cbca1260781098c757338a8
Author: Nullptrderef <nullptrderef@proton.me>
AuthorDate: Sat Mar 30 22:35:26 2024 +0100
resolve borked syntax
---
template/fees.html.j2 | 168 ++++++++++++++++++++++++--------------------------
1 file changed, 79 insertions(+), 89 deletions(-)
diff --git a/template/fees.html.j2 b/template/fees.html.j2
index 8c655bf..7dde1cd 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -4,25 +4,21 @@
name="description"
content="{% trans %}Information about the fees Taler does, and does not
collect.{% endtrans %}"
/>
-{# <meta name="author" content="" /> #}
-{% endblock %}
-{% block body_content %}
+{# <meta name="author" content="" /> #} {% endblock %} {% block body_content %}
<main id="maincontent">
<section>
<h2>{% trans %}Wire transfer fee{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- 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
- account. Merchants are encouraged to allow Taler to delay and then
- aggregate many small payments into a single collective wire transfer to
- minimize wire transfer fees. For example, by configuring a
- <b>wire deadline</b> of one week, all payments within a week could be
- aggregated into a single wire transfer, and thus the wire
- transfer fee would only be charged once per week.
- The fee is simply subtracted from the total amount wired.
- {% endtrans %}
+ {% trans %} 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 account. Merchants are encouraged to allow Taler to
+ delay and then aggregate many small payments into a single collective
+ wire transfer to minimize wire transfer fees. For example, by
+ configuring a <b>wire deadline</b> of one week, all payments within a
+ week could be aggregated into a single wire transfer, and thus the wire
+ transfer fee would only be charged once per week. The fee is simply
+ subtracted from the total amount wired. {% endtrans %}
</p>
</div>
</section>
@@ -30,77 +26,75 @@
<h2>{% trans %}Deposit fees{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- Withdrawing 5 CHF creates electronic coins with
+ {% trans %} Withdrawing 5 CHF creates electronic coins with
denominations of 0.04 CHF, 0.16 CHF, 0.32 CHF,
0.64 CHF, 1.28 CHF, and 2.56 CHF. Paying 3.23 CHF
might then use the 0.04 CHF, 0.64 CHF and 2.56 CHF
coins,
resulting in a total of 3.24 CHF with 0.01 CHF returned as
- change.
- {% endtrans %}
+ change. {% endtrans %}
</p>
<p>
{% trans %}
- <b>Deposit fees</b> charged by Taler payment
- providers depend on the electronic coins used in the transaction.
- Merchants can offer to pay deposit fees up to a specified limit;
customers
- have to pay deposit fees that exceed what the merchant is willing to
- cover. Taler wallets inform customers about applicable deposit fees
they
- have to pay before every transaction.
- {% endtrans %}
+ <b>Deposit fees</b> charged by Taler payment providers depend on the
+ electronic coins used in the transaction. Merchants can offer to pay
+ deposit fees up to a specified limit; customers have to pay deposit
fees
+ that exceed what the merchant is willing to cover. Taler wallets inform
+ customers about applicable deposit fees they have to pay before every
+ transaction. {% endtrans %}
</p>
<p>
- {% trans %}
- The following table shows the deposit fee structure used by Taler
Operations:
- {% endtrans %}
+ {% trans %} The following table shows the deposit fee structure used by
+ Taler Operations: {% endtrans %}
</p>
<table
class="border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-slate-50 border-opacity-50"
>
- <tr>
- <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- {% trans %}Coin denomination{% endtrans %}
- </th>
- <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- {% trans %}Fee per Coin{% endtrans %}
- </th>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0025 CHF - 0.64 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0025 CHF
- </td>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 1.28 CHF - 10.24 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0050 CHF
- </td>
- </tr>
- <tr>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 20.48 CHF - 655.36 CHF
- </td>
- <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
- 0.0010 CHF
- </td>
- </tr>
+ <tr>
+ <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ {% trans %}Coin denomination{% endtrans %}
+ </th>
+ <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ {% trans %}Fee per Coin{% endtrans %}
+ </th>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0025 CHF - 0.64 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0025 CHF
+ </td>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 1.28 CHF - 10.24 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0050 CHF
+ </td>
+ </tr>
+ <tr>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 20.48 CHF - 655.36 CHF
+ </td>
+ <td class="p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
+ 0.0010 CHF
+ </td>
+ </tr>
</table>
<br />
<p>
- {% trans %}
- Merchants can set the merchant backend if they want to cover
+ {% trans %} Merchants can set the merchant backend if they want to
cover
customary fees. The backend will then over-approximate typical deposit
- and wire fees, ensuring that customers virtually never have
- to pay deposit fees. The following curve shows the customary
- fees for different net transaction amounts.
- {% endtrans %}
+ and wire fees, ensuring that customers virtually never have to pay
+ deposit fees. The following curve shows the customary fees for
different
+ net transaction amounts. {% endtrans %}
</p>
- <img alt="Customary fees for different net amounts" style="width:400px"
src="{{ url_static('images/stefan.svg') }}">
+ <img
+ alt="Customary fees for different net amounts"
+ style="width: 400px"
+ src="{{ url_static('images/stefan.svg') }}"
+ />
</div>
</section>
@@ -108,21 +102,18 @@
<h2>{% trans %}Bounce fee{% endtrans %}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- 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 did not withdraw the amount after <b>4 weeks</b>, or immediately
- if a wire transfer subject was used that is missing the required code
to
- associate a wallet with the wire transfer. The fee is deducted from the
- amount transferred back to the original account.
- {% endtrans %}
+ {% trans %} 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 did not withdraw the amount after
+ <b>4 weeks</b>, or immediately if a wire transfer subject was used that
+ is missing the required code to associate a wallet with the wire
+ transfer. The fee is deducted from the amount transferred back to the
+ original account. {% endtrans %}
</p>
<p>
- {% trans %}
- 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.
- {% endtrans %}
+ {% trans %} 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. {% endtrans %}
</p>
</div>
</section>
@@ -131,16 +122,15 @@
<h2>{% trans %}Possible loss of e-money due to expiration{% endtrans
%}</h2>
<div class="toggle-content">
<p>
- {% trans %}
- Taler eCHF is issued by Taler Operations with a <b>1 year</b>
validity
- period. One month before the expiration date, you wallet should
- automatically exchange any eCHF that are about to expire for new eCHF
- with an extended validity period. However, if your wallet is offline
for
- an extended period of time, it may be unable to do so. Ensure your
- wallet is regularly online to avoid loosing money due to expiration!
- {% endtrans %}
+ {% trans %} Taler eCHF is issued by Taler Operations with a
+ <b>1 year</b> validity period. One month before the expiration
+ date, you wallet should automatically exchange any eCHF that are about
+ to expire for new eCHF with an extended validity period. However, if
+ your wallet is offline for an extended period of time, it may be unable
+ to do so. Ensure your wallet is regularly online to avoid loosing money
+ due to expiration! {% endtrans %}
</p>
</div>
- </section>
+ </div>
</main>
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.