From c41f64694a728e8010d32bc0936712988851f5a5 Mon Sep 17 00:00:00 2001
From: stormbyte <shocker@stormbyte.nl>
Date: Fri, 3 Feb 2023 14:52:11 +0100
Subject: [PATCH 1/2] Update locales.py

---
 reminder/locales.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/reminder/locales.py b/reminder/locales.py
index 8a106f4..fa83fbf 100644
--- a/reminder/locales.py
+++ b/reminder/locales.py
@@ -139,3 +139,38 @@
                       r"(?:[:.](?P<second>\d{2}))?"
                       r"(?:\s|$)"),
 )
+
+td_sep_nl = r"(?:[\s,]{1,3}(?:en\s)?)?"
+locales["nl_nl"] = Locale(
+    name="Dutch",
+    timedelta=RegexMatcher(rf"(?:in\s)?"                         
+                           rf"(?:(?P<years>{number})\s?jaren?{td_sep_nl})?"
+                           rf"(?:(?P<months>{number})\s?maand(?:en)?{td_sep_nl})?"
+                           rf"(?:(?P<weeks>{number})\s?weken?{td_sep_nl})?"
+                           rf"(?:(?P<days>{number})\s?dag(?:en)?{td_sep_nl})?"
+                           rf"(?:(?P<hours>{number})\s?uren?{td_sep_nl})?"
+                           rf"(?:(?P<minutes>{number})\s?minuten?{td_sep_nl})?"
+                           rf"(?:(?P<seconds>{number})\s?seconden?)?"
+                           r"(?:\s|$)"),
+    date=ShortYearMatcher(
+        r"(?P<day>\d{1,2})\.(?P<month>\d{1,2})\.(?P<year>\d{2}(?:\d{2})?)(?:\s|$)"),
+    weekday=WeekdayMatcher(pattern=r"(?:vandaag"
+                                   r"|(?:over)?morgen"
+                                   r"|ma(?:andag)?"
+                                   r"|di(?:nsdag)?"
+                                   r"|wo(?:esdag)?"
+                                   r"|do(?:nderdag)?"
+                                   r"|vr(?:ijdag)?"
+                                   r"|za(?:terdag)?"
+                                   r"|zo(?:ndag)?)"
+                                   r"(?:\s|$)",
+                           map={
+                               "van": +0, "mor": +1, "ove": +2, "maa": MO, "din": TU, "woe": WE,
+                               "don": TH, "vri": FR, "zat": SA, "zon": SU,
+                           }, substr=3),
+    time=RegexMatcher(r"\s?(?:om\s)?"
+                      r"(?P<hour>\d{1,2})"
+                      r"[:.](?P<minute>\d{2})"
+                      r"(?:[:.](?P<second>\d{2}))?"
+                      r"(?:\s|$)"),
+)

From 2601d7060bc6364aadd8de078497ee35e8479ab8 Mon Sep 17 00:00:00 2001
From: stormbyte <shocker@stormbyte.nl>
Date: Sun, 5 Feb 2023 16:21:53 +0000
Subject: [PATCH 2/2] Update dutch regex matches

---
 reminder/locales.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reminder/locales.py b/reminder/locales.py
index fa83fbf..f684871 100644
--- a/reminder/locales.py
+++ b/reminder/locales.py
@@ -144,13 +144,13 @@
 locales["nl_nl"] = Locale(
     name="Dutch",
     timedelta=RegexMatcher(rf"(?:in\s)?"                         
-                           rf"(?:(?P<years>{number})\s?jaren?{td_sep_nl})?"
+                           rf"(?:(?P<years>{number})\s?ja(?:ar|ren)?{td_sep_nl})?"
                            rf"(?:(?P<months>{number})\s?maand(?:en)?{td_sep_nl})?"
-                           rf"(?:(?P<weeks>{number})\s?weken?{td_sep_nl})?"
+                           rf"(?:(?P<weeks>{number})\s?we(?:ek|ken)?{td_sep_nl})?"
                            rf"(?:(?P<days>{number})\s?dag(?:en)?{td_sep_nl})?"
-                           rf"(?:(?P<hours>{number})\s?uren?{td_sep_nl})?"
-                           rf"(?:(?P<minutes>{number})\s?minuten?{td_sep_nl})?"
-                           rf"(?:(?P<seconds>{number})\s?seconden?)?"
+                           rf"(?:(?P<hours>{number})\s?u(?:ur|ren)?{td_sep_nl})?"
+                           rf"(?:(?P<minutes>{number})\s?min(?:uut|uten)?{td_sep_nl})?"
+                           rf"(?:(?P<seconds>{number})\s?seconde(?:n)?)?" 
                            r"(?:\s|$)"),
     date=ShortYearMatcher(
         r"(?P<day>\d{1,2})\.(?P<month>\d{1,2})\.(?P<year>\d{2}(?:\d{2})?)(?:\s|$)"),