From c5499df0b412a541943eca996720f4f228015f7e Mon Sep 17 00:00:00 2001 From: Martin Gross Date: Tue, 5 Mar 2019 12:09:31 +0100 Subject: [PATCH] Improve display of date/time-format in PDF-ticket preview vs. actual rendering (Z#2344558) --- src/pretix/base/pdf.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/pretix/base/pdf.py b/src/pretix/base/pdf.py index 4a48f7340..6f99fa6b7 100644 --- a/src/pretix/base/pdf.py +++ b/src/pretix/base/pdf.py @@ -110,7 +110,18 @@ DEFAULT_VARIABLES = OrderedDict(( ("event_begin", { "label": _("Event begin date and time"), "editor_sample": _("2017-05-31 20:00"), - "evaluate": lambda op, order, ev: ev.get_date_from_display(show_times=True) + "evaluate": lambda op, order, ev: date_format( + ev.date_from.astimezone(timezone(ev.settings.timezone)), + "SHORT_DATETIME_FORMAT" + ) if ev.date_from else "" + }), + ("event_begin_date", { + "label": _("Event begin date"), + "editor_sample": _("2017-05-31"), + "evaluate": lambda op, order, ev: date_format( + ev.date_from.astimezone(timezone(ev.settings.timezone)), + "SHORT_DATE_FORMAT" + ) if ev.date_from else "" }), ("event_begin_time", { "label": _("Event begin time"),