From 7b7d45ce2e9be057899754ccb69e1008166ece8c Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 14 Nov 2018 15:43:15 +0100
Subject: [PATCH] Fix Dutch date format

---
 src/pretix/control/forms/subevents.py      | 56 +++++++++-------------
 src/pretix/locale/nl/LC_MESSAGES/django.po | 48 -------------------
 2 files changed, 23 insertions(+), 81 deletions(-)

diff --git a/src/pretix/control/forms/subevents.py b/src/pretix/control/forms/subevents.py
index 178d4f02c..9b562ffbb 100644
--- a/src/pretix/control/forms/subevents.py
+++ b/src/pretix/control/forms/subevents.py
@@ -2,6 +2,7 @@ from datetime import timedelta
 
 from django import forms
 from django.forms import formset_factory
+from django.utils.dates import MONTHS, WEEKDAYS
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import pgettext_lazy, ugettext_lazy as _
@@ -276,13 +277,13 @@ class RRuleForm(forms.Form):
     )
     yearly_byweekday = forms.ChoiceField(
         choices=[
-            ('MO', _('Monday')),
-            ('TU', _('Tuesday')),
-            ('WE', _('Wednesday')),
-            ('TH', _('Thursday')),
-            ('FR', _('Friday')),
-            ('SA', _('Saturday')),
-            ('SU', _('Sunday')),
+            ('MO', WEEKDAYS[0]),
+            ('TU', WEEKDAYS[1]),
+            ('WE', WEEKDAYS[2]),
+            ('TH', WEEKDAYS[3]),
+            ('FR', WEEKDAYS[4]),
+            ('SA', WEEKDAYS[5]),
+            ('SU', WEEKDAYS[6]),
             ('MO,TU,WE,TH,FR,SA,SU', _('Day')),
             ('MO,TU,WE,TH,FR', _('Weekday')),
             ('SA,SU', _('Weekend day')),
@@ -291,18 +292,7 @@ class RRuleForm(forms.Form):
     )
     yearly_bymonth = forms.ChoiceField(
         choices=[
-            ('1', _('January')),
-            ('2', _('February')),
-            ('3', _('March')),
-            ('4', _('April')),
-            ('5', _('May')),
-            ('6', _('June')),
-            ('7', _('July')),
-            ('8', _('August')),
-            ('9', _('September')),
-            ('10', _('October')),
-            ('11', _('November')),
-            ('12', _('December')),
+            (str(i), MONTHS[i]) for i in range(1, 13)
         ],
         required=False
     )
@@ -326,13 +316,13 @@ class RRuleForm(forms.Form):
     )
     monthly_byweekday = forms.ChoiceField(
         choices=[
-            ('MO', _('Monday')),
-            ('TU', _('Tuesday')),
-            ('WE', _('Wednesday')),
-            ('TH', _('Thursday')),
-            ('FR', _('Friday')),
-            ('SA', _('Saturday')),
-            ('SU', _('Sunday')),
+            ('MO', WEEKDAYS[0]),
+            ('TU', WEEKDAYS[1]),
+            ('WE', WEEKDAYS[2]),
+            ('TH', WEEKDAYS[3]),
+            ('FR', WEEKDAYS[4]),
+            ('SA', WEEKDAYS[5]),
+            ('SU', WEEKDAYS[6]),
             ('MO,TU,WE,TH,FR,SA,SU', _('Day')),
             ('MO,TU,WE,TH,FR', _('Weekday')),
             ('SA,SU', _('Weekend day')),
@@ -342,13 +332,13 @@ class RRuleForm(forms.Form):
 
     weekly_byweekday = forms.MultipleChoiceField(
         choices=[
-            ('MO', _('Monday')),
-            ('TU', _('Tuesday')),
-            ('WE', _('Wednesday')),
-            ('TH', _('Thursday')),
-            ('FR', _('Friday')),
-            ('SA', _('Saturday')),
-            ('SU', _('Sunday')),
+            ('MO', WEEKDAYS[0]),
+            ('TU', WEEKDAYS[1]),
+            ('WE', WEEKDAYS[2]),
+            ('TH', WEEKDAYS[3]),
+            ('FR', WEEKDAYS[4]),
+            ('SA', WEEKDAYS[5]),
+            ('SU', WEEKDAYS[6]),
         ],
         required=False,
         widget=forms.CheckboxSelectMultiple
diff --git a/src/pretix/locale/nl/LC_MESSAGES/django.po b/src/pretix/locale/nl/LC_MESSAGES/django.po
index e98258efa..d26a17d32 100644
--- a/src/pretix/locale/nl/LC_MESSAGES/django.po
+++ b/src/pretix/locale/nl/LC_MESSAGES/django.po
@@ -6342,54 +6342,6 @@ msgstr "Dag"
 msgid "Weekend day"
 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
 msgid "Your changes could not be saved. See below for details."
 msgstr "Uw wijzigingen konden niet worden opgeslagen. Zie onder voor details."