{{ opening_post.get_title|striptags|truncatewords:10 }} @@ -13,6 +14,7 @@ {% 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 @@ {% 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> diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html --- a/boards/templates/boards/thread_gallery.html +++ b/boards/templates/boards/thread_gallery.html @@ -4,6 +4,7 @@ {% load cache %} {% load static from staticfiles %} {% load board %} +{% load tz %} {% block head %} <meta name="robots" content="noindex"> @@ -12,10 +13,10 @@ {% 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 @@ {% endif %} </div> {% endcache %} - - {% endspaceless %} {% endblock %} diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html --- a/boards/templates/boards/thread_normal.html +++ b/boards/templates/boards/thread_normal.html @@ -4,11 +4,13 @@ {% 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>, diff --git a/boards/views/settings.py b/boards/views/settings.py --- a/boards/views/settings.py +++ b/boards/views/settings.py @@ -1,5 +1,8 @@ +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 @@ from boards.forms import SettingsForm, P FORM_THEME = 'theme' FORM_USERNAME = 'username' +FORM_TIMEZONE = 'timezone' CONTEXT_HIDDEN_TAGS = 'hidden_tags' @@ -25,7 +29,9 @@ 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 @@ 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() diff --git a/neboard/settings.py b/neboard/settings.py --- a/neboard/settings.py +++ b/neboard/settings.py @@ -116,6 +116,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'boards.middlewares.BanMiddleware', + 'boards.middlewares.TimezoneMiddleware', ) ROOT

@@ -81,7 +83,7 @@ {% 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 %}

{% post_view thread.get_opening_post moderator is_opening=True thread=thread truncated=True need_open_link=True %} {% if not thread.archived %} diff --git a/boards/templates/boards/settings.html b/boards/templates/boards/settings.html --- a/boards/templates/boards/settings.html +++ b/boards/templates/boards/settings.html @@ -2,6 +2,7 @@ {% load i18n %} {% load humanize %} +{% load tz %} {% block head %} diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -4,6 +4,7 @@ {% load cache %} {% load static from staticfiles %} {% load board %} +{% load tz %} {% block head %} {{ opening_post.get_title|striptags|truncatewords:10 }} @@ -13,6 +14,7 @@ {% 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 @@ {% 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> diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html --- a/boards/templates/boards/thread_gallery.html +++ b/boards/templates/boards/thread_gallery.html @@ -4,6 +4,7 @@ {% load cache %} {% load static from staticfiles %} {% load board %} +{% load tz %} {% block head %} <meta name="robots" content="noindex"> @@ -12,10 +13,10 @@ {% 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 @@ {% endif %} </div> {% endcache %} - - {% endspaceless %} {% endblock %} diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html --- a/boards/templates/boards/thread_normal.html +++ b/boards/templates/boards/thread_normal.html @@ -4,11 +4,13 @@ {% 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>, diff --git a/boards/views/settings.py b/boards/views/settings.py --- a/boards/views/settings.py +++ b/boards/views/settings.py @@ -1,5 +1,8 @@ +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 @@ from boards.forms import SettingsForm, P FORM_THEME = 'theme' FORM_USERNAME = 'username' +FORM_TIMEZONE = 'timezone' CONTEXT_HIDDEN_TAGS = 'hidden_tags' @@ -25,7 +29,9 @@ 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 @@ 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() diff --git a/neboard/settings.py b/neboard/settings.py --- a/neboard/settings.py +++ b/neboard/settings.py @@ -116,6 +116,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'boards.middlewares.BanMiddleware', + 'boards.middlewares.TimezoneMiddleware', ) ROOT_URLCONF = 'neboard.urls'