aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-10-12 17:41:39 +0200
committerFrançois Schmidts <francois.schmidts@gmail.com>2016-01-26 23:46:31 +0100
commit2ce813d67ee32a100c7c3643717856f1718cf81c (patch)
treea1f1227ad14e530e7458c2ba65a049f6597cb46b /src
parentmoving 'expire_article' and improving its perf (diff)
downloadnewspipe-2ce813d67ee32a100c7c3643717856f1718cf81c.tar.gz
newspipe-2ce813d67ee32a100c7c3643717856f1718cf81c.tar.bz2
newspipe-2ce813d67ee32a100c7c3643717856f1718cf81c.zip
updating translations
Diffstat (limited to 'src')
-rw-r--r--src/web/templates/feed.html2
-rw-r--r--src/web/views/views.py3
2 files changed, 4 insertions, 1 deletions
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.
#
bgstack15