From de9f63b4cd882526f0dde3775e4aa2ac6eea8abd Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Tue, 13 Nov 2012 17:44:40 +0100
Subject: Adapt to MySQL support splitting out the timezone offset

Since the sender's timezone is in a separate column, we can now display
the message date in Django's timezone and in the sender's timezone.

Future improvement : ask the user for his/her preferred timezone and store
it in his/her profile. Then use that to display the dates, instead of
Django's server-wide setting.
---
 hyperkitty/templates/messages/message.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'hyperkitty/templates')

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index a77c694..d408936 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -6,13 +6,14 @@
 	<div class="email_date inline-block pull-right">
 		{% ifchanged %}
 		<span class="date">
-			{{email.date|date:"l, j F"}}
+			{{email|viewer_date|date:"l, j F"}}
 			{% if unfolded %}
-			{{email.date|date:"Y"}}
+			{{email|viewer_date|date:"Y"}}
 			{% endif %}
 		</span>
 		{% endifchanged %}
-		<span class="time">{{email.date|date:"H:i:s e"}}</span>
+		{% 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>
 	</div>
     <div class="gravatar{% if use_mockups %} pull-left{% endif %}">
         {% gravatar_img_for_email email.email 40 %}
-- 
cgit