Added timezone support (time zone is selected in settings)

boards/forms.py

@@ -1,338 +1,346 b''
 import re
 import time
+import pytz
 
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 import requests
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import Tag
 from neboard import settings
 import boards.settings as board_settings
 
 
 CONTENT_TYPE_IMAGE = (
     'image/jpeg',
     'image/png',
     'image/gif',
     'image/bmp',
 )
 
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 ATTRIBUTE_ROWS = 'rows'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.')
 TAGS_PLACEHOLDER = _('tag1 several_words_tag')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
 IMAGE_DOWNLOAD_CHUNK_BYTES = 100000
 
 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
     form text area.
     """
 
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += '<span class="mark_btn"' + \
                       ' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + '</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join(['(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
     """
     Form with neboard-specific formatting.
     """
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row"><div class="form-label">'
                        '%(label)s'
                        '</div></div>'
                        '<div class="form-row"><div class="form-input">'
                        '%(field)s'
                        '</div></div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in list(self.fields.items()):
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE)
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
     image = forms.ImageField(required=False, label=_('Image'),
                              widget=forms.ClearableFileInput(
                                  attrs={'accept': 'image/*'}))
     image_url = forms.CharField(required=False, label=_('Image URL'),
                                 widget=forms.TextInput(
                                     attrs={ATTRIBUTE_PLACEHOLDER:
                                                'http://example.com/image.png'}))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
             if len(text) > board_settings.MAX_TEXT_LENGTH:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') %
                                             str(board_settings
                                             .MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
 
         if image:
             self.validate_image_size(image.size)
 
         return image
 
     def clean_image_url(self):
         url = self.cleaned_data['image_url']
 
         image = None
         if url:
             image = self._get_image_from_url(url)
 
             if not image:
                 raise forms.ValidationError(_('Invalid URL'))
             else:
                 self.validate_image_size(image.size)
 
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         if cleaned_data['email']:
             self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
     def get_image(self):
         """
         Gets image from file or URL.
         """
 
         image = self.cleaned_data['image']
         return image if image else self.cleaned_data['image_url']
 
     def _clean_text_image(self):
         text = self.cleaned_data.get('text')
         image = self.get_image()
 
         if (not text) and (not image):
             error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         posting_delay = settings.POSTING_DELAY
 
         if board_settings.LIMIT_POSTING_SPEED and LAST_POST_TIME in \
                 self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < posting_delay:
                 error_message = _('Wait %s seconds after last posting') % str(
                     posting_delay - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_POST_TIME] = time.time()
 
     def validate_image_size(self, size: int):
         if size > board_settings.MAX_IMAGE_SIZE:
             raise forms.ValidationError(
                 _('Image must be less than %s bytes')
                 % str(board_settings.MAX_IMAGE_SIZE))
 
     def _get_image_from_url(self, url: str) -> SimpleUploadedFile:
         """
         Gets an image file from URL.
         """
 
         img_temp = None
 
         try:
             # Verify content headers
             response_head = requests.head(url, verify=False)
             content_type = response_head.headers['content-type'].split(';')[0]
             if content_type in CONTENT_TYPE_IMAGE:
                 length_header = response_head.headers.get('content-length')
                 if length_header:
                     length = int(length_header)
                     self.validate_image_size(length)
                 # Get the actual content into memory
                 response = requests.get(url, verify=False, stream=True)
 
                 # Download image, stop if the size exceeds limit
                 size = 0
                 content = b''
                 for chunk in response.iter_content(IMAGE_DOWNLOAD_CHUNK_BYTES):
                     size += len(chunk)
                     self.validate_image_size(size)
                     content += chunk
 
                 if response.status_code == HTTP_RESULT_OK and content:
                     # Set a dummy file name that will be replaced
                     # anyway, just keep the valid extension
                     filename = 'image.' + content_type.split('/')[1]
                     img_temp = SimpleUploadedFile(filename, content,
                                                   content_type)
         except Exception:
             # Just return no image
             pass
 
         return img_temp
 
 
 class ThreadForm(PostForm):
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not REGEX_TAGS.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         required_tag_exists = False
         for tag in tags.split():
             tag_model = Tag.objects.filter(name=tag.strip().lower(),
                                            required=True)
             if tag_model.exists():
                 required_tag_exists = True
                 break
 
         if not required_tag_exists:
             raise forms.ValidationError(_('Need at least 1 required tag.'))
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 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']
 
         if username and not REGEX_TAGS.match(username):
             raise forms.ValidationError(_('Inappropriate characters.'))
 
         return username
 
 
 class SearchForm(NeboardForm):
     query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,377 +1,381 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 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"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 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 "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:13
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:30
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:34
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39 templates/boards/base.html.py:40
 #: templates/boards/notifications.html:8
 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 "Настройки"
 
 #: templates/boards/base.html:60
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:62
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:64
 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 "Следующая страница"
 
 #: templates/boards/post.html:32
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:34 templates/boards/post.html.py:38
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:43
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:45
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:75
 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 "Страницы: "
 
 #: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/rss/post.html:5
 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 "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Add post to this thread"
 msgstr "Добавить сообщение в эту тему"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:17
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:20
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:23
 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,28 +1,42 b''
+import pytz
+
 from django.shortcuts import redirect
+from django.utils import timezone
+
 from boards import utils
 from boards.models import Ban
 
 RESPONSE_CONTENT_TYPE = 'Content-Type'
 
 TYPE_HTML = 'text/html'
 
 
 class BanMiddleware:
     """
     This is run before showing the thread. Banned users don't need to see
     anything
     """
 
     def __init__(self):
         pass
 
     def process_view(self, request, view_func, view_args, view_kwargs):
 
         if request.path != '/banned/':
             ip = utils.get_client_ip(request)
             bans = Ban.objects.filter(ip=ip)
 
             if bans.exists():
                 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

@@ -1,99 +1,56 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  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.
  */
 function hideEmailFromForm() {
     $('.form-email').parent().parent().hide();
 }
 
 /**
  * Highlight code blocks with code highlighter
  */
 function highlightCode(node) {
     node.find('pre code').each(function(i, e) {
         hljs.highlightBlock(e);
     });
 }
 
-/**
- * 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();
 
     $("a[href='#top']").click(function() {
         $("html, body").animate({ scrollTop: 0 }, "slow");
         return false;
     });
 
     addImgPreview();
 
     addRefLinkPreview();
 
     highlightCode($(document));
-
-    translate_time(null);
 });

boards/static/js/refpopup.js

@@ -1,121 +1,120 b''
 function $X(path, root) {
     return document.evaluate(path, root || document, null, 6, null);
 }
 function $x(path, root) {
     return document.evaluate(path, root || document, null, 8, null).singleNodeValue;
 }
 
 function $del(el) {
     if(el) el.parentNode.removeChild(el);
 }
 
 function $each(list, fn) {
     if(!list) return;
     var i = list.snapshotLength;
     if(i > 0) while(i--) fn(list.snapshotItem(i), i);
 }
 
 function mkPreview(cln, html) {
     cln.innerHTML = html;
 
     highlightCode($(cln));
     addRefLinkPreview(cln);
-    translate_time($(cln));
 };
 
 function isElementInViewport (el) {
     //special bonus for those using jQuery
     if (typeof jQuery === "function" && el instanceof jQuery) {
         el = el[0];
     }
 
     var rect = el.getBoundingClientRect();
 
     return (
         rect.top >= 0 &&
         rect.left >= 0 &&
         rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */
         rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
     );
 }
 
 function addRefLinkPreview(node) {
     $each($X('.//a[starts-with(text(),">>")]', node || document), function(link) {
         link.addEventListener('mouseover', showPostPreview, false);
         link.addEventListener('mouseout', delPostPreview, false);
     });
 }
 
 function showPostPreview(e) {
     var doc = document;
     //ref id
     var pNum = $(this).text().match(/\d+/);
 
     if (pNum == null || pNum.length == 0) {
         return;
     }
 
     var post = $('#' + pNum);
     if (post.length > 0 && isElementInViewport(post)) {
         post.addClass('highlight');
     } else {
         var x = e.clientX + (doc.documentElement.scrollLeft || doc.body.scrollLeft) + 2;
         var y = e.clientY + (doc.documentElement.scrollTop || doc.body.scrollTop);
 
         var cln = doc.createElement('div');
         cln.id = 'pstprev_' + pNum;
         cln.className = 'post_preview';
 
         cln.style.cssText = 'top:' + y + 'px;' + (x < doc.body.clientWidth/2 ? 'left:' + x + 'px' : 'right:' + parseInt(doc.body.clientWidth - x + 1) + 'px');
 
         cln.addEventListener('mouseout', delPostPreview, false);
 
         cln.innerHTML = "<div class=\"post\">" + gettext('Loading...') + "</div>";
 
         if(post.length > 0) {
             var postdata = post.clone().wrap("<div/>").parent().html();
 
             mkPreview(cln, postdata);
         } else {
             $.ajax({
                 url: '/api/post/' + pNum + '/?truncated'
             })
                 .success(function(data) {
                     var postdata = $(data).wrap("<div/>").parent().html();
 
                     //make preview
                     mkPreview(cln, postdata);
 
                 })
                 .error(function() {
                     cln.innerHTML = "<div class=\"post\">"
                         + gettext('Post not found') + "</div>";
                 });
         }
 
         $del(doc.getElementById(cln.id));
 
         //add preview
         $(cln).fadeIn(200);
         $('body').append(cln);
     }
 }
 
 function delPostPreview(e) {
     var el = $x('ancestor-or-self::*[starts-with(@id,"pstprev")]', e.relatedTarget);
     if(!el) {
         $each($X('.//div[starts-with(@id,"pstprev")]'), function(clone) {
             $del(clone)
         });
     } else {
         while(el.nextSibling) $del(el.nextSibling);
     }
 
     $('.highlight').removeClass('highlight');
 }
 
 function addPreview() {
     $('.post').find('a').each(function() {
         showPostPreview($(this));
     });
 }

boards/static/js/thread_update.js

@@ -1,335 +1,333 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013-2014  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 var wsUser = '';
 
 var unreadPosts = 0;
 var documentOriginalTitle = '';
 
 // Thread ID does not change, can be stored one time
 var threadId = $('div.thread').children('.post').first().attr('id');
 
 /**
  * Connect to websocket server and subscribe to thread updates. On any update we
  * request a thread diff.
  *
  * @returns {boolean} true if connected, false otherwise
  */
 function connectWebsocket() {
     var metapanel = $('.metapanel')[0];
 
     var wsHost = metapanel.getAttribute('data-ws-host');
     var wsPort = metapanel.getAttribute('data-ws-port');
 
     if (wsHost.length > 0 && wsPort.length > 0)
     var centrifuge = new Centrifuge({
         "url": 'ws://' + wsHost + ':' + wsPort + "/connection/websocket",
         "project": metapanel.getAttribute('data-ws-project'),
         "user": wsUser,
         "timestamp": metapanel.getAttribute('data-last-update'),
         "token": metapanel.getAttribute('data-ws-token'),
         "debug": false
     });
 
     centrifuge.on('error', function(error_message) {
         console.log("Error connecting to websocket server.");
         return false;
     });
 
     centrifuge.on('connect', function() {
         var channelName = 'thread:' + threadId;
         centrifuge.subscribe(channelName, function(message) {
             getThreadDiff();
         });
 
         // For the case we closed the browser and missed some updates
         getThreadDiff();
         $('#autoupdate').hide();
     });
 
     centrifuge.connect();
 
     return true;
 }
 
 /**
  * Get diff of the posts from the current thread timestamp.
  * This is required if the browser was closed and some post updates were
  * missed.
  */
 function getThreadDiff() {
     var lastUpdateTime = $('.metapanel').attr('data-last-update');
 
     var diffUrl = '/api/diff_thread/' + threadId + '/' + lastUpdateTime + '/';
 
     $.getJSON(diffUrl)
         .success(function(data) {
             var addedPosts = data.added;
 
             for (var i = 0; i < addedPosts.length; i++) {
                 var postText = addedPosts[i];
                 var post = $(postText);
 
                 updatePost(post)
             }
 
             var updatedPosts = data.updated;
 
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
                 var post = $(postText);
 
                 updatePost(post)
             }
 
             // TODO Process removed posts if any
             $('.metapanel').attr('data-last-update', data.last_update);
         })
 }
 
 /**
  * Add or update the post on html page.
  */
 function updatePost(postHtml) {
     // This needs to be set on start because the page is scrolled after posts
     // are added or updated
     var bottom = isPageBottom();
 
     var post = $(postHtml);
 
     var threadBlock = $('div.thread');
 
     var lastUpdate = '';
 
     var postId = post.attr('id');
 
     // If the post already exists, replace it. Otherwise add as a new one.
     var existingPosts = threadBlock.children('.post[id=' + postId + ']');
 
     if (existingPosts.size() > 0) {
         existingPosts.replaceWith(post);
     } else {
         var threadPosts = threadBlock.children('.post');
         var lastPost = threadPosts.last();
 
         post.appendTo(lastPost.parent());
 
         updateBumplimitProgress(1);
         showNewPostsTitle(1);
 
         lastUpdate = post.children('.post-info').first()
             .children('.pub_time').first().html();
 
         if (bottom) {
             scrollToBottom();
         }
     }
 
     processNewPost(post);
     updateMetadataPanel(lastUpdate)
 }
 
 /**
  * Initiate a blinking animation on a node to show it was updated.
  */
 function blink(node) {
     var blinkCount = 2;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeTo('fast', 0.5).fadeTo('fast', 1.0);
     }
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height());
 
     return scroll == 1
 }
 
 function initAutoupdate() {
     return connectWebsocket();
 }
 
 function getReplyCount() {
     return $('.thread').children('.post').length
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
 
 /**
  * Update post count, images count and last update time in the metadata
  * panel.
  */
 function updateMetadataPanel(lastUpdate) {
     var replyCountField = $('#reply-count');
     var imageCountField = $('#image-count');
 
     replyCountField.text(getReplyCount());
     imageCountField.text(getImageCount());
 
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
         lastUpdateField.html(lastUpdate);
-        translate_time(lastUpdateField);
         blink(lastUpdateField);
     }
 
     blink(replyCountField);
     blink(imageCountField);
 }
 
 /**
  * Update bumplimit progress bar
  */
 function updateBumplimitProgress(postDelta) {
     var progressBar = $('#bumplimit_progress');
     if (progressBar) {
         var postsToLimitElement = $('#left_to_limit');
 
         var oldPostsToLimit = parseInt(postsToLimitElement.text());
         var postCount = getReplyCount();
         var bumplimit = postCount - postDelta + oldPostsToLimit;
 
         var newPostsToLimit = bumplimit - postCount;
         if (newPostsToLimit <= 0) {
             $('.bar-bg').remove();
         } else {
             postsToLimitElement.text(newPostsToLimit);
             progressBar.width((100 - postCount / bumplimit * 100.0) + '%');
         }
     }
 }
 
 /**
  * Show 'new posts' text in the title if the document is not visible to a user
  */
 function showNewPostsTitle(newPostCount) {
     if (document.hidden) {
         if (documentOriginalTitle === '') {
             documentOriginalTitle = document.title;
         }
         unreadPosts = unreadPosts + newPostCount;
         document.title = '[' + unreadPosts + '] ' + documentOriginalTitle;
 
         document.addEventListener('visibilitychange', function() {
             if (documentOriginalTitle !== '') {
                 document.title = documentOriginalTitle;
                 documentOriginalTitle = '';
                 unreadPosts = 0;
             }
 
             document.removeEventListener('visibilitychange', null);
         });
     }
 }
 
 /**
  * Clear all entered values in the form fields
  */
 function resetForm(form) {
     form.find('input:text, input:password, input:file, select, textarea').val('');
     form.find('input:radio, input:checkbox')
              .removeAttr('checked').removeAttr('selected');
     $('.file_wrap').find('.file-thumb').remove();
 }
 
 /**
  * When the form is posted, this method will be run as a callback
  */
 function updateOnPost(response, statusText, xhr, form) {
     var json = $.parseJSON(response);
     var status = json.status;
 
     showAsErrors(form, '');
 
     if (status === 'ok') {
         resetFormPosition();
         resetForm(form);
         getThreadDiff();
         scrollToBottom();
     } else {
         var errors = json.errors;
         for (var i = 0; i < errors.length; i++) {
             var fieldErrors = errors[i];
 
             var error = fieldErrors.errors;
 
             showAsErrors(form, error);
         }
     }
 }
 
 /**
  * Show text in the errors row of the form.
  * @param form
  * @param text
  */
 function showAsErrors(form, text) {
     form.children('.form-errors').remove();
 
     if (text.length > 0) {
         var errorList = $('<div class="form-errors">' + text + '<div>');
         errorList.appendTo(form);
     }
 }
 
 /**
  * Run js methods that are usually run on the document, on the new post
  */
 function processNewPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
-    translate_time(post);
     blink(post);
 }
 
 $(document).ready(function(){
     if (initAutoupdate()) {
         // Post form data over AJAX
         var threadId = $('div.thread').children('.post').first().attr('id');
 
         var form = $('#form');
 
         if (form.length > 0) {
             var options = {
                 beforeSubmit: function(arr, $form, options) {
                     showAsErrors($('form'), gettext('Sending message...'));
                 },
                 success: updateOnPost,
                 url: '/api/add_post/' + threadId + '/'
             };
 
             form.ajaxForm(options);
 
             resetForm(form);
         }
     }
 
     $('#autoupdate').click(getThreadDiff);
 });

boards/templates/boards/posting_general.html

@@ -1,190 +1,192 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
 
     {% if tag %}
         <title>{{ tag.name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% if current_page.has_previous %}
         <link rel="prev" href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
     {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
             <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
                 {% if is_favorite %}
                     <button name="method" value="unsubscribe" class="fav">★</button>
                 {% else %}
                     <button name="method" value="subscribe" class="not_fav">★</button>
                 {% endif %}
             </form>
             <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
                 {% if is_hidden %}
                     <button name="method" value="unhide" class="fav">H</button>
                 {% else %}
                     <button name="method" value="hide" class="not_fav">H</button>
                 {% endif %}
             </form>
             {% autoescape off %}
                 {{ tag.get_view }}
             {% endautoescape %}
             {% if moderator %}
             <span class="moderator_info">[<a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a>]</span>
             {% endif %}
         </h2>
         <p>{% blocktrans with thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ thread_count }} threads and {{ post_count }} posts.{% endblocktrans %}</p>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% 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 %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
                             {% with skipped_replies_count=thread.get_skipped_replies_count %}
                                 {% if skipped_replies_count %}
                                     <div class="skipped_replies">
                                         <a href="{% url 'thread' thread.get_opening_post_id %}">
                                             {% blocktrans with count=skipped_replies_count %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                         </a>
                                     </div>
                                 {% endif %}
                             {% endwith %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
                                     {% post_view post is_opening=False moderator=moderator truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}
                     {% endwith %}
                 {% endif %}
             </div>
             {% endcache %}
         {% endfor %}
 
         {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <div class="swappable-form-full">
             <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
                 (ctrl-enter)
             </form>
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     <script src="{% static 'js/form.js' %}"></script>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=paginator.page_range|first %}
             {% else %}
                 {% url "index" page=paginator.page_range|first %}
             {% endif %}
         ">&lt;&lt;</a>
         [
         {% for page in paginator.center_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=paginator.page_range|last %}
             {% else %}
                 {% url "index" page=paginator.page_range|last %}
             {% endif %}
         ">&gt;&gt;</a>
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/settings.html

@@ -1,43 +1,44 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load humanize %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
     <title>{% trans 'Settings' %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post">
         <p>
             {% if moderator %}
                 {% trans 'You are moderator.' %}
             {% endif %}
         </p>
         {% if hidden_tags %}
             <p>{% trans 'Hidden tags:' %}
                 {% for tag in hidden_tags %}
                     {% autoescape off %}
                         {{ tag.get_view }}
                     {% endautoescape %}
                 {% endfor %}
             </p>
         {% else %}
             <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
     </div>
 
     <div class="post-form-w">
     <div class="post-form">
         <form method="post">{% csrf_token %}
             {{ form.as_div }}
             <div class="form-submit">
                 <input type="submit" value="{% trans "Save" %}" />
             </div>
         </form>
     </div>
     </div>
 
 {% endblock %}

boards/templates/boards/thread.html

@@ -1,35 +1,37 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
+{% load tz %}
 
 {% block head %}
     <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
 
     <span class="metapanel"
           data-last-update="{{ last_update }}"
           data-ws-token="{{ ws_token }}"
           data-ws-project="{{ ws_project }}"
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
 
         {% 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>
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/templates/boards/thread_gallery.html

@@ -1,57 +1,56 b''
 {% extends "boards/thread.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
+{% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
     <title>{{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% 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>
     </div>
 
     <div id="posts-table">
         {% if posts %}
             {% for post in posts %}
                 <div class="gallery_image">
                 {% with post.get_first_image as image %}
                     <div>
                         <a
                                 class="thumb"
                                 href="{{ image.image.url }}"><img
                                 src="{{ image.image.url_200x150 }}"
                                 alt="{{ post.id }}"
                                 width="{{ image.pre_width }}"
                                 height="{{ image.pre_height }}"
                                 data-width="{{ image.width }}"
                                 data-height="{{ image.height }}"/>
                         </a>
                     </div>
                     <div class="gallery_image_metadata">
                         {{ image.width }}x{{ image.height }}
                         {% image_actions image.image.url request.get_host %}
                         <br />
                         <a href="{{ post.get_url }}">>>{{ post.id }}</a>
                     </div>
                 {% endwith %}
                 </div>
             {% endfor %}
         {% else %}
             {% trans 'No images.' %}
         {% endif %}
     </div>
     {% endcache %}
-
-    {% endspaceless %}
 {% endblock %}

boards/templates/boards/thread_normal.html

@@ -1,67 +1,69 b''
 {% extends "boards/thread.html" %}
 
 {% load i18n %}
 {% 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>,
         <a href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     {% if bumpable and thread.has_post_limit %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
             </div>
             <div class="bar-text">
                 <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
             </div>
         </div>
     {% endif %}
 
     <div class="thread">
         {% for post in thread.get_replies %}
             {% post_view post moderator=moderator reply_link=True %}
         {% endfor %}
     </div>
 
     {% if not thread.archived %}
         <div class="post-form-w">
             <script src="{% static 'js/panel.js' %}"></script>
             <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
             <div class="post-form" id="compact-form">
                 <div class="swappable-form-full">
                     <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
                         <div class="compact-form-text"></div>
                         {{ form.as_div }}
                         <div class="form-submit">
                             <input type="submit" value="{% trans "Post" %}"/>
                         </div>
                     </form>
                 </div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
                 <div><a href="#" onClick="resetFormPosition(); return false;">{% trans 'Close form' %}</a></div>
             </div>
         </div>
 
         <script src="{% static 'js/jquery.form.min.js' %}"></script>
     {% endif %}
 
     <script src="{% static 'js/form.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/3party/centrifuge.js' %}"></script>
 
     {% endcache %}
 {% endblock %}
 
 {% block thread_meta_panel %}
     <button id="autoupdate">{% trans 'Update' %}</button>
 {% endblock %}

boards/views/settings.py

@@ -1,61 +1,69 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
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.forms import SettingsForm, PlainErrorList
 
 FORM_THEME = 'theme'
 FORM_USERNAME = 'username'
+FORM_TIMEZONE = 'timezone'
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
 
 TEMPLATE = 'boards/settings.html'
 
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
         params = dict()
         settings_manager = get_settings_manager(request)
 
         selected_theme = settings_manager.get_theme()
 
         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
         params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
         return render(request, TEMPLATE, params)
 
     def post(self, request):
         settings_manager = get_settings_manager(request)
 
         with transaction.atomic():
             form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data[FORM_THEME]
                 username = form.cleaned_data[FORM_USERNAME].lower()
 
                 settings_manager.set_theme(selected_theme)
 
                 old_username = settings_manager.get_setting(SETTING_USERNAME)
                 if username != old_username:
                     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()
 
                 params[CONTEXT_FORM] = form
                 params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
                 return render(request, TEMPLATE, params)
 

neboard/settings.py

@@ -1,233 +1,234 b''
 # Django settings for neboard project.
 import os
 from boards.mdx_neboard import bbcode_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
 	'CONN_MAX_AGE': None,
     }
 }
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
     'compressor.finders.CompressorFinder',
 )
 
 if DEBUG:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.StaticFilesStorage'
 else:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
     'boards.context_processors.user_and_ui_processor',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'boards.middlewares.BanMiddleware',
+    'boards.middlewares.TimezoneMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     # 'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
     'django_cleanup',
 
     'debug_toolbar',
 
     # Search
     'haystack',
 
     'boards',
 )
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
         'verbose': {
             'format': '%(levelname)s %(asctime)s %(name)s %(process)d %(thread)d %(message)s'
         },
         'simple': {
             'format': '%(levelname)s %(asctime)s [%(name)s] %(message)s'
         },
     },
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
             'formatter': 'simple'
         },
     },
     'loggers': {
         'boards': {
             'handlers': ['console'],
             'level': 'DEBUG',
         }
     },
 }
 
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
         'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     },
 }
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('md_centered', 'Mystic Dark (centered)'),
     ('sw', 'Snow White'),
     ('pg', 'Photon Gray'),
 ]
 
 POSTING_DELAY = 20  # seconds
 
 # Websocket settins
 CENTRIFUGE_HOST = 'localhost'
 CENTRIFUGE_PORT = '9090'
 
 CENTRIFUGE_ADDRESS = 'http://{}:{}'.format(CENTRIFUGE_HOST, CENTRIFUGE_PORT)
 CENTRIFUGE_PROJECT_ID = '<project id here>'
 CENTRIFUGE_PROJECT_SECRET = '<project secret here>'
 CENTRIFUGE_TIMEOUT = 5
 
 # Debug mode middlewares
 if DEBUG:
     MIDDLEWARE_CLASSES += (
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
 
     def custom_show_toolbar(request):
         return True
 
     DEBUG_TOOLBAR_CONFIG = {
         'ENABLE_STACKTRACES': True,
         'SHOW_TOOLBAR_CALLBACK': 'neboard.settings.custom_show_toolbar',
     }
 
     # FIXME Uncommenting this fails somehow. Need to investigate this
     #DEBUG_TOOLBAR_PANELS += (
     #    'debug_toolbar.panels.profiling.ProfilingDebugPanel',
     #)