Added timezone support (time zone is selected in settings)

boards/forms.py

@@ -1,5 +1,6 b''
 import re
 import time
+import pytz
 
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -47,6 +48,13 b' HTTP_RESULT_OK = 200'
 TEXTAREA_ROWS = 4
 
 
+def get_timezones():
+    timezones = []
+    for tz in pytz.common_timezones:
+        timezones.append((tz, tz),)
+    return timezones
+
+
 class FormatPanel(forms.Textarea):
     """
     Panel for text formatting. Consists of buttons to add different tags to the
@@ -321,9 +329,9 b' class ThreadForm(PostForm):'
 
 class SettingsForm(NeboardForm):
 
-    theme = forms.ChoiceField(choices=settings.THEMES,
-                              label=_('Theme'))
+    theme = forms.ChoiceField(choices=settings.THEMES, label=_('Theme'))
     username = forms.CharField(label=_('User name'), required=False)
+    timezone = forms.ChoiceField(choices=get_timezones(), label=_('Time zone'))
 
     def clean_username(self):
         username = self.cleaned_data['username']

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-29 16:19+0300\n"
+"POT-Creation-Date: 2015-03-30 18:42+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,93 +38,97 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba javascript"'
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:33
+#: forms.py:34
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:34
+#: forms.py:35
 msgid "tag1 several_words_tag"
 msgstr "метка1 метка_из_нескольких_слов"
 
-#: forms.py:36
+#: forms.py:37
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:37
+#: forms.py:38
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:38
+#: forms.py:39
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:39 templates/boards/base.html:36 templates/search/search.html:13
+#: forms.py:40 templates/boards/base.html:36 templates/search/search.html:13
 #: templates/search/search.html.py:17
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:131
+#: forms.py:139
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:134
+#: forms.py:142
 msgid "Image URL"
 msgstr "URL изображения"
 
-#: forms.py:140
+#: forms.py:148
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:151
+#: forms.py:159
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:160
+#: forms.py:168
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:182
+#: forms.py:190
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:219
+#: forms.py:227
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:235
+#: forms.py:243
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:247
+#: forms.py:255
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:294 templates/boards/rss/post.html:10 templates/boards/tags.html:7
+#: forms.py:302 templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:301
+#: forms.py:309
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:312
+#: forms.py:320
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
-#: forms.py:325
+#: forms.py:332
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:326
+#: forms.py:333
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:332
+#: forms.py:334
+msgid "Time zone"
+msgstr "Часовой пояс"
+
+#: forms.py:340
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -169,7 +173,7 b' msgstr "\xd0\xa3\xd0\xbf\xd1\x80\xd0\xb0\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbc\xd0\xb5\xd1\x82\xd0\xba\xd0\xb0\xd0\xbc\xd0\xb8"'
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: templates/boards/base.html:47 templates/boards/settings.html:8
+#: templates/boards/base.html:47 templates/boards/settings.html:9
 msgid "Settings"
 msgstr "Настройки"
 
@@ -187,12 +191,12 b' msgid "Up"'
 msgstr "Вверх"
 
 #: templates/boards/notifications.html:17
-#: templates/boards/posting_general.html:79 templates/search/search.html:26
+#: templates/boards/posting_general.html:81 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:27
-#: templates/boards/posting_general.html:119 templates/search/search.html:37
+#: templates/boards/posting_general.html:121 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -216,52 +220,52 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c \xd1\x82\xd0\xb5\xd0\xbc\xd1\x83"'
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:86 templates/boards/thread.html:28
+#: templates/boards/post.html:86 templates/boards/thread.html:30
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:87 templates/boards/thread.html:29
+#: templates/boards/post.html:87 templates/boards/thread.html:31
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:63
+#: templates/boards/posting_general.html:65
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/posting_general.html:66
+#: templates/boards/posting_general.html:68
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
-#: templates/boards/posting_general.html:94
+#: templates/boards/posting_general.html:96
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:124
+#: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:130
+#: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:135 templates/boards/preview.html:16
-#: templates/boards/thread_normal.html:44
+#: templates/boards/posting_general.html:137 templates/boards/preview.html:16
+#: templates/boards/thread_normal.html:46
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:141
+#: templates/boards/posting_general.html:143
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:144
-#: templates/boards/thread_normal.html:50
+#: templates/boards/posting_general.html:146
+#: templates/boards/thread_normal.html:51
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:156
+#: templates/boards/posting_general.html:158
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -273,19 +277,19 b' msgstr "\xd0\x9f\xd1\x80\xd0\xb5\xd0\xb4\xd0\xbf\xd1\x80\xd0\xbe\xd1\x81\xd0\xbc\xd0\xbe\xd1\x82\xd1\x80"'
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/settings.html:16
+#: templates/boards/settings.html:17
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:20
+#: templates/boards/settings.html:21
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:28
+#: templates/boards/settings.html:29
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
-#: templates/boards/settings.html:37
+#: templates/boards/settings.html:38
 msgid "Save"
 msgstr "Сохранить"
 
@@ -342,36 +346,36 b' msgstr "\xd0\x92\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb6\xd0\xb5\xd1\x82\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbf\xd1\x80\xd0\xbe\xd0\xb1\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd1\x8c \xd0\xb2\xd1\x81\xd1\x82\xd0\xb0\xd0\xb2\xd0\xb8\xd1\x82\xd1\x8c \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb8 \xd0\xbf\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb5\xd1\x80\xd0\xb8\xd1\x82\xd1\x8c \xd1\x80\xd0\xb5\xd0\xb7\xd1\x83\xd0\xbb\xd1\x8c\xd1\x82\xd0\xb0\xd1\x82 \xd0\xb7\xd0\xb4\xd0\xb5\xd1\x81\xd1\x8c:"'
 msgid "No tags found."
 msgstr "Метки не найдены."
 
-#: templates/boards/thread.html:30
+#: templates/boards/thread.html:32
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
-#: templates/boards/thread_gallery.html:20
-#: templates/boards/thread_normal.html:14
+#: templates/boards/thread_gallery.html:21
+#: templates/boards/thread_normal.html:16
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread_gallery.html:21
-#: templates/boards/thread_normal.html:15
+#: templates/boards/thread_gallery.html:22
+#: templates/boards/thread_normal.html:17
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread_gallery.html:51
+#: templates/boards/thread_gallery.html:52
 msgid "No images."
 msgstr "Нет изображений."
 
-#: templates/boards/thread_normal.html:23
+#: templates/boards/thread_normal.html:25
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread_normal.html:37
+#: templates/boards/thread_normal.html:39
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread_normal.html:51
+#: templates/boards/thread_normal.html:52
 msgid "Close form"
 msgstr "Закрыть форму"
 
-#: templates/boards/thread_normal.html:67
+#: templates/boards/thread_normal.html:68
 msgid "Update"
 msgstr "Обновить"

boards/middlewares.py

@@ -1,4 +1,8 b''
+import pytz
+
 from django.shortcuts import redirect
+from django.utils import timezone
+
 from boards import utils
 from boards.models import Ban
 
@@ -26,3 +30,13 b' class BanMiddleware:'
                 ban = bans[0]
                 if not ban.can_read:
                     return redirect('banned')
+
+
+class TimezoneMiddleware(object):
+    def process_request(self, request):
+        tzname = request.session.get('django_timezone')
+        if tzname:
+            timezone.activate(pytz.timezone(tzname))
+        else:
+            timezone.deactivate()
+

boards/static/js/main.js

@@ -23,17 +23,6 b''
  for the JavaScript code in this page.
  */
 
-if (window.Intl) {
-    var LOCALE = window.navigator.language;
-    var FORMATTER = new Intl.DateTimeFormat(
-            LOCALE,
-            {
-                weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
-                hour: 'numeric', minute: '2-digit', second: '2-digit'
-            }
-    );
-}
-
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
@@ -51,36 +40,6 b' function highlightCode(node) {'
     });
 }
 
-/**
- * Translate timestamps to local ones for all <time> tags inside node.
- */
-function translate_time(node) {
-    if (window.Intl === null) {
-        return;
-    }
-
-    var elements;
-
-    if (node === null) {
-        elements = $('time');
-    } else {
-        elements = node.find('time');
-    }
-
-    if (!elements.length) {
-        return;
-    }
-
-    elements.each(function() {
-        var element = $(this);
-        var dateAttr = element.attr('datetime');
-        if (dateAttr) {
-            var date = new Date(dateAttr);
-            element.text(FORMATTER.format(date));
-        }
-    });
-}
-
 $( document ).ready(function() {
     hideEmailFromForm();
 
@@ -94,6 +53,4 b' function translate_time(node) {'
     addRefLinkPreview();
 
     highlightCode($(document));
-
-    translate_time(null);
 });

boards/static/js/refpopup.js

@@ -20,7 +20,6 b' function mkPreview(cln, html) {'
 
     highlightCode($(cln));
     addRefLinkPreview(cln);
-    translate_time($(cln));
 };
 
 function isElementInViewport (el) {

boards/static/js/thread_update.js

@@ -196,7 +196,6 b' function updateMetadataPanel(lastUpdate)'
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
         lastUpdateField.html(lastUpdate);
-        translate_time(lastUpdateField);
         blink(lastUpdateField);
     }
 
@@ -305,7 +304,6 b' function showAsErrors(form, text) {'
 function processNewPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
-    translate_time(post);
     blink(post);
 }
 

boards/templates/boards/posting_general.html

@@ -4,6 +4,7 b''
 {% load cache %}
 {% load board %}
 {% load static %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
@@ -38,6 +39,7 b''
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
 {% if tag %}
     <div class="tag_info">
@@ -81,7 +83,7 b''
         {% endif %}
 
         {% for thread in threads %}
-            {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
+            {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE TIME_ZONE %}
             <div class="thread">
                 {% post_view thread.get_opening_post moderator is_opening=True thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}

boards/templates/boards/settings.html

@@ -2,6 +2,7 b''
 
 {% load i18n %}
 {% load humanize %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">

boards/templates/boards/thread.html

@@ -4,6 +4,7 b''
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
+{% load tz %}
 
 {% block head %}
     <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
@@ -13,6 +14,7 b''
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
     <span class="metapanel"
           data-last-update="{{ last_update }}"
@@ -24,7 +26,7 b''
         {% block thread_meta_panel %}
         {% endblock %}
 
-        {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
+        {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE TIME_ZONE %}
         <span id="reply-count">{{ thread.get_reply_count }}</span>{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time></span>

boards/templates/boards/thread_gallery.html

@@ -4,6 +4,7 b''
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
@@ -12,10 +13,10 b''
 {% endblock %}
 
 {% block content %}
-    {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
-    {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE request.get_host %}
+    {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE request.get_host TIME_ZONE %}
     <div class="image-mode-tab">
         <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
         <a class="current_mode" href="{% url 'thread_gallery' thread.get_opening_post.id %}">{% trans 'Gallery mode' %}</a>
@@ -52,6 +53,4 b''
         {% endif %}
     </div>
     {% endcache %}
-
-    {% endspaceless %}
 {% endblock %}

boards/templates/boards/thread_normal.html

@@ -4,11 +4,13 b''
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
+{% load tz %}
 
 {% block content %}
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
-    {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
+    {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE TIME_ZONE %}
 
     <div class="image-mode-tab">
         <a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,

boards/views/settings.py

@@ -1,5 +1,8 b''
+import pytz
+
 from django.db import transaction
 from django.shortcuts import render, redirect
+from django.utils import timezone
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID
@@ -8,6 +11,7 b' from boards.forms import SettingsForm, P'
 
 FORM_THEME = 'theme'
 FORM_USERNAME = 'username'
+FORM_TIMEZONE = 'timezone'
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
 
@@ -25,7 +29,9 b' class SettingsView(BaseBoardView):'
         form = SettingsForm(
             initial={
                 FORM_THEME: selected_theme,
-                FORM_USERNAME: settings_manager.get_setting(SETTING_USERNAME)},
+                FORM_USERNAME: settings_manager.get_setting(SETTING_USERNAME),
+                FORM_TIMEZONE: request.session.get('django_timezone', timezone.get_current_timezone()),
+            },
             error_class=PlainErrorList)
 
         params[CONTEXT_FORM] = form
@@ -50,6 +56,8 b' class SettingsView(BaseBoardView):'
                     settings_manager.set_setting(SETTING_USERNAME, username)
                     settings_manager.set_setting(SETTING_LAST_NOTIFICATION_ID, None)
 
+                request.session['django_timezone'] = form.cleaned_data[FORM_TIMEZONE]
+
                 return redirect('settings')
             else:
                 params = dict()

neboard/settings.py

@@ -116,6 +116,7 b' MIDDLEWARE_CLASSES = ('
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'boards.middlewares.BanMiddleware',
+    'boards.middlewares.TimezoneMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'