From 0bf7bba6bac4cc48ae7a352fa180119ef20e1973 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Tue, 21 Dec 2021 10:10:13 +0100 Subject: [PATCH] Fix: WEEK_FORMAT fallback in calender week-views (#2391) * switch to context-week_format for fallback-handling * set week_format fallback to en instead of de * add french WEEK_FORMAT and WEEK_DAY_FORMAT --- src/pretix/helpers/formats/fr/__init__.py | 21 ++++++++++++++++ src/pretix/helpers/formats/fr/formats.py | 25 +++++++++++++++++++ .../fragment_subevent_calendar_week.html | 2 +- .../organizers/calendar_week.html | 2 +- src/pretix/presale/views/organizer.py | 2 +- 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/pretix/helpers/formats/fr/__init__.py create mode 100644 src/pretix/helpers/formats/fr/formats.py diff --git a/src/pretix/helpers/formats/fr/__init__.py b/src/pretix/helpers/formats/fr/__init__.py new file mode 100644 index 000000000..9fd5bdc50 --- /dev/null +++ b/src/pretix/helpers/formats/fr/__init__.py @@ -0,0 +1,21 @@ +# +# This file is part of pretix (Community Edition). +# +# Copyright (C) 2014-2020 Raphael Michel and contributors +# Copyright (C) 2020-2021 rami.io GmbH and contributors +# +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General +# Public License as published by the Free Software Foundation in version 3 of the License. +# +# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are +# applicable granting you additional permissions and placing additional restrictions on your usage of this software. +# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive +# this file, see . +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +# details. +# +# You should have received a copy of the GNU Affero General Public License along with this program. If not, see +# . +# diff --git a/src/pretix/helpers/formats/fr/formats.py b/src/pretix/helpers/formats/fr/formats.py new file mode 100644 index 000000000..5792f151c --- /dev/null +++ b/src/pretix/helpers/formats/fr/formats.py @@ -0,0 +1,25 @@ +# +# This file is part of pretix (Community Edition). +# +# Copyright (C) 2014-2020 Raphael Michel and contributors +# Copyright (C) 2020-2021 rami.io GmbH and contributors +# +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General +# Public License as published by the Free Software Foundation in version 3 of the License. +# +# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are +# applicable granting you additional permissions and placing additional restrictions on your usage of this software. +# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive +# this file, see . +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +# details. +# +# You should have received a copy of the GNU Affero General Public License along with this program. If not, see +# . +# + +# Date according to https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +WEEK_FORMAT = '\\S W/o' +WEEK_DAY_FORMAT = 'D, j.n.' diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html index 9590a2c0a..5ea805a6b 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html @@ -23,7 +23,7 @@ {% for w in weeks_per_year %} {% endfor %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html b/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html index 3613a1dd6..fa116ebd4 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html @@ -29,7 +29,7 @@ {% for w in weeks_per_year %} {% endfor %} diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py index dc971c62c..5a4d47f55 100644 --- a/src/pretix/presale/views/organizer.py +++ b/src/pretix/presale/views/organizer.py @@ -63,7 +63,7 @@ from pretix.base.models import ( from pretix.base.services.quotas import QuotaAvailability from pretix.helpers.compat import date_fromisocalendar from pretix.helpers.daterange import daterange -from pretix.helpers.formats.de.formats import WEEK_FORMAT +from pretix.helpers.formats.en.formats import WEEK_FORMAT from pretix.multidomain.urlreverse import eventreverse from pretix.presale.ical import get_ical from pretix.presale.views import OrganizerViewMixin