CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix: WEEK_FORMAT fallback in calender week-views (#2391)

Browse Source 
* 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
This commit is contained in:
Richard Schreiber
2021-12-21 10:10:13 +01:00
committed by GitHub
parent 7090e0bae2
commit 0bf7bba6ba
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html
View File

@@ -23,7 +23,7 @@
{% for w in weeks_per_year %}
<option value="{{ w.0.isocalendar.0 }}-W{{ w.0.isocalendar.1 }}"
{% if w.0.isocalendar.0 == subevent_list.date.isocalendar.0 and w.0.isocalendar.1 == subevent_list.date.isocalendar.1 %}selected{% endif %}>
{{ w.0|date:"WEEK_FORMAT" }}
{{ w.0|date:subevent_list.week_format }}
({{ w.0|date:"MONTH_DAY_FORMAT" }} – {{ w.1|date:"MONTH_DAY_FORMAT" }})
</option>
{% endfor %}

2
src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html
View File

@@ -29,7 +29,7 @@
{% for w in weeks_per_year %}
<option value="{{ w.0.isocalendar.0 }}-W{{ w.0.isocalendar.1 }}"
{% if w.0.isocalendar.0 == date.isocalendar.0 and w.0.isocalendar.1 == date.isocalendar.1 %}selected{% endif %}>
{{ w.0|date:"WEEK_FORMAT" }}
{{ w.0|date:week_format }}
({{ w.0|date:"MONTH_DAY_FORMAT" }} – {{ w.1|date:"MONTH_DAY_FORMAT" }})
</option>
{% endfor %}

2
src/pretix/presale/views/organizer.py
View File

@@ -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