From 27a66add6995174cab6ab36d7aeb2120b50ca8d9 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Wed, 20 Nov 2013 14:25:27 -0200
Subject: [PATCH] Using UTC as default timezone

---
 src/colab/custom_settings.py                                     | 2 --
 src/super_archives/templates/message-preview.html                | 5 ++---
 src/super_archives/templates/message-thread.html                 | 4 ++--
 src/super_archives/templates/superarchives/includes/message.html | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 00823f4..9b7795d 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -5,8 +5,6 @@ DEBUG = False
 
 TEMPLATE_DEBUG = False
 
-TIME_ZONE = 'America/Sao_Paulo'
-
 LANGUAGES = (
     ('en', _('English')),
     ('pt-br', _('Portuguese')),
diff --git a/src/super_archives/templates/message-preview.html b/src/super_archives/templates/message-preview.html
index 846ace6..fa01127 100644
--- a/src/super_archives/templates/message-preview.html
+++ b/src/super_archives/templates/message-preview.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load highlight %}
+{% load i18n tz highlight %}
 
 <li class="preview-message">
 <span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
@@ -55,7 +54,7 @@
       </span>
     {% endif %}
     {% if result.modified %}
-    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
+    <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span>
     {% endif %}
   </div>
 {% endif %}
diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index 393628c..1bc16c1 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n superarchives %}
+{% load i18n tz superarchives %}
 
 {% trans "Anonymous" as anonymous %}
 
@@ -154,7 +154,7 @@
       <li>
         <span class="glyphicon glyphicon-chevron-right"></span>
         {% trans "started at" %}
-        <h5>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h5>
+        <h5>{{ first_msg.received_time|localtime|timesince }} {% trans "ago" %}</h5>
       </li>
 
       <li>
diff --git a/src/super_archives/templates/superarchives/includes/message.html b/src/super_archives/templates/superarchives/includes/message.html
index af3891f..8541778 100644
--- a/src/super_archives/templates/superarchives/includes/message.html
+++ b/src/super_archives/templates/superarchives/includes/message.html
@@ -1,4 +1,4 @@
-{% load gravatar superarchives i18n %}
+{% load gravatar superarchives tz i18n %}
 <li>
   {% spaceless %}
   <div class="email-message" id="msg-{% firstof email.id 'reply' %}">
@@ -19,7 +19,7 @@
         <div class="col-lg-6 col-md-6 col-sm-6">
           <div class="pull-right text-right">
             <span class="date">
-              {{ email.received_time|date:'DATETIME_FORMAT' }}
+              {{ email.received_time|localtime|date:'DATETIME_FORMAT' }}
             </span>
 
             <div class="btn-group">
--
libgit2 0.21.2