diff options
author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-27 20:52:03 +0200 |
---|---|---|
committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-27 21:18:29 +0200 |
commit | dad66ad5a2c8a9645e0127e09283082f3c439a28 (patch) | |
tree | a345405f0d4228b246f4b6dce3d00dcda1e06d91 /hyperkitty/templates/messages/message.html | |
parent | 2a84b82a17e6986b3265d958f89d562c241a7a80 (diff) | |
download | hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.tar.gz hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.tar.xz hyperkitty-dad66ad5a2c8a9645e0127e09283082f3c439a28.zip |
Rework the display of email datetimes using timezones
Diffstat (limited to 'hyperkitty/templates/messages/message.html')
-rw-r--r-- | hyperkitty/templates/messages/message.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 6a42066..0676dd8 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -2,6 +2,7 @@ {% load storm %} {% load gravatar %} {% load hk_generic %} +{% load tz %} {% is_message_new email.date as is_new %} <div class="email{% if unfolded %} email-first{% endif %}{% if is_new %} unread{% endif %}"> @@ -10,14 +11,14 @@ <div class="email-date inline-block pull-right"> {% ifchanged %} <span class="date"> - {{email|viewer_date|date:"l, j F"}} + {{email|get_date|date:"l, j F"}} {% if unfolded %} - {{email|viewer_date|date:"Y"}} + {{email|get_date|date:"Y"}} {% endif %} </span> {% endifchanged %} {% if unfolded %}<br />{% endif %} - <span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span> + <span class="time" title="Sender's time: {% localtime off %}{{email|get_date|date:"l, j F H:i:s e"}}{% endlocaltime %}">{{email|get_date|date:"H:i:s"}}</span> </div> {% if is_new %} <i class="unread icon-eye-close" title="Unread"></i> |