From 2ce813d67ee32a100c7c3643717856f1718cf81c Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Mon, 12 Oct 2015 17:41:39 +0200
Subject: updating translations

---
 pyaggr3g470r/templates/about.html | 32 ++++++++++++++++++++++++++++++++
 src/web/templates/feed.html       |  2 +-
 src/web/views/views.py            |  3 +++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pyaggr3g470r/templates/about.html

diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html
new file mode 100644
index 00000000..fe108878
--- /dev/null
+++ b/pyaggr3g470r/templates/about.html
@@ -0,0 +1,32 @@
+{% extends "layout.html" %}
+{% block content %}
+<div class="container">
+    <div class="well">
+        <h1>{{ _("About") }}</h1>
+        <p>
+        {{ _("pyAggr3g470r is a news aggregator platform and can be shared between several users.") }}
+        {{ _("You can easily install pyAggr3g470r on your server.") }}
+        {{ _("Alternatively, you can deploy your own copy using this button:") }}</p>
+        <a class="reference external image-reference" href="https://heroku.com/deploy?template=https://github.com/cedricbonhomme/pyAggr3g470r"><img alt="https://www.herokucdn.com/deploy/button.png" src="https://www.herokucdn.com/deploy/button.png" /></a></p>
+        <p>{{ _("This software is under AGPLv3 license. You are welcome to copy, modify or redistribute the %(start_link_source)ssource code%(end_link_source)s according to the %(start_link_affero)sAffero GPL%(end_link_affero)s license.",
+                start_link_source="<a href='https://bitbucket.org/cedricbonhomme/pyaggr3g470r'>"|safe, end_link_source="</a>"|safe,
+                start_link_affero="<a href='https://www.gnu.org/licenses/agpl-3.0.html'>"|safe, end_link_affero="</a>"|safe) }}</p>
+        <p>{{ _("Found a bug? Report it %(start_link)shere%(end_link)s.", start_link="<a href='https://bitbucket.org/cedricbonhomme/pyaggr3g470r/issues'>"|safe, end_link="</a>"|safe) }}</p>
+    </div>
+    <div class="well">
+        <h1>{{ _("Help") }}</h1>
+        <p>{{ _("If you have any problem, %(start_link)scontact%(end_link)s the administrator.", start_link="<a href='http://wiki.cedricbonhomme.org/contact'>"|safe, end_link="</a>"|safe) }}</p>
+        <p>{{ _("The documentation of the RESTful API is %(start_link)shere%(end_link)s.", start_link="<a href='https://pyaggr3g470r.readthedocs.org/en/latest/web-services.html'>"|safe, end_link="</a>"|safe) }}</p>
+        <p>{{ _("You can subscribe to new feeds with a bookmarklet. Drag the following button to your browser bookmarks.") }}</p>
+        <a class="btn btn-default" href="javascript:window.location='{{ url_for("feed.bookmarklet", _external=True) }}?url='+encodeURIComponent(document.location)'" rel="bookmark">
+            {{ _("Subscribe to this feed using pyAggr3g470r") }}
+        </a>
+    </div>
+    <div class="well">
+        <h1>{{ _("Donation") }}</h1>
+        <p>{{ _("If you wish and if you like pyAggr3g470r, you can donate via bitcoin %(start_link)s1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ%(end_link)s. Thank you!",
+                start_link="<a href='https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ'>"|safe, end_link="</a>"|safe) }}
+        </p>
+    </div>
+</div><!-- /.container -->
+{% endblock %}
diff --git a/src/web/templates/feed.html b/src/web/templates/feed.html
index 7434a9ac..096ee794 100644
--- a/src/web/templates/feed.html
+++ b/src/web/templates/feed.html
@@ -37,7 +37,7 @@
 
         {% if feed.articles.all()|count != 0 %}
             {{ _('The last article was posted') }} {{ elapsed.days }} {{ _('day(s) ago.') }}<br />
-            {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} <i>{{ first_post_date | datetime }}</i> {{ _('and the') }} <i>{{ end_post_date | datetime }}</i>.
+            {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} {{ first_post_date | datetime }} {{ _('and the') }} {{ end_post_date | datetime }}.
         {% endif %}
         </p>
     </div>
diff --git a/src/web/views/views.py b/src/web/views/views.py
index 4abea96e..17db8906 100644
--- a/src/web/views/views.py
+++ b/src/web/views/views.py
@@ -71,6 +71,7 @@ login_manager.login_view = 'login'
 
 logger = logging.getLogger(__name__)
 
+
 #
 # Management of the user's session.
 #
@@ -104,6 +105,7 @@ def load_user(id):
     # Return an instance of the User model
     return UserController().get(id=id)
 
+
 #
 # Custom error pages.
 #
@@ -145,6 +147,7 @@ def get_timezone():
     except:
         return conf.TIME_ZONE["en"]
 
+
 #
 # Views.
 #
-- 
cgit