CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Add timezone support to get_date_from_display

Browse Source
This commit is contained in:
Raphael Michel
2016-11-09 12:12:20 +01:00
parent 38c4bd454e
commit 0fc102615f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pretix/base/models/event.py
View File

@@ -1,5 +1,6 @@
import uuid import uuid
import pytz
from django.conf import settings from django.conf import settings
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.mail import get_connection from django.core.mail import get_connection
@@ -124,26 +125,28 @@ class Event(LoggedModel):
return [] return []
return self.plugins.split(",") return self.plugins.split(",")
def get_date_from_display(self) -> str: def get_date_from_display(self, tz=None) -> str:
""" """
Returns a formatted string containing the start date of the event with respect Returns a formatted string containing the start date of the event with respect
to the current locale and to the ``show_times`` setting. to the current locale and to the ``show_times`` setting.
""" """
tz = tz or pytz.timezone(self.settings.timezone)
return _date( return _date(
self.date_from, self.date_from.astimezone(tz),
"DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT" "DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT"
) )
def get_date_to_display(self) -> str: def get_date_to_display(self, tz=None) -> str:
""" """
Returns a formatted string containing the start date of the event with respect Returns a formatted string containing the start date of the event with respect
to the current locale and to the ``show_times`` setting. Returns an empty string to the current locale and to the ``show_times`` setting. Returns an empty string
if ``show_date_to`` is ``False``. if ``show_date_to`` is ``False``.
""" """
tz = tz or pytz.timezone(self.settings.timezone)
if not self.settings.show_date_to: if not self.settings.show_date_to:
return "" return ""
return _date( return _date(
self.date_to, self.date_to.astimezone(tz),
"DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT" "DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT"
) )