diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html
index bc2ed7ded..4299bddb7 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/index.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html
@@ -1,6 +1,7 @@
{% extends "pretixpresale/organizers/base.html" %}
{% load i18n %}
{% load rich_text %}
+{% load tz %}
{% load eventurl %}
{% load urlreplace %}
{% load thumb %}
@@ -68,12 +69,14 @@
{{ e.daterange|default:e.get_date_range_display }}
{% if e.settings.show_times %}
-
- {{ e.date_from|date:"TIME_FORMAT" }}
- {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %}
- – {{ e.date_to|date:"TIME_FORMAT" }}
- {% endif %}
-
+ {% timezone e.tzname %}
+
+ {{ e.date_from|date:"TIME_FORMAT" }}
+ {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %}
+ – {{ e.date_to|date:"TIME_FORMAT" }}
+ {% endif %}
+
+ {% endtimezone %}
{% endif %}
|
diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py
index 04818985f..2bab1ed08 100644
--- a/src/pretix/presale/views/organizer.py
+++ b/src/pretix/presale/views/organizer.py
@@ -214,11 +214,11 @@ class OrganizerIndex(OrganizerViewMixin, EventListMixin, ListView):
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
for event in ctx['events']:
- tz = pytz.timezone(event.cache.get_or_set('timezone', lambda: event.settings.timezone))
+ event.tzname = pytz.timezone(event.cache.get_or_set('timezone', lambda: event.settings.timezone))
if event.has_subevents:
event.daterange = daterange(
- event.min_from.astimezone(tz),
- (event.max_fromto or event.max_to or event.max_from).astimezone(tz)
+ event.min_from.astimezone(event.tzname),
+ (event.max_fromto or event.max_to or event.max_from).astimezone(event.tzname)
)
return ctx
|