From 9d93c9108f92a0db6b805b686a212202c86926f7 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 26 Mar 2020 20:22:50 +0200
Subject: [PATCH] Make time delta separator optional
---
maubot.yaml | 2 +-
reminder/locales.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/maubot.yaml b/maubot.yaml
index 8416149..7e8275c 100644
--- 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
index b29a12d..b12632d 100644
--- a/reminder/locales.py
+++ b/reminder/locales.py
@@ -20,7 +20,7 @@ from .locale_util import (Locales, Locale, RegexMatcher,
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 @@ locales["en_uk"] = locales["en_iso"].replace(
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 @@ locales["fi_fi"] = Locale(
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)?"
--
GitLab