Fix Dutch date format

This commit is contained in:
Raphael Michel
2018-11-14 15:43:15 +01:00
parent be3ca7c561
commit 7b7d45ce2e
2 changed files with 23 additions and 81 deletions

View File

@@ -2,6 +2,7 @@ from datetime import timedelta
from django import forms from django import forms
from django.forms import formset_factory from django.forms import formset_factory
from django.utils.dates import MONTHS, WEEKDAYS
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import pgettext_lazy, ugettext_lazy as _ from django.utils.translation import pgettext_lazy, ugettext_lazy as _
@@ -276,13 +277,13 @@ class RRuleForm(forms.Form):
) )
yearly_byweekday = forms.ChoiceField( yearly_byweekday = forms.ChoiceField(
choices=[ choices=[
('MO', _('Monday')), ('MO', WEEKDAYS[0]),
('TU', _('Tuesday')), ('TU', WEEKDAYS[1]),
('WE', _('Wednesday')), ('WE', WEEKDAYS[2]),
('TH', _('Thursday')), ('TH', WEEKDAYS[3]),
('FR', _('Friday')), ('FR', WEEKDAYS[4]),
('SA', _('Saturday')), ('SA', WEEKDAYS[5]),
('SU', _('Sunday')), ('SU', WEEKDAYS[6]),
('MO,TU,WE,TH,FR,SA,SU', _('Day')), ('MO,TU,WE,TH,FR,SA,SU', _('Day')),
('MO,TU,WE,TH,FR', _('Weekday')), ('MO,TU,WE,TH,FR', _('Weekday')),
('SA,SU', _('Weekend day')), ('SA,SU', _('Weekend day')),
@@ -291,18 +292,7 @@ class RRuleForm(forms.Form):
) )
yearly_bymonth = forms.ChoiceField( yearly_bymonth = forms.ChoiceField(
choices=[ choices=[
('1', _('January')), (str(i), MONTHS[i]) for i in range(1, 13)
('2', _('February')),
('3', _('March')),
('4', _('April')),
('5', _('May')),
('6', _('June')),
('7', _('July')),
('8', _('August')),
('9', _('September')),
('10', _('October')),
('11', _('November')),
('12', _('December')),
], ],
required=False required=False
) )
@@ -326,13 +316,13 @@ class RRuleForm(forms.Form):
) )
monthly_byweekday = forms.ChoiceField( monthly_byweekday = forms.ChoiceField(
choices=[ choices=[
('MO', _('Monday')), ('MO', WEEKDAYS[0]),
('TU', _('Tuesday')), ('TU', WEEKDAYS[1]),
('WE', _('Wednesday')), ('WE', WEEKDAYS[2]),
('TH', _('Thursday')), ('TH', WEEKDAYS[3]),
('FR', _('Friday')), ('FR', WEEKDAYS[4]),
('SA', _('Saturday')), ('SA', WEEKDAYS[5]),
('SU', _('Sunday')), ('SU', WEEKDAYS[6]),
('MO,TU,WE,TH,FR,SA,SU', _('Day')), ('MO,TU,WE,TH,FR,SA,SU', _('Day')),
('MO,TU,WE,TH,FR', _('Weekday')), ('MO,TU,WE,TH,FR', _('Weekday')),
('SA,SU', _('Weekend day')), ('SA,SU', _('Weekend day')),
@@ -342,13 +332,13 @@ class RRuleForm(forms.Form):
weekly_byweekday = forms.MultipleChoiceField( weekly_byweekday = forms.MultipleChoiceField(
choices=[ choices=[
('MO', _('Monday')), ('MO', WEEKDAYS[0]),
('TU', _('Tuesday')), ('TU', WEEKDAYS[1]),
('WE', _('Wednesday')), ('WE', WEEKDAYS[2]),
('TH', _('Thursday')), ('TH', WEEKDAYS[3]),
('FR', _('Friday')), ('FR', WEEKDAYS[4]),
('SA', _('Saturday')), ('SA', WEEKDAYS[5]),
('SU', _('Sunday')), ('SU', WEEKDAYS[6]),
], ],
required=False, required=False,
widget=forms.CheckboxSelectMultiple widget=forms.CheckboxSelectMultiple

View File

@@ -6342,54 +6342,6 @@ msgstr "Dag"
msgid "Weekend day" msgid "Weekend day"
msgstr "Weekenddag" msgstr "Weekenddag"
#: pretix/control/forms/subevents.py:294
msgid "January"
msgstr "Januari"
#: pretix/control/forms/subevents.py:295
msgid "February"
msgstr "Februari"
#: pretix/control/forms/subevents.py:296
msgid "March"
msgstr "Maart"
#: pretix/control/forms/subevents.py:297
msgid "April"
msgstr "April"
#: pretix/control/forms/subevents.py:298
msgid "May"
msgstr "Mei"
#: pretix/control/forms/subevents.py:299
msgid "June"
msgstr "Juni"
#: pretix/control/forms/subevents.py:300
msgid "July"
msgstr "Juli"
#: pretix/control/forms/subevents.py:301
msgid "August"
msgstr "Augustus"
#: pretix/control/forms/subevents.py:302
msgid "September"
msgstr "September"
#: pretix/control/forms/subevents.py:303
msgid "October"
msgstr "Oktober"
#: pretix/control/forms/subevents.py:304
msgid "November"
msgstr "November"
#: pretix/control/forms/subevents.py:305
msgid "December"
msgstr "December"
#: pretix/control/forms/users.py:94 pretix/control/views/user.py:115 #: pretix/control/forms/users.py:94 pretix/control/views/user.py:115
msgid "Your changes could not be saved. See below for details." msgid "Your changes could not be saved. See below for details."
msgstr "Uw wijzigingen konden niet worden opgeslagen. Zie onder voor details." msgstr "Uw wijzigingen konden niet worden opgeslagen. Zie onder voor details."