Make time delta separator optional

maubot · Mar 26, 2020 · 9d93c91 · 9d93c91
1 parent a1aba2d
commit 9d93c91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/maubot.yaml b/maubot.yaml
@@ -1,6 +1,6 @@
 maubot: 0.1.0
 id: xyz.maubot.reminder
-version: 0.2.0
+version: 0.2.1
 license: AGPL-3.0-or-later
 modules:
 - reminder

diff --git a/reminder/locales.py b/reminder/locales.py
@@ -20,7 +20,7 @@
 
 locales: Locales = {}
 
-td_sep_en = r"(?:[\s,]{1,3}(?:and\s)?)"
+td_sep_en = r"(?:[\s,]{1,3}(?:and\s)?)?"
 locales["en_iso"] = Locale(
     name="English (ISO)",
     timedelta=RegexMatcher(r"(?:(?:in|after)\s)?"
@@ -69,7 +69,7 @@
     name="English (UK)", time=time_12_en, date=ShortYearMatcher(
         r"(?P<day>\d{1,2})/(?P<month>\d{1,2})(?:/(?P<year>\d{2}(?:\d{2})?))?(?:\s|$)"))
 
-td_sep_fi = r"(?:[\s,]{1,3}(?:ja\s)?)"
+td_sep_fi = r"(?:[\s,]{1,3}(?:ja\s)?)?"
 locales["fi_fi"] = Locale(
     name="Finnish",
     timedelta=RegexMatcher(rf"(?:(?P<years>[-+]?\d+)\s?v(?:uo(?:tta|den))?{td_sep_fi})?"
@@ -104,7 +104,7 @@
                       r"(?:\s|$)"),
 )
 
-td_sep_de = r"(?:[\s,]{1,3}(?:und\s)?)"
+td_sep_de = r"(?:[\s,]{1,3}(?:und\s)?)?"
 locales["de_de"] = Locale(
     name="German",
     timedelta=RegexMatcher(rf"(?:in\s)?"