[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-merchant-demos] branch master updated (d69934f -> 52afe88)
|
From: |
gnunet |
|
Subject: |
[taler-taler-merchant-demos] branch master updated (d69934f -> 52afe88) |
|
Date: |
Sun, 11 Oct 2020 17:30:11 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository taler-merchant-demos.
from d69934f add landing subpage, simplify deployment
new 7bbf253 work on landing text
new 52afe88 improving landing template
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/landing/templates/index.html.j2 | 83 +++++++++--------
translations/de/LC_MESSAGES/messages.po | 103 ++++++++++++++++++++-
translations/messages.pot | 103 ++++++++++++++++++++-
3 files changed, 247 insertions(+), 42 deletions(-)
diff --git a/talermerchantdemos/landing/templates/index.html.j2
b/talermerchantdemos/landing/templates/index.html.j2
index cc6b874..84d46fe 100644
--- a/talermerchantdemos/landing/templates/index.html.j2
+++ b/talermerchantdemos/landing/templates/index.html.j2
@@ -1,11 +1,13 @@
{% extends "templates/base.html.j2" %}
{% block main %}
<article>
- <h2>Step 1: Install the Taler wallet</h2>
- Install the wallet from the <a
href="https://wallet.taler.net/";>installation page</a>.
- It only takes one click.
+ <h2>{{ gettext("Step 1: Install the Taler wallet") }}</h2>
+ {{
+ gettext('Install the wallet from the <a href="{link}">installation
page</a>.').format(link="https://wallet.taler.net/";) + "<br>" +
+ gettext('Installation only takes one click.')
+ }}
<p class="bluebox taler-installed-hide">
- You don't have a wallet installed yet.
+ You do not have a wallet installed yet.
</p>
<p class="greenbox taler-installed-show">
Congratulations, you have installed the Taler wallet correctly.
@@ -14,60 +16,61 @@
</article>
<article>
- <h2>Step 2: Withdraw coins</h2>
+ <h2>{{ gettext("Step 2: Withdraw coins") }}</h2>
<p>
-
- Now you can withdraw coins into your wallet by going to our <a
href="{{ bank_url }}">bank</a>.
-
- In this demo you are paying with KUDOS, an imaginary currency. When
you
- create an account at our bank, you'll get 100 KUDOS for free.
+ {{
+ gettext('Next you can withdraw coins into your wallet by going to
our <a href="{bank}">bank</a>.').format(bank=bank_url) + "<br>" +
+ gettext('In this demo you are paying with {currency}, an imaginary
currency.').format(currency=merchant_currency) + "<br>" +
+ gettext('When you create an account at our bank, you will receive
100 {currency} for free.').format(currency=merchant_currency)
+ }}
</p>
<p class="graybox">
- We cannnot check if you were able to complete this step, since websites
- cannot see the balance in your wallet. Please click on the Taler icon
- in your browser to check your balance.
+ {{ gettext('Once you have completed this step, you can click on the
Taler icon in your browser to check your balance.') }}
</p>
</article>
<article>
- <h2>Step 3: Pay</h2>
- We have two demo merchants where you can spend your coins:
+ <h2>{{ gettext("Step 3: Pay") }}</h2>
+ {{
+ gettext("We have two demo merchants where you can spend your
coins:")
+ }}
<ul>
<li>
- The <a href="{{ merchant_blog_url }}">essay store</a>, where you
can pay KUDOS for
- individual chapters of Richard Stallman's book "Free Software, Free
- Society", which is also available for free at <a
href="http://www.fsf.org/";>the FSF</a>.
+ {{
+ gettext('At the <a href="{blog}">essay store</a> you can pay in
{currency} for individual chapters of Richard Stallman's book "Free
Software, Free
Society".').format(blog=merchant_blog_url,currency=merchant_currency) +
"<br>" +
+ gettext('The book is also available for free at <a
href="{fsf}">the FSF</a>.').format(fsf="http://www.fsf.org/";)
+ }}
</li>
<li>
- The <a href="{{ merchant_donations_url }}">project donation
website</a>, where
- you can show respect to a software project of your choice
- by giving them KUDOS.
+ {{
+ gettext('At the <a href="{donations}">project donation
website</a> you can show respect to a software project of your choice by
donating {currency} to
them.').format(donations=merchant_donations_url,currency=merchant_currency)
+ }}
</li>
</ul>
</article>
<article>
- <h2>Step 4: Check money flow</h2>
- <ul>
- <li>
- Check if people who received your Taler payment got eventually
- paid by the exchange via a wire transfer; visit the:
- <a href="{{ bank_url }}/public-accounts">public accounts page</a>
at the bank.
- Note that only those account whose owners gave permission are
showed
- on that page.
- </li>
- </ul>
+ <h2>{{ gettext("Step 4: Check money flow") }}</h2>
+ {{
+ gettext('To check if people who received your Taler payment got
eventually paid by the exchange via a wire transfer visit the <a
href="{bank}/public-accounts">public accounts page</a> at the
bank.').format(bank=bank_url) + "<br>" +
+ gettext('Note that only accounts set to be publicly viewable are
shown on that page.')
+ }}
+ </article>
+ <article>
+ <h2>{{ gettext("Step 5: Survey") }}</h2>
+ {{
+ gettext("Websites can give tips to visitors for completing tasks.")
+ "<br>" +
+ gettext('Go earn some coins by filling in our <a
href="{url}">survey</a>.').format(url=merchant_survey_url)
+ }}
</article>
<!-- article>
- <h2>Step 5: Merchant? Consult back-office</h2>
- <ul>
- <li>
- If you are a merchant, you can check the <a href="{{
backoffice_url }}">back-office</a>
- website to see how your Taler transactions got payed back by bank
wire transfers.
- </li>
- </ul>
+ <h2>Step 6: Are you a merchant? Taler has a build-in back-office!</h2>
+ If you are a merchant, you can check the <a href="{{ backoffice_url
}}">back-office</a>
+ website to see how your Taler transactions got payed back by bank
wire transfers.
</article -->
<article>
- <h2>Step 5: Reach out to us</h2>
- Let us know what you think by <a
href="mailto:demo-feedback@taler.net";>contacting us</a>.
+ <h2>{{ gettext("Step 6: Reach out to us") }}</h2>
+ {{
+ gettext('Let us know what you think by <a href="{link}">contacting
us</a>.').format(link="mailto:demo-feedback@taler.net";)
+ }}
</article>
{% endblock %}
diff --git a/translations/de/LC_MESSAGES/messages.po
b/translations/de/LC_MESSAGES/messages.po
index e78b5b5..6b9bff2 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: taler-merchant-demos\n"
"Report-Msgid-Bugs-To: taler@gnu.org\n"
-"POT-Creation-Date: 2020-10-11 16:57+0200\n"
+"POT-Creation-Date: 2020-10-11 17:28+0200\n"
"PO-Revision-Date: 2020-10-09 21:25+0200\n"
"Last-Translator: Christian Grothoff <cg@taler.net>\n"
"Language: de\n"
@@ -370,6 +370,107 @@ msgstr ""
msgid "Here you can try out the Taler payment system using a toy currency."
msgstr ""
+#: talermerchantdemos/landing/templates/index.html.j2:4
+msgid "Step 1: Install the Taler wallet"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:6
+msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:7
+msgid "Installation only takes one click."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:19
+msgid "Step 2: Withdraw coins"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:22
+msgid ""
+"Next you can withdraw coins into your wallet by going to our <a "
+"href=\"{bank}\">bank</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:23
+msgid "In this demo you are paying with {currency}, an imaginary currency."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:24
+msgid ""
+"When you create an account at our bank, you will receive 100 {currency} "
+"for free."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:28
+msgid ""
+"Once you have completed this step, you can click on the Taler icon in "
+"your browser to check your balance."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:33
+msgid "Step 3: Pay"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:35
+msgid "We have two demo merchants where you can spend your coins:"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:40
+msgid ""
+"At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
+"individual chapters of Richard Stallman's book "Free Software, "
+"Free Society"."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:41
+msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:46
+msgid ""
+"At the <a href=\"{donations}\">project donation website</a> you can show "
+"respect to a software project of your choice by donating {currency} to "
+"them."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:52
+msgid "Step 4: Check money flow"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:56
+msgid ""
+"To check if people who received your Taler payment got eventually paid by"
+" the exchange via a wire transfer visit the <a href=\"{bank}/public-"
+"accounts\">public accounts page</a> at the bank."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:57
+msgid ""
+"Note that only accounts set to be publicly viewable are shown on that "
+"page."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:63
+msgid "Step 5: Survey"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:67
+msgid "Websites can give tips to visitors for completing tasks."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:68
+msgid "Go earn some coins by filling in our <a href=\"{url}\">survey</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:83
+msgid "Step 6: Reach out to us"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:85
+msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
+msgstr ""
+
#: talermerchantdemos/survey/templates/base.html.j2:20
msgid "Taler Survey Demo"
msgstr ""
diff --git a/translations/messages.pot b/translations/messages.pot
index 5e626cf..2a3853a 100644
--- a/translations/messages.pot
+++ b/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: 2020-10-11 16:57+0200\n"
+"POT-Creation-Date: 2020-10-11 17:28+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"
@@ -369,6 +369,107 @@ msgstr ""
msgid "Here you can try out the Taler payment system using a toy currency."
msgstr ""
+#: talermerchantdemos/landing/templates/index.html.j2:4
+msgid "Step 1: Install the Taler wallet"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:6
+msgid "Install the wallet from the <a href=\"{link}\">installation page</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:7
+msgid "Installation only takes one click."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:19
+msgid "Step 2: Withdraw coins"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:22
+msgid ""
+"Next you can withdraw coins into your wallet by going to our <a "
+"href=\"{bank}\">bank</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:23
+msgid "In this demo you are paying with {currency}, an imaginary currency."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:24
+msgid ""
+"When you create an account at our bank, you will receive 100 {currency} "
+"for free."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:28
+msgid ""
+"Once you have completed this step, you can click on the Taler icon in "
+"your browser to check your balance."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:33
+msgid "Step 3: Pay"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:35
+msgid "We have two demo merchants where you can spend your coins:"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:40
+msgid ""
+"At the <a href=\"{blog}\">essay store</a> you can pay in {currency} for "
+"individual chapters of Richard Stallman's book "Free Software, "
+"Free Society"."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:41
+msgid "The book is also available for free at <a href=\"{fsf}\">the FSF</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:46
+msgid ""
+"At the <a href=\"{donations}\">project donation website</a> you can show "
+"respect to a software project of your choice by donating {currency} to "
+"them."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:52
+msgid "Step 4: Check money flow"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:56
+msgid ""
+"To check if people who received your Taler payment got eventually paid by"
+" the exchange via a wire transfer visit the <a href=\"{bank}/public-"
+"accounts\">public accounts page</a> at the bank."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:57
+msgid ""
+"Note that only accounts set to be publicly viewable are shown on that "
+"page."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:63
+msgid "Step 5: Survey"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:67
+msgid "Websites can give tips to visitors for completing tasks."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:68
+msgid "Go earn some coins by filling in our <a href=\"{url}\">survey</a>."
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:83
+msgid "Step 6: Reach out to us"
+msgstr ""
+
+#: talermerchantdemos/landing/templates/index.html.j2:85
+msgid "Let us know what you think by <a href=\"{link}\">contacting us</a>."
+msgstr ""
+
#: talermerchantdemos/survey/templates/base.html.j2:20
msgid "Taler Survey Demo"
msgstr ""
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-merchant-demos] branch master updated (d69934f -> 52afe88),
gnunet <=