summaryrefslogtreecommitdiff
path: root/talermerchantdemos/blog
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-10-12 13:02:55 +0200
committerChristian Grothoff <christian@grothoff.org>2020-10-12 13:02:55 +0200
commita990b407367c231740cb1d2b36d0ed0b27b94c63 (patch)
treee021d46864cb9fc58d300fe0c28a13d7a0fdc217 /talermerchantdemos/blog
parent9360fed258098158c51b3a384a76ff570afcdce0 (diff)
downloadtaler-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/blog')
-rw-r--r--talermerchantdemos/blog/templates/article_frame.html.j26
-rw-r--r--talermerchantdemos/blog/templates/article_refunded.html.j24
-rw-r--r--talermerchantdemos/blog/templates/base.html.j28
-rw-r--r--talermerchantdemos/blog/templates/confirm_refund.html.j25
-rw-r--r--talermerchantdemos/blog/templates/index.html.j22
5 files changed, 14 insertions, 11 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 &quot;Free Software, Free Society&quot;.") + "<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 &copy; 2014&mdash;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>