Download as
Browse Code »

Commit 27a66add6995174cab6ab36d7aeb2120b50ca8d9

Authored by Sergio Oliveira
1 parent e9919b71
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Using UTC as default timezone

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