From a990b407367c231740cb1d2b36d0ed0b27b94c63 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 12 Oct 2020 13:02:55 +0200 Subject: review all texts in the demo --- talermerchantdemos/blog/templates/article_frame.html.j2 | 6 +++--- talermerchantdemos/blog/templates/article_refunded.html.j2 | 4 +++- talermerchantdemos/blog/templates/base.html.j2 | 8 ++++---- talermerchantdemos/blog/templates/confirm_refund.html.j2 | 5 +++-- talermerchantdemos/blog/templates/index.html.j2 | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) (limited to 'talermerchantdemos/blog') 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 %}

{{ - gettext("You did not like this article?") + - gettext('You can request a refund 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 request a refund within the first hour after buying this article.').format(url=url_for('confirm_refund', lang='en', order_id=order_id)) }}

{% 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 @@

-{{ 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.") +}}

{% 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 @@ {% block meta %}{% endblock %} - {{ gettext("Taler Essay Shop Demo") }} + {{ gettext("GNU Taler Demo: Essay Shop") }} @@ -69,8 +69,8 @@

{{ gettext("Taler Demo")}}
+ {{ gettext("Essay shop") }}

{{ gettext("On this page you can buy articles using an imaginary currency.") + "
" + gettext("The articles are chapters from Richard Stallman's book "Free Software, Free Society".") + "
" + @@ -109,7 +109,7 @@ {% endblock %}

{{ gettext('You can learn more about Taler on our main website.').format(site="https://taler.net/") }}

{{ gettext('You can learn more about GNU Taler on our main website.').format(site="https://taler.net/") }}

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 @@

{{ - gettext("Do you want to get a refund for the article {name}?").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 {name}?").format(name=article_name) + "
" + + gettext("In this demonstration, refunds will be automatically approved by the merchant.") + "
" + + gettext("After you have obtained a refund, you will not be able to read the article anymore.") }}

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 %} -

{{ gettext("This is the latest edition of Free Software, Free Society: Selected Essays of Richard M. Stallman.") }}
Free Software Foundation
-- cgit v1.2.3

{{ gettext("Taler Demo")}}

{{ gettext("Shop") }}

{{ gettext("Taler Demo")}}
+ {{ gettext("Essay shop") }}

{{ gettext("Essay Shop: Free Software, Free Society") }}

{{ gettext("Essay Shop: Free Software, Free Society") }}