CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-12 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show weekday in subevent dates

Browse Source
This commit is contained in:
Mira Weller
2024-08-27 22:01:04 +02:00
parent 43e24ff88c
commit 6245d1f286
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/base/models/event.py
+1 -7
View File
@@ -180,13 +180,7 @@ class EventMixin:
"""
tz = tz or self.timezone
if (not self.settings.show_date_to and not force_show_end) or not self.date_to:
if as_html:
return format_html(
"<time datetime=\"{}\">{}</time>",
_date(self.date_from.astimezone(tz), "Y-m-d"),
_date(self.date_from.astimezone(tz), "DATE_FORMAT"),
)
return _date(self.date_from.astimezone(tz), "DATE_FORMAT")
return daterange(self.date_from.astimezone(tz), self.date_from.astimezone(tz), as_html)
return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz), as_html)
def get_date_range_display_as_html(self, tz=None, force_show_end=False) -> str:
src/pretix/helpers/daterange.py
+2 -2
View File
@@ -53,14 +53,14 @@ def daterange(df, dt, as_html=False):
if lng.startswith("de"):
if df.year == dt.year and df.month == dt.month and df.day == dt.day:
return format_html(base_format, _date(df, "j. F Y"))
return format_html(base_format, _date(df, "D, j. F Y"))
elif df.year == dt.year and df.month == dt.month:
return format_html(base_format, _date(df, "j."), "–", _date(dt, "j. F Y"))
elif df.year == dt.year:
return format_html(base_format, _date(df, "j. F"), " – ", _date(dt, "j. F Y"))
elif lng.startswith("en"):
if df.year == dt.year and df.month == dt.month and df.day == dt.day:
return format_html(base_format, _date(df, "N jS, Y"))
return format_html(base_format, _date(df, "D, N jS, Y"))
elif df.year == dt.year and df.month == dt.month:
return format_html(base_format, _date(df, "N jS"), " – ", _date(dt, "jS, Y"))
elif df.year == dt.year: