From d9a58cf27f2cb851f015d6537844ee4c501d7067 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Mon, 4 Jul 2022 10:58:28 +0200 Subject: [PATCH] Fix timezone in email placeholder event_admission_time --- src/pretix/base/email.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pretix/base/email.py b/src/pretix/base/email.py index f5e30cad63..fbab7f5ed0 100644 --- a/src/pretix/base/email.py +++ b/src/pretix/base/email.py @@ -475,8 +475,11 @@ def base_placeholders(sender, **kwargs): ), SimpleFunctionalMailTextPlaceholder( 'event_admission_time', ['event_or_subevent'], - lambda event_or_subevent: date_format(event_or_subevent.date_admission, 'TIME_FORMAT') if event_or_subevent.date_admission else '', - lambda event: date_format(event.date_admission, 'TIME_FORMAT') if event.date_admission else '', + lambda event_or_subevent: + date_format(event_or_subevent.date_admission.astimezone(event_or_subevent.timezone), 'TIME_FORMAT') + if event_or_subevent.date_admission + else '', + lambda event: date_format(event.date_admission.astimezone(event.timezone), 'TIME_FORMAT') if event.date_admission else '', ), SimpleFunctionalMailTextPlaceholder( 'subevent', ['waiting_list_entry', 'event'],