aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-03 11:10:15 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-03 11:10:15 +0200
commit6c3152d3dae65b79203986179e20f371e6d01781 (patch)
treeaa3b4e7f522b6da02995c927480280a182f32de4
parentTake into account the client time zone. (diff)
downloadnewspipe-6c3152d3dae65b79203986179e20f371e6d01781.tar.gz
newspipe-6c3152d3dae65b79203986179e20f371e6d01781.tar.bz2
newspipe-6c3152d3dae65b79203986179e20f371e6d01781.zip
Using datetime filter in all templates.
-rw-r--r--pyaggr3g470r/templates/admin/user.html4
-rw-r--r--pyaggr3g470r/templates/article.html4
-rw-r--r--pyaggr3g470r/templates/favorites.html4
-rw-r--r--pyaggr3g470r/templates/feed.html2
-rw-r--r--pyaggr3g470r/templates/opml.xml6
-rw-r--r--pyaggr3g470r/templates/unread.html4
6 files changed, 12 insertions, 12 deletions
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index fb60d8b1..92b04b23 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -9,8 +9,8 @@
<h2>Membership</h2>
<div class="row">
<div class="col-md-6">
- <p>Member since {{ user.date_created.strftime('%A, %d %B %Y') }}.</p>
- <p>Last seen: {{ user.last_seen.strftime('%A, %d %B %Y at %H:%M:%S') }}.</p>
+ <p>Member since {{ user.date_created | datetime }}.</p>
+ <p>Last seen: {{ user.last_seen | datetime }}.</p>
</div>
<div class="col-md-6">
<img src="{{ user.email | gravatar }}" />
diff --git a/pyaggr3g470r/templates/article.html b/pyaggr3g470r/templates/article.html
index 81d5d2e4..83e23b34 100644
--- a/pyaggr3g470r/templates/article.html
+++ b/pyaggr3g470r/templates/article.html
@@ -14,10 +14,10 @@
{% else %}
<a href="/like/{{ article.id }}"><i class="glyphicon glyphicon-star-empty" title="{{ _('Click if you like this article') }}"></i></a>
{% endif %}
- <h6>{{ article.date }}</h6>
+ <h6>{{ article.date | datetime }}</h6>
</div>
<div class="jumbotron">
- {{ article.content|safe }}
+ {{ article.content | safe }}
</div>
<div class="jumbotron">
<div class="row">
diff --git a/pyaggr3g470r/templates/favorites.html b/pyaggr3g470r/templates/favorites.html
index b0357b41..9be16692 100644
--- a/pyaggr3g470r/templates/favorites.html
+++ b/pyaggr3g470r/templates/favorites.html
@@ -25,7 +25,7 @@
{% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
<a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
{% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
- <h6>{{ feed.articles[n].date }}</h6>
+ <h6>{{ feed.articles[n].date | datetime }}</h6>
</div>
{% endfor %}
</div>
@@ -37,7 +37,7 @@
{% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
<a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
{% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
- <h6>{{ feed.articles[n].date }}</h6>
+ <h6>{{ feed.articles[n].date | datetime }}</h6>
</div>
{% endfor %}
</div>
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index 98e965e4..1caa6d13 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -21,7 +21,7 @@
<br />
{% if feed.articles.all()|count != 0 %}
{{ _('The last article was posted') }} {{ elapsed.days }} {{ _('day(s) ago.') }}<br />
- {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} {{ first_post_date.strftime('%Y-%m-%d') }} {{ _('and the') }} {{ end_post_date.strftime('%Y-%m-%d') }}.
+ {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} {{ first_post_date | datetime }} {{ _('and the') }} {{ end_post_date | datetime }}.
{% endif %}
</p>
</div>
diff --git a/pyaggr3g470r/templates/opml.xml b/pyaggr3g470r/templates/opml.xml
index 8918bb88..07d2b3d9 100644
--- a/pyaggr3g470r/templates/opml.xml
+++ b/pyaggr3g470r/templates/opml.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- OPML generated by pyAggr3g470r on {{ now.strftime('%A, %d %B %Y') }} -->
+<!-- OPML generated by pyAggr3g470r on {{ now | datetime }} -->
<opml version="1.1">
<head>
<title>Feeds of {{ user.firstname }}</title>
- <dateCreated>{{ now.strftime('%A, %d %B %Y') }}</dateCreated>
- <dateModified>{{ now.strftime('%A, %d %B %Y') }}</dateModified>
+ <dateCreated>{{ now | datetime }}</dateCreated>
+ <dateModified>{{ now | datetime }}</dateModified>
<ownerName>{{ user.firstname }} {{ user.lastname }}</ownerName>
<ownerEmail>{{ user.email }}</ownerEmail>
</head>
diff --git a/pyaggr3g470r/templates/unread.html b/pyaggr3g470r/templates/unread.html
index 5194aaca..6c5c5d08 100644
--- a/pyaggr3g470r/templates/unread.html
+++ b/pyaggr3g470r/templates/unread.html
@@ -27,7 +27,7 @@
{% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
<a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
{% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
- <h6>{{ feed.articles[n].date }}</h6>
+ <h6>{{ feed.articles[n].date | datetime }}</h6>
</div>
{% endfor %}
</div>
@@ -39,7 +39,7 @@
{% if feed.articles[n].readed %}<h3>{% else %}<h1>{% endif %}
<a href="/article/{{ feed.articles[n].id }}">{{ feed.articles[n].title|safe }}</a>
{% if feed.articles[n].readed %}</h3>{% else %}</h1>{% endif %}
- <h6>{{ feed.articles[n].date }}</h6>
+ <h6>{{ feed.articles[n].date | datetime }}</h6>
</div>
{% endfor %}
</div>
bgstack15