X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..HEAD:/src/pdcounter/templatetags/time_tags.py diff --git a/src/pdcounter/templatetags/time_tags.py b/src/pdcounter/templatetags/time_tags.py old mode 100755 new mode 100644 index 7ea5c6055..6ec0b80a0 --- a/src/pdcounter/templatetags/time_tags.py +++ b/src/pdcounter/templatetags/time_tags.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # import datetime -import pytz from django.conf import settings from django import template from django.utils import timezone @@ -11,6 +9,7 @@ from django.utils import timezone register = template.Library() + @register.filter def date_to_utc(date, day_end=False): """ Converts a datetime.date to UTC datetime. @@ -20,10 +19,9 @@ def date_to_utc(date, day_end=False): """ if day_end: date += datetime.timedelta(1) - localtime = datetime.datetime.combine(date, datetime.time(0, 0)) - return timezone.utc.normalize( - pytz.timezone(settings.TIME_ZONE).localize(localtime) - ) + + localtime = datetime.datetime.combine(date, datetime.time(0, 0), timezone.get_current_timezone()) + return timezone.localtime(localtime, timezone.utc) @register.filter