diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-10-12 13:02:55 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-10-12 13:02:55 +0200 |
| commit | a990b407367c231740cb1d2b36d0ed0b27b94c63 (patch) | |
| tree | e021d46864cb9fc58d300fe0c28a13d7a0fdc217 /talermerchantdemos | |
| parent | 9360fed258098158c51b3a384a76ff570afcdce0 (diff) | |
| download | taler-merchant-demos-a990b407367c231740cb1d2b36d0ed0b27b94c63.tar.gz taler-merchant-demos-a990b407367c231740cb1d2b36d0ed0b27b94c63.tar.bz2 taler-merchant-demos-a990b407367c231740cb1d2b36d0ed0b27b94c63.zip | |
review all texts in the demo
Diffstat (limited to 'talermerchantdemos')
14 files changed, 76 insertions, 52 deletions
diff --git a/talermerchantdemos/blog/templates/article_frame.html.j2 b/talermerchantdemos/blog/templates/article_frame.html.j2 index b5763e4..2690306 100644 --- a/talermerchantdemos/blog/templates/article_frame.html.j2 +++ b/talermerchantdemos/blog/templates/article_frame.html.j2 @@ -4,10 +4,10 @@ {% if refundable %} <hr> -<p> +<p class="graybox"> {{ - gettext("You did not like this article?") + - gettext('You can <a href="{url}">request a refund</a> within the first hour after buying it.').format(url=url_for('confirm_refund', lang='en', order_id=order_id)) + gettext("Taler allows merchants to offer refunds to customers.") + + gettext('You can <a href="{url}">request a refund</a> within the first hour after buying this article.').format(url=url_for('confirm_refund', lang='en', order_id=order_id)) }} </p> {% endif %} diff --git a/talermerchantdemos/blog/templates/article_refunded.html.j2 b/talermerchantdemos/blog/templates/article_refunded.html.j2 index 34e0a0b..d4e405c 100644 --- a/talermerchantdemos/blog/templates/article_refunded.html.j2 +++ b/talermerchantdemos/blog/templates/article_refunded.html.j2 @@ -10,7 +10,9 @@ </p> <p> -{{ gettext("You won't be able to view it until you pay for it again.") }} +{{ + gettext("You will not be able to read the article until you pay for it again.") +}} </p> {% endblock main %} diff --git a/talermerchantdemos/blog/templates/base.html.j2 b/talermerchantdemos/blog/templates/base.html.j2 index 1303276..65f8461 100644 --- a/talermerchantdemos/blog/templates/base.html.j2 +++ b/talermerchantdemos/blog/templates/base.html.j2 @@ -20,7 +20,7 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> {% block meta %}{% endblock %} - <title>{{ gettext("Taler Essay Shop Demo") }}</title> + <title>{{ gettext("GNU Taler Demo: Essay Shop") }}</title> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" /> @@ -69,8 +69,8 @@ <body> <header class="demobar" style="display: flex; flex-direction: column;"> - <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo")}}</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">{{ gettext("Shop") }}</a></span></h1> + <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo")}}</span><br/> + <span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG') }}">{{ gettext("Essay shop") }}</a></span></h1> <p>{{ gettext("On this page you can buy articles using an imaginary currency.") + "<br>" + gettext("The articles are chapters from Richard Stallman's book "Free Software, Free Society".") + "<br>" + @@ -109,7 +109,7 @@ {% endblock %} <hr /> <div> - <p>{{ gettext('You can learn more about Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> + <p>{{ gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> <div style="flex-grow:1"></div> <p>Copyright © 2014—2020 Taler Systems SA</p> </div> diff --git a/talermerchantdemos/blog/templates/confirm_refund.html.j2 b/talermerchantdemos/blog/templates/confirm_refund.html.j2 index a371645..aafd3f5 100644 --- a/talermerchantdemos/blog/templates/confirm_refund.html.j2 +++ b/talermerchantdemos/blog/templates/confirm_refund.html.j2 @@ -4,8 +4,9 @@ <p> {{ - gettext("Do you want to get a refund for the article <em>{name}</em>?").format(name=article_name) + - gettext("After you have requested a refund, you won't be able to read the article anymore.") + gettext("Do you want to get a refund for the article <em>{name}</em>?").format(name=article_name) + "<br/>" + + gettext("In this demonstration, refunds will be automatically approved by the merchant.") + "<br/>" + + gettext("After you have obtained a refund, you will not be able to read the article anymore.") }} </p> diff --git a/talermerchantdemos/blog/templates/index.html.j2 b/talermerchantdemos/blog/templates/index.html.j2 index 6cc8e7e..f231e6f 100644 --- a/talermerchantdemos/blog/templates/index.html.j2 +++ b/talermerchantdemos/blog/templates/index.html.j2 @@ -1,6 +1,6 @@ {% extends "templates/base.html.j2" %} {% block main %} - <h1>{{ gettext("Essay Shop: Free Software, Free Society") }} </h1> + <h2>{{ gettext("Essay Shop: Free Software, Free Society") }} </h2> <div style="font-size: smaller;"> <p>{{ gettext("This is the latest edition of <cite>Free Software, Free Society: Selected Essays of Richard M. Stallman.</cite>") }} <br> Free Software Foundation<br> diff --git a/talermerchantdemos/donations/templates/base.html.j2 b/talermerchantdemos/donations/templates/base.html.j2 index b67658b..f3b1359 100644 --- a/talermerchantdemos/donations/templates/base.html.j2 +++ b/talermerchantdemos/donations/templates/base.html.j2 @@ -17,7 +17,7 @@ <html data-taler-nojs="true"> <head> - <title>{{ gettext("Taler Donation Demo") }}</title> + <title>{{ gettext("GNU Taler Demo: Donations") }}</title> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" /> @@ -66,11 +66,11 @@ <body> <header class="demobar" style="display: flex; flex-direction: column;"> - <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS') }}">{{gettext("Donations")}}</a></span></h1> + <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span><br/> + <span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS') }}">{{gettext("Donations")}}</a></span></h1> <p>{{ gettext ("This is the donation page.") + "<br>" + - gettext ("Using this page you can make donations (in an imaginary currency) to Free Software projects.") + gettext ("Using this page you can make donations in {currency} to Free Software projects.").format(currency=merchant_currency) }} </p> </header> @@ -106,7 +106,7 @@ {% endblock %} <hr /> <div> - <p>{{ gettext('You can learn more about Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> + <p>{{ gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> <div style="flex-grow:1"></div> <p>Copyright © 2014—2020 Taler Systems SA</p> </div> diff --git a/talermerchantdemos/donations/templates/checkout.html.j2 b/talermerchantdemos/donations/templates/checkout.html.j2 index 5251fdf..5b6900f 100644 --- a/talermerchantdemos/donations/templates/checkout.html.j2 +++ b/talermerchantdemos/donations/templates/checkout.html.j2 @@ -6,12 +6,16 @@ <p> {{ - gettext('This is an example for a "checkout" page of a Web shop. On the previous page, you have created the shopping cart and decided which product to buy (i.e. which project to donate KUDOS to). Now in this page, you are asked to select a payment option. As Taler is not yet universally used, we expect merchants will offer various payment options.') + gettext('This is an example for a "checkout" page of a Web shop.') + "<br\>" + + gettext('On the previous page, you have created the shopping cart and decided which product to buy (i.e. which project to donate KUDOS to).') + "<br/>" + + gettext('As Taler is not yet universally used, we expect merchants will offer various payment options.') + "<br/>" + + gettext('To continue with the demo, select the "Taler" payment option.') }} </p> - <p> + <p class="graybox"> {{ - gettext('Note that you MUST select Taler here for the demo to continue, as the other payment options are just placeholders and not really working in the demonstration. Also, it is of course possible to ask the user to make this choice already on the previous page (with the shopping cart), we just separated the two steps to keep each step as simple as possible.') + gettext('Note that you must select Taler here for the demo to continue, as the other payment options are just placeholders and not really working in the demonstration.') + "<br\>" + + gettext('It would be possible to ask the user to make this choice already on the previous page (with the shopping cart); we just separated the two steps to keep each step as simple as possible.') }} </p> diff --git a/talermerchantdemos/donations/templates/fulfillment.html.j2 b/talermerchantdemos/donations/templates/fulfillment.html.j2 index df9f30b..5fd799b 100644 --- a/talermerchantdemos/donations/templates/fulfillment.html.j2 +++ b/talermerchantdemos/donations/templates/fulfillment.html.j2 @@ -1,7 +1,7 @@ {% extends "templates/base.html.j2" %} {% block main %} -<h1>{{ gettext("Donation Receipt") }}</h1> +<h2>{{ gettext("Donation Receipt") }}</h2> <p> {{ gettext("Thank you, <strong>{donor}</strong>, for donating <strong>{amount}</strong> to <strong>{receiver}</strong>.").format(donor=donation_donor,amount=donation_amount,receiver=donation_receiver) @@ -14,7 +14,7 @@ }} </p> -<p> +<p class="graybox"> {{ gettext('You can always make <a href="{link}">another donation</a>.').format(link=url_for('index')) }} diff --git a/talermerchantdemos/donations/templates/index.html.j2 b/talermerchantdemos/donations/templates/index.html.j2 index 91122f3..87bce85 100644 --- a/talermerchantdemos/donations/templates/index.html.j2 +++ b/talermerchantdemos/donations/templates/index.html.j2 @@ -1,11 +1,11 @@ {% extends "templates/base.html.j2" %} {% block main %} -<h1>{{ gettext("Taler donation demonstrator") }}</h1> +<h2>{{ gettext("Donate to Free Software projects") }}</h2> <p> {{ - gettext("This donations website shows the user experience for donations with Taler.") + "<br>" + + gettext("This donations website shows the user experience for donations with GNU Taler.") + "<br>" + gettext("You can make donations in an toy currency ({currency})").format(currency=merchant_currency) }} </p> @@ -13,7 +13,7 @@ <div> <p> {{ - gettext("Please select a project, the amount (*) of {currency} you wish to donate, and enter the name that will appear on your receipt:").format(currency=merchant_currency) + gettext("Please select a project, the amount (*) of {currency} you wish to donate, and enter the donor's name that will appear on your receipt:").format(currency=merchant_currency) }} </p> @@ -34,9 +34,9 @@ <input type="submit" class="pure-button pure-button-primary" value="{{gettext("Donate!")}}" /> </div> </form> - <p> + <p class="graybox"> {{ - gettext("(*) To make it a bit more fun, the 5 {currency} option is deliberately implemented with a fault: the merchant will try to make you donate 6 {currency} instead of the 5 {currency} shown in the form. But do not worry, you will be given the opportunity to review the final offer from the merchant in a window secured by the Taler extension. That way, you can spot the error before committing to an incorrect contract or amount.").format(currency=merchant_currency) + gettext("(*) To make the demo a bit more interesting, the 5 {currency} option is deliberately implemented with a fault: the merchant will try to make you donate 6 {currency} instead of the 5 {currency} shown in the form. But do not worry, you will be given the opportunity to review the final offer from the merchant in the Taler wallet. That way, Taler protects you from committing to erroneous payments.").format(currency=merchant_currency) }} </p> </div> diff --git a/talermerchantdemos/donations/templates/provider-not-supported.html.j2 b/talermerchantdemos/donations/templates/provider-not-supported.html.j2 index 88f2000..a4d5d80 100644 --- a/talermerchantdemos/donations/templates/provider-not-supported.html.j2 +++ b/talermerchantdemos/donations/templates/provider-not-supported.html.j2 @@ -1,6 +1,11 @@ {% extends "templates/base.html" %} {% block main %} -<h1>Payment Provider Not Supported</h1> -<p>Unfortunately the selected payment provider is not supported in this demo. Please go back and select "Taler".</p> +<h2>{{ gettext("Payment Provider Not Supported") }}</h2> +<p> +{{ + gettext("Unfortunately the selected payment provider is not supported in this demo.") + "<br>" + + gettext("Please go back and select "Taler".") +}} +</p> {% endblock main %} diff --git a/talermerchantdemos/landing/templates/base.html.j2 b/talermerchantdemos/landing/templates/base.html.j2 index a046c41..c88ee90 100644 --- a/talermerchantdemos/landing/templates/base.html.j2 +++ b/talermerchantdemos/landing/templates/base.html.j2 @@ -17,7 +17,7 @@ <html data-taler-nojs="true"> <head> - <title>{{ gettext("Taler Demo") }}</title> + <title>{{ gettext("GNU Taler Demo: Introduction") }}</title> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" /> @@ -66,11 +66,11 @@ <body> <header class="demobar" style="display: flex; flex-direction: column;"> - <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY') }}">{{ gettext("Introduction") }}</a></span></h1> + <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span><br/> + <span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY') }}">{{ gettext("Introduction") }}</a></span></h1> <p>{{ - gettext("This is the Taler demo.") + "<br>" + - gettext("Here you can try out the Taler payment system using a toy currency.") + gettext("This is the GNU Taler demo.") + "<br>" + + gettext("Here you can try out the GNU Taler payment system using a toy currency.") }} </p> </header> @@ -105,7 +105,7 @@ {% endblock %} <hr /> <div> - <p>{{ gettext('You can learn more about Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> + <p>{{ gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> <div style="flex-grow:1"></div> <p>Copyright © 2014—2020 Taler Systems SA</p> </div> diff --git a/talermerchantdemos/landing/templates/index.html.j2 b/talermerchantdemos/landing/templates/index.html.j2 index 84d46fe..399dd25 100644 --- a/talermerchantdemos/landing/templates/index.html.j2 +++ b/talermerchantdemos/landing/templates/index.html.j2 @@ -2,16 +2,16 @@ {% block main %} <article> <h2>{{ gettext("Step 1: Install the Taler wallet") }}</h2> + <p> {{ 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 do not have a wallet installed yet. </p> - <p class="greenbox taler-installed-show"> - Congratulations, you have installed the Taler wallet correctly. - You can now proceed with the next steps. + <p class="graybox"> + {{ gettext('After installation, you may be asked to grant the brower-based Taler wallet additional optional permissions that allow it to improve your user experience.') }} + "<br>" + + {{ gettext('These permissions will allow the wallet to automatically open if a page asks for a Taler payment.') }} + "<br>" + + {{ gettext('Regardless of the permissions you grant, the wallet will never transmit information about you or your browsing history to anyone.') }} </p> </article> @@ -19,9 +19,11 @@ <h2>{{ gettext("Step 2: Withdraw coins") }}</h2> <p> {{ - 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) + gettext('To withdraw {currency} coins you must first create an account at our <a href="{bank}">bank</a>.').format(currency=merchant_currency,bank=bank_url) + "<br>" + + gettext('Signing up only requires you to pick a username and password.') + "<br>" + + gettext('When you create an account at our bank, you will be credited 100 {currency} for signing up.').format(currency=merchant_currency) + "<br>" + + gettext("Afterwards, use the bank's Web interface to authorize the transfer of {currency} to your wallet.").format(currency=merchant_currency) }} </p> <p class="graybox"> @@ -31,9 +33,11 @@ <article> <h2>{{ gettext("Step 3: Pay") }}</h2> + <p> {{ gettext("We have two demo merchants where you can spend your coins:") }} + </p> <ul> <li> {{ @@ -43,34 +47,43 @@ </li> <li> {{ - 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) + gettext('At the project <a href="{donations}">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>{{ gettext("Step 4: Check money flow") }}</h2> + <p> {{ - 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.') + gettext('You can see the wire transfers from the escrow account of the exchange to the merchants on the <a href="{bank}/public-accounts">public accounts page</a> of the bank.').format(bank=bank_url) + "<br>" + + gettext('Note that only accounts configured to be publicly viewable are shown on that page.') }} + </p> </article> <article> <h2>{{ gettext("Step 5: Survey") }}</h2> + <p> {{ 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) + gettext("You can earn some {currency} coins by filling in our <a href="{url}">survey</a>.").format(url=merchant_survey_url,currency=merchant_currency) }} + </p> </article> <!-- article> <h2>Step 6: Are you a merchant? Taler has a build-in back-office!</h2> + <p> 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. + </p> </article --> <article> <h2>{{ gettext("Step 6: Reach out to us") }}</h2> + <p> {{ + gettext("We appreciate feedback about Taler and this demonstrator.") + "<br>" + gettext('Let us know what you think by <a href="{link}">contacting us</a>.').format(link="mailto:demo-feedback@taler.net") }} + </p> </article> {% endblock %} diff --git a/talermerchantdemos/survey/templates/base.html.j2 b/talermerchantdemos/survey/templates/base.html.j2 index 1beb0d5..2b424f1 100644 --- a/talermerchantdemos/survey/templates/base.html.j2 +++ b/talermerchantdemos/survey/templates/base.html.j2 @@ -17,7 +17,7 @@ <html data-taler-nojs="true"> <head> - <title>{{ gettext("Taler Survey Demo") }}</title> + <title>{{ gettext("GNU Taler Demo: Survey") }}</title> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='pure.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='demo.css') }}" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navbar.css') }}" /> @@ -66,11 +66,10 @@ <body> <header class="demobar" style="display: flex; flex-direction: column;"> - <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY') }}">{{ gettext("Survey") }}</a></span></h1> + <h1><span class="tt adorn-brackets">{{ gettext("Taler Demo") }}</span><br/> + <span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY') }}">{{ gettext("Survey") }}</a></span></h1> <p>{{ - gettext("This is the Taler survey demonstration.") + "<br>" + - gettext("It demonatrates how merchants can reward their users by granting tips.") + "<br>" + + gettext("This page demonstrates how to tip visitors for completing small tasks.") + "<br>" + gettext("Tipping is a way for offer cash rewards that go directly into a user's wallet.") }} </p> @@ -106,7 +105,7 @@ {% endblock %} <hr /> <div> - <p>{{ gettext('You can learn more about Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> + <p>{{ gettext('You can learn more about GNU Taler on our main <a href="{site}">website</a>.').format(site="https://taler.net/") }}</p> <div style="flex-grow:1"></div> <p>Copyright © 2014—2020 Taler Systems SA</p> </div> diff --git a/talermerchantdemos/survey/templates/index.html.j2 b/talermerchantdemos/survey/templates/index.html.j2 index 3539bf8..7c449da 100644 --- a/talermerchantdemos/survey/templates/index.html.j2 +++ b/talermerchantdemos/survey/templates/index.html.j2 @@ -3,7 +3,7 @@ <div> <p> {{ - gettext("On this page, you can participate in our survey about payment systems and receive a tip in return.") + gettext("Please participate in our survey about payment systems and receive a tip in return.") }} </p> </div> |