Commit 27a66add6995174cab6ab36d7aeb2120b50ca8d9
1 parent
e9919b71
Exists in
master
and in
39 other branches
Using UTC as default timezone
Showing
4 changed files
with
6 additions
and
9 deletions
Show diff stats
src/colab/custom_settings.py
| @@ -5,8 +5,6 @@ DEBUG = False | @@ -5,8 +5,6 @@ DEBUG = False | ||
| 5 | 5 | ||
| 6 | TEMPLATE_DEBUG = False | 6 | TEMPLATE_DEBUG = False |
| 7 | 7 | ||
| 8 | -TIME_ZONE = 'America/Sao_Paulo' | ||
| 9 | - | ||
| 10 | LANGUAGES = ( | 8 | LANGUAGES = ( |
| 11 | ('en', _('English')), | 9 | ('en', _('English')), |
| 12 | ('pt-br', _('Portuguese')), | 10 | ('pt-br', _('Portuguese')), |
src/super_archives/templates/message-preview.html
| 1 | -{% load i18n %} | ||
| 2 | -{% load highlight %} | 1 | +{% load i18n tz highlight %} |
| 3 | 2 | ||
| 4 | <li class="preview-message"> | 3 | <li class="preview-message"> |
| 5 | <span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span> | 4 | <span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span> |
| @@ -55,7 +54,7 @@ | @@ -55,7 +54,7 @@ | ||
| 55 | </span> | 54 | </span> |
| 56 | {% endif %} | 55 | {% endif %} |
| 57 | {% if result.modified %} | 56 | {% if result.modified %} |
| 58 | - <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span> | 57 | + <span class="pull-right">{{ result.modified|localtime|timesince }} {% trans "ago" %}</span> |
| 59 | {% endif %} | 58 | {% endif %} |
| 60 | </div> | 59 | </div> |
| 61 | {% endif %} | 60 | {% endif %} |
src/super_archives/templates/message-thread.html
| 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
| 2 | -{% load i18n superarchives %} | 2 | +{% load i18n tz superarchives %} |
| 3 | 3 | ||
| 4 | {% trans "Anonymous" as anonymous %} | 4 | {% trans "Anonymous" as anonymous %} |
| 5 | 5 | ||
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | <li> | 154 | <li> |
| 155 | <span class="glyphicon glyphicon-chevron-right"></span> | 155 | <span class="glyphicon glyphicon-chevron-right"></span> |
| 156 | {% trans "started at" %} | 156 | {% trans "started at" %} |
| 157 | - <h5>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h5> | 157 | + <h5>{{ first_msg.received_time|localtime|timesince }} {% trans "ago" %}</h5> |
| 158 | </li> | 158 | </li> |
| 159 | 159 | ||
| 160 | <li> | 160 | <li> |
src/super_archives/templates/superarchives/includes/message.html
| 1 | -{% load gravatar superarchives i18n %} | 1 | +{% load gravatar superarchives tz i18n %} |
| 2 | <li> | 2 | <li> |
| 3 | {% spaceless %} | 3 | {% spaceless %} |
| 4 | <div class="email-message" id="msg-{% firstof email.id 'reply' %}"> | 4 | <div class="email-message" id="msg-{% firstof email.id 'reply' %}"> |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <div class="col-lg-6 col-md-6 col-sm-6"> | 19 | <div class="col-lg-6 col-md-6 col-sm-6"> |
| 20 | <div class="pull-right text-right"> | 20 | <div class="pull-right text-right"> |
| 21 | <span class="date"> | 21 | <span class="date"> |
| 22 | - {{ email.received_time|date:'DATETIME_FORMAT' }} | 22 | + {{ email.received_time|localtime|date:'DATETIME_FORMAT' }} |
| 23 | </span> | 23 | </span> |
| 24 | 24 | ||
| 25 | <div class="btn-group"> | 25 | <div class="btn-group"> |