aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/web/templates/about.html1
-rw-r--r--src/web/translations/fr/LC_MESSAGES/messages.mobin17199 -> 17231 bytes
-rw-r--r--src/web/translations/fr/LC_MESSAGES/messages.po13
-rw-r--r--src/web/translations/messages.pot8
-rw-r--r--src/web/views/views.py5
5 files changed, 17 insertions, 10 deletions
diff --git a/src/web/templates/about.html b/src/web/templates/about.html
index 1d51786e..c6fc4df9 100644
--- a/src/web/templates/about.html
+++ b/src/web/templates/about.html
@@ -16,6 +16,7 @@
<div class="well">
<h1>{{ _('Help') }}</h1>
<p>{{ _('The documentation of the API is <a href="https://newspipe.readthedocs.io/en/latest/web-services-v3.html">here</a>.') }}</p>
+ <p>{{ _('Contact')}}: <a href="mailto:{{ contact }}">{{ contact }}</a></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="%(bookmarklet)s" rel="bookmark">Subscribe to this feed using Newspipe</a>', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }}
</div>
diff --git a/src/web/translations/fr/LC_MESSAGES/messages.mo b/src/web/translations/fr/LC_MESSAGES/messages.mo
index ef90842b..50310b69 100644
--- a/src/web/translations/fr/LC_MESSAGES/messages.mo
+++ b/src/web/translations/fr/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/src/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po
index c7261029..7c37657b 100644
--- a/src/web/translations/fr/LC_MESSAGES/messages.po
+++ b/src/web/translations/fr/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-10-10 11:17+0200\n"
-"PO-Revision-Date: 2016-10-10 11:18+0100\n"
+"POT-Creation-Date: 2016-10-10 14:06+0200\n"
+"PO-Revision-Date: 2016-10-10 14:07+0100\n"
"Last-Translator: Cedric Bonhomme <cedric.bonhomme@list.lu>\n"
"Language-Team: fr <LL@li.org>\n"
"Language: fr\n"
@@ -219,6 +219,10 @@ msgstr ""
"latest/web-services-v3.html\">ici</a>."
#: ../templates/about.html:19
+msgid "Contact"
+msgstr "Contact"
+
+#: ../templates/about.html:20
msgid ""
"You can subscribe to new feeds with a bookmarklet. Drag the following button "
"to your browser bookmarks."
@@ -226,7 +230,7 @@ msgstr ""
"Vous pouvez vous abonner à de nouveaux flux avec un bookmarklet. Faites "
"glisser le bouton suivant dans vos favoris."
-#: ../templates/about.html:20
+#: ../templates/about.html:21
#, python-format
msgid ""
"<a class=\"btn btn-default\" href=\"%(bookmarklet)s\" rel=\"bookmark"
@@ -1045,9 +1049,6 @@ msgstr "Interdit."
#~ msgid "Mark all as read older than %(days)s days"
#~ msgstr "Marquer tout comme lu plus ancien que %(days)s jours"
-#~ msgid "Content"
-#~ msgstr "Contenu"
-
#~ msgid "Search"
#~ msgstr "Recherche"
diff --git a/src/web/translations/messages.pot b/src/web/translations/messages.pot
index 8d725bfd..adfef4a5 100644
--- a/src/web/translations/messages.pot
+++ b/src/web/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: 2016-10-10 11:17+0200\n"
+"POT-Creation-Date: 2016-10-10 14:06+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"
@@ -207,12 +207,16 @@ msgid ""
msgstr ""
#: ../templates/about.html:19
+msgid "Contact"
+msgstr ""
+
+#: ../templates/about.html:20
msgid ""
"You can subscribe to new feeds with a bookmarklet. Drag the following "
"button to your browser bookmarks."
msgstr ""
-#: ../templates/about.html:20
+#: ../templates/about.html:21
#, python-format
msgid ""
"<a class=\"btn btn-default\" href=\"%(bookmarklet)s\" "
diff --git a/src/web/views/views.py b/src/web/views/views.py
index cbc26480..8703edba 100644
--- a/src/web/views/views.py
+++ b/src/web/views/views.py
@@ -6,7 +6,7 @@ from flask import (request, render_template, flash,
from flask_babel import gettext
from sqlalchemy import desc
-from conf import API_ROOT
+from conf import API_ROOT, ADMIN_EMAIL
from web.controllers import FeedController
from web.lib.view_utils import etag_match
@@ -73,7 +73,8 @@ def popular():
@current_app.route('/about', methods=['GET'])
@etag_match
def about():
- return render_template('about.html')
+ print(ADMIN_EMAIL)
+ return render_template('about.html', contact=ADMIN_EMAIL)
@current_app.route('/.well-known/acme-challenge/EZyud_oLrReeFMTW3rQiSi-RaZlXCDpwMBrRJ6-vGfU')
bgstack15