diff --git a/dateparser/data/date_translation_data/af.py b/dateparser/data/date_translation_data/af.py index 2f3c437f6..a636d4ea8 100644 --- a/dateparser/data/date_translation_data/af.py +++ b/dateparser/data/date_translation_data/af.py @@ -161,63 +161,63 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) dae gelede", - "(\\d+) dag gelede" + "(\\d+[.,]?\\d*) dae gelede", + "(\\d+[.,]?\\d*) dag gelede" ], "\\1 hour ago": [ - "(\\d+) uur gelede" + "(\\d+[.,]?\\d*) uur gelede" ], "\\1 minute ago": [ - "(\\d+) min gelede", - "(\\d+) minute gelede", - "(\\d+) minuut gelede" + "(\\d+[.,]?\\d*) min gelede", + "(\\d+[.,]?\\d*) minute gelede", + "(\\d+[.,]?\\d*) minuut gelede" ], "\\1 month ago": [ - "(\\d+) maand gelede", - "(\\d+) maande gelede", - "(\\d+) md gelede" + "(\\d+[.,]?\\d*) maand gelede", + "(\\d+[.,]?\\d*) maande gelede", + "(\\d+[.,]?\\d*) md gelede" ], "\\1 second ago": [ - "(\\d+) sek gelede", - "(\\d+) sekonde gelede", - "(\\d+) sekondes gelede" + "(\\d+[.,]?\\d*) sek gelede", + "(\\d+[.,]?\\d*) sekonde gelede", + "(\\d+[.,]?\\d*) sekondes gelede" ], "\\1 week ago": [ - "(\\d+) w gelede", - "(\\d+) week gelede", - "(\\d+) weke gelede" + "(\\d+[.,]?\\d*) w gelede", + "(\\d+[.,]?\\d*) week gelede", + "(\\d+[.,]?\\d*) weke gelede" ], "\\1 year ago": [ - "(\\d+) jaar gelede" + "(\\d+[.,]?\\d*) jaar gelede" ], "in \\1 day": [ - "oor (\\d+) dae", - "oor (\\d+) dag", - "oor (\\d+) minuut" + "oor (\\d+[.,]?\\d*) dae", + "oor (\\d+[.,]?\\d*) dag", + "oor (\\d+[.,]?\\d*) minuut" ], "in \\1 hour": [ - "oor (\\d+) uur" + "oor (\\d+[.,]?\\d*) uur" ], "in \\1 minute": [ - "oor (\\d+) min", - "oor (\\d+) minuut" + "oor (\\d+[.,]?\\d*) min", + "oor (\\d+[.,]?\\d*) minuut" ], "in \\1 month": [ - "oor (\\d+) md", - "oor (\\d+) minuut" + "oor (\\d+[.,]?\\d*) md", + "oor (\\d+[.,]?\\d*) minuut" ], "in \\1 second": [ - "oor (\\d+) sek", - "oor (\\d+) sekonde", - "oor (\\d+) sekondes" + "oor (\\d+[.,]?\\d*) sek", + "oor (\\d+[.,]?\\d*) sekonde", + "oor (\\d+[.,]?\\d*) sekondes" ], "in \\1 week": [ - "oor (\\d+) w", - "oor (\\d+) week", - "oor (\\d+) weke" + "oor (\\d+[.,]?\\d*) w", + "oor (\\d+[.,]?\\d*) week", + "oor (\\d+[.,]?\\d*) weke" ], "in \\1 year": [ - "oor (\\d+) jaar" + "oor (\\d+[.,]?\\d*) jaar" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/am.py b/dateparser/data/date_translation_data/am.py index 83527a841..5a0abd00b 100644 --- a/dateparser/data/date_translation_data/am.py +++ b/dateparser/data/date_translation_data/am.py @@ -146,62 +146,62 @@ }, "relative-type-regex": { "\\1 day ago": [ - "ከ (\\d+) ቀን በፊት", - "ከ(\\d+) ቀናት በፊት", - "ከ(\\d+) ቀን በፊት", - "ከ(\\d+) ቀኖች በፊት" + "ከ (\\d+[.,]?\\d*) ቀን በፊት", + "ከ(\\d+[.,]?\\d*) ቀናት በፊት", + "ከ(\\d+[.,]?\\d*) ቀን በፊት", + "ከ(\\d+[.,]?\\d*) ቀኖች በፊት" ], "\\1 hour ago": [ - "ከ(\\d+) ሰዓት በፊት", - "ከ(\\d+) ሰዓቶች በፊት" + "ከ(\\d+[.,]?\\d*) ሰዓት በፊት", + "ከ(\\d+[.,]?\\d*) ሰዓቶች በፊት" ], "\\1 minute ago": [ - "ከ(\\d+) ደቂቃ በፊት", - "ከ(\\d+) ደቂቃዎች በፊት" + "ከ(\\d+[.,]?\\d*) ደቂቃ በፊት", + "ከ(\\d+[.,]?\\d*) ደቂቃዎች በፊት" ], "\\1 month ago": [ - "ከ(\\d+) ወራት በፊት", - "ከ(\\d+) ወር በፊት" + "ከ(\\d+[.,]?\\d*) ወራት በፊት", + "ከ(\\d+[.,]?\\d*) ወር በፊት" ], "\\1 second ago": [ - "ከ(\\d+) ሰከንድ በፊት", - "ከ(\\d+) ሰከንዶች በፊት" + "ከ(\\d+[.,]?\\d*) ሰከንድ በፊት", + "ከ(\\d+[.,]?\\d*) ሰከንዶች በፊት" ], "\\1 week ago": [ - "ከ(\\d+) ሳምንታት በፊት", - "ከ(\\d+) ሳምንት በፊት" + "ከ(\\d+[.,]?\\d*) ሳምንታት በፊት", + "ከ(\\d+[.,]?\\d*) ሳምንት በፊት" ], "\\1 year ago": [ - "ከ(\\d+) ዓመታት በፊት", - "ከ(\\d+) ዓመት በፊት" + "ከ(\\d+[.,]?\\d*) ዓመታት በፊት", + "ከ(\\d+[.,]?\\d*) ዓመት በፊት" ], "in \\1 day": [ - "በ(\\d+) ቀናት ውስጥ", - "በ(\\d+) ቀን ውስጥ", - "በ(\\d+) ቀኖች ውስጥ" + "በ(\\d+[.,]?\\d*) ቀናት ውስጥ", + "በ(\\d+[.,]?\\d*) ቀን ውስጥ", + "በ(\\d+[.,]?\\d*) ቀኖች ውስጥ" ], "in \\1 hour": [ - "በ(\\d+) ሰዓት ውስጥ", - "በ(\\d+) ሰዓቶች ውስጥ" + "በ(\\d+[.,]?\\d*) ሰዓት ውስጥ", + "በ(\\d+[.,]?\\d*) ሰዓቶች ውስጥ" ], "in \\1 minute": [ - "በ(\\d+) ደቂቃ ውስጥ", - "በ(\\d+) ደቂቃዎች ውስጥ" + "በ(\\d+[.,]?\\d*) ደቂቃ ውስጥ", + "በ(\\d+[.,]?\\d*) ደቂቃዎች ውስጥ" ], "in \\1 month": [ - "በ(\\d+) ወራት ውስጥ", - "በ(\\d+) ወር ውስጥ" + "በ(\\d+[.,]?\\d*) ወራት ውስጥ", + "በ(\\d+[.,]?\\d*) ወር ውስጥ" ], "in \\1 second": [ - "በ(\\d+) ሰከንድ ውስጥ", - "በ(\\d+) ሰከንዶች ውስጥ" + "በ(\\d+[.,]?\\d*) ሰከንድ ውስጥ", + "በ(\\d+[.,]?\\d*) ሰከንዶች ውስጥ" ], "in \\1 week": [ - "በ(\\d+) ሳምንታት ውስጥ", - "በ(\\d+) ሳምንት ውስጥ" + "በ(\\d+[.,]?\\d*) ሳምንታት ውስጥ", + "በ(\\d+[.,]?\\d*) ሳምንት ውስጥ" ], "in \\1 year": [ - "በ(\\d+) ዓመታት ውስጥ" + "በ(\\d+[.,]?\\d*) ዓመታት ውስጥ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ar.py b/dateparser/data/date_translation_data/ar.py index ec066ec91..fd179e91a 100644 --- a/dateparser/data/date_translation_data/ar.py +++ b/dateparser/data/date_translation_data/ar.py @@ -159,46 +159,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "قبل (\\d+) يوم" + "قبل (\\d+[.,]?\\d*) يوم" ], "\\1 hour ago": [ - "قبل (\\d+) ساعة" + "قبل (\\d+[.,]?\\d*) ساعة" ], "\\1 minute ago": [ - "قبل (\\d+) دقيقة" + "قبل (\\d+[.,]?\\d*) دقيقة" ], "\\1 month ago": [ - "قبل (\\d+) شهر" + "قبل (\\d+[.,]?\\d*) شهر" ], "\\1 second ago": [ - "قبل (\\d+) ثانية" + "قبل (\\d+[.,]?\\d*) ثانية" ], "\\1 week ago": [ - "قبل (\\d+) أسبوع" + "قبل (\\d+[.,]?\\d*) أسبوع" ], "\\1 year ago": [ - "قبل (\\d+) سنة" + "قبل (\\d+[.,]?\\d*) سنة" ], "in \\1 day": [ - "خلال (\\d+) يوم" + "خلال (\\d+[.,]?\\d*) يوم" ], "in \\1 hour": [ - "خلال (\\d+) ساعة" + "خلال (\\d+[.,]?\\d*) ساعة" ], "in \\1 minute": [ - "خلال (\\d+) دقيقة" + "خلال (\\d+[.,]?\\d*) دقيقة" ], "in \\1 month": [ - "خلال (\\d+) شهر" + "خلال (\\d+[.,]?\\d*) شهر" ], "in \\1 second": [ - "خلال (\\d+) ثانية" + "خلال (\\d+[.,]?\\d*) ثانية" ], "in \\1 week": [ - "خلال (\\d+) أسبوع" + "خلال (\\d+[.,]?\\d*) أسبوع" ], "in \\1 year": [ - "خلال (\\d+) سنة" + "خلال (\\d+[.,]?\\d*) سنة" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ast.py b/dateparser/data/date_translation_data/ast.py index 3c308b5ae..cf32fb3bc 100644 --- a/dateparser/data/date_translation_data/ast.py +++ b/dateparser/data/date_translation_data/ast.py @@ -188,78 +188,78 @@ }, "relative-type-regex": { "\\1 day ago": [ - "hai (\\d+) d", - "hai (\\d+) día", - "hai (\\d+) díes" + "hai (\\d+[.,]?\\d*) d", + "hai (\\d+[.,]?\\d*) día", + "hai (\\d+[.,]?\\d*) díes" ], "\\1 hour ago": [ - "hai (\\d+) h", - "hai (\\d+) hora", - "hai (\\d+) hores" + "hai (\\d+[.,]?\\d*) h", + "hai (\\d+[.,]?\\d*) hora", + "hai (\\d+[.,]?\\d*) hores" ], "\\1 minute ago": [ - "hai (\\d+) min", - "hai (\\d+) minutos", - "hai (\\d+) minutu" + "hai (\\d+[.,]?\\d*) min", + "hai (\\d+[.,]?\\d*) minutos", + "hai (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "hai (\\d+) m", - "hai (\\d+) mes", - "hai (\\d+) meses" + "hai (\\d+[.,]?\\d*) m", + "hai (\\d+[.,]?\\d*) mes", + "hai (\\d+[.,]?\\d*) meses" ], "\\1 second ago": [ - "hai (\\d+) s", - "hai (\\d+) seg", - "hai (\\d+) segundos", - "hai (\\d+) segundu" + "hai (\\d+[.,]?\\d*) s", + "hai (\\d+[.,]?\\d*) seg", + "hai (\\d+[.,]?\\d*) segundos", + "hai (\\d+[.,]?\\d*) segundu" ], "\\1 week ago": [ - "hai (\\d+) se", - "hai (\\d+) selm", - "hai (\\d+) selmana", - "hai (\\d+) selmanes" + "hai (\\d+[.,]?\\d*) se", + "hai (\\d+[.,]?\\d*) selm", + "hai (\\d+[.,]?\\d*) selmana", + "hai (\\d+[.,]?\\d*) selmanes" ], "\\1 year ago": [ - "hai (\\d+) a", - "hai (\\d+) años", - "hai (\\d+) añu" + "hai (\\d+[.,]?\\d*) a", + "hai (\\d+[.,]?\\d*) años", + "hai (\\d+[.,]?\\d*) añu" ], "in \\1 day": [ - "en (\\d+) d", - "en (\\d+) día", - "en (\\d+) díes" + "en (\\d+[.,]?\\d*) d", + "en (\\d+[.,]?\\d*) día", + "en (\\d+[.,]?\\d*) díes" ], "in \\1 hour": [ - "en (\\d+) h", - "en (\\d+) hora", - "en (\\d+) hores" + "en (\\d+[.,]?\\d*) h", + "en (\\d+[.,]?\\d*) hora", + "en (\\d+[.,]?\\d*) hores" ], "in \\1 minute": [ - "en (\\d+) min", - "en (\\d+) minutos", - "en (\\d+) minutu" + "en (\\d+[.,]?\\d*) min", + "en (\\d+[.,]?\\d*) minutos", + "en (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "en (\\d+) m", - "en (\\d+) mes", - "en (\\d+) meses" + "en (\\d+[.,]?\\d*) m", + "en (\\d+[.,]?\\d*) mes", + "en (\\d+[.,]?\\d*) meses" ], "in \\1 second": [ - "en (\\d+) s", - "en (\\d+) seg", - "en (\\d+) segundos", - "en (\\d+) segundu" + "en (\\d+[.,]?\\d*) s", + "en (\\d+[.,]?\\d*) seg", + "en (\\d+[.,]?\\d*) segundos", + "en (\\d+[.,]?\\d*) segundu" ], "in \\1 week": [ - "en (\\d+) se", - "en (\\d+) selm", - "en (\\d+) selmana", - "en (\\d+) selmanes" + "en (\\d+[.,]?\\d*) se", + "en (\\d+[.,]?\\d*) selm", + "en (\\d+[.,]?\\d*) selmana", + "en (\\d+[.,]?\\d*) selmanes" ], "in \\1 year": [ - "en (\\d+) a", - "en (\\d+) años", - "en (\\d+) añu" + "en (\\d+[.,]?\\d*) a", + "en (\\d+[.,]?\\d*) años", + "en (\\d+[.,]?\\d*) añu" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/az-Latn.py b/dateparser/data/date_translation_data/az-Latn.py index 29b502b37..1709c642d 100644 --- a/dateparser/data/date_translation_data/az-Latn.py +++ b/dateparser/data/date_translation_data/az-Latn.py @@ -157,46 +157,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) gün öncə" + "(\\d+[.,]?\\d*) gün öncə" ], "\\1 hour ago": [ - "(\\d+) saat öncə" + "(\\d+[.,]?\\d*) saat öncə" ], "\\1 minute ago": [ - "(\\d+) dəqiqə öncə" + "(\\d+[.,]?\\d*) dəqiqə öncə" ], "\\1 month ago": [ - "(\\d+) ay öncə" + "(\\d+[.,]?\\d*) ay öncə" ], "\\1 second ago": [ - "(\\d+) saniyə öncə" + "(\\d+[.,]?\\d*) saniyə öncə" ], "\\1 week ago": [ - "(\\d+) həftə öncə" + "(\\d+[.,]?\\d*) həftə öncə" ], "\\1 year ago": [ - "(\\d+) il öncə" + "(\\d+[.,]?\\d*) il öncə" ], "in \\1 day": [ - "(\\d+) gün ərzində" + "(\\d+[.,]?\\d*) gün ərzində" ], "in \\1 hour": [ - "(\\d+) saat ərzində" + "(\\d+[.,]?\\d*) saat ərzində" ], "in \\1 minute": [ - "(\\d+) dəqiqə ərzində" + "(\\d+[.,]?\\d*) dəqiqə ərzində" ], "in \\1 month": [ - "(\\d+) ay ərzində" + "(\\d+[.,]?\\d*) ay ərzində" ], "in \\1 second": [ - "(\\d+) saniyə ərzində" + "(\\d+[.,]?\\d*) saniyə ərzində" ], "in \\1 week": [ - "(\\d+) həftə ərzində" + "(\\d+[.,]?\\d*) həftə ərzində" ], "in \\1 year": [ - "(\\d+) il ərzində" + "(\\d+[.,]?\\d*) il ərzində" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/az.py b/dateparser/data/date_translation_data/az.py index 368b363f0..037511509 100644 --- a/dateparser/data/date_translation_data/az.py +++ b/dateparser/data/date_translation_data/az.py @@ -157,46 +157,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) gün öncə" + "(\\d+[.,]?\\d*) gün öncə" ], "\\1 hour ago": [ - "(\\d+) saat öncə" + "(\\d+[.,]?\\d*) saat öncə" ], "\\1 minute ago": [ - "(\\d+) dəqiqə öncə" + "(\\d+[.,]?\\d*) dəqiqə öncə" ], "\\1 month ago": [ - "(\\d+) ay öncə" + "(\\d+[.,]?\\d*) ay öncə" ], "\\1 second ago": [ - "(\\d+) saniyə öncə" + "(\\d+[.,]?\\d*) saniyə öncə" ], "\\1 week ago": [ - "(\\d+) həftə öncə" + "(\\d+[.,]?\\d*) həftə öncə" ], "\\1 year ago": [ - "(\\d+) il öncə" + "(\\d+[.,]?\\d*) il öncə" ], "in \\1 day": [ - "(\\d+) gün ərzində" + "(\\d+[.,]?\\d*) gün ərzində" ], "in \\1 hour": [ - "(\\d+) saat ərzində" + "(\\d+[.,]?\\d*) saat ərzində" ], "in \\1 minute": [ - "(\\d+) dəqiqə ərzində" + "(\\d+[.,]?\\d*) dəqiqə ərzində" ], "in \\1 month": [ - "(\\d+) ay ərzində" + "(\\d+[.,]?\\d*) ay ərzində" ], "in \\1 second": [ - "(\\d+) saniyə ərzində" + "(\\d+[.,]?\\d*) saniyə ərzində" ], "in \\1 week": [ - "(\\d+) həftə ərzində" + "(\\d+[.,]?\\d*) həftə ərzində" ], "in \\1 year": [ - "(\\d+) il ərzində" + "(\\d+[.,]?\\d*) il ərzində" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/be.py b/dateparser/data/date_translation_data/be.py index 835607dda..ea3e99dd3 100644 --- a/dateparser/data/date_translation_data/be.py +++ b/dateparser/data/date_translation_data/be.py @@ -216,74 +216,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) д таму", - "(\\d+) дзень таму", - "(\\d+) дня таму" + "(\\d+[.,]?\\d*) д таму", + "(\\d+[.,]?\\d*) дзень таму", + "(\\d+[.,]?\\d*) дня таму" ], "\\1 hour ago": [ - "(\\d+) гадз таму", - "(\\d+) гадзіну таму", - "(\\d+) гадзіны таму" + "(\\d+[.,]?\\d*) гадз таму", + "(\\d+[.,]?\\d*) гадзіну таму", + "(\\d+[.,]?\\d*) гадзіны таму" ], "\\1 minute ago": [ - "(\\d+) хв таму", - "(\\d+) хвіліну таму", - "(\\d+) хвіліны таму" + "(\\d+[.,]?\\d*) хв таму", + "(\\d+[.,]?\\d*) хвіліну таму", + "(\\d+[.,]?\\d*) хвіліны таму" ], "\\1 month ago": [ - "(\\d+) мес таму", - "(\\d+) месяц таму", - "(\\d+) месяца таму" + "(\\d+[.,]?\\d*) мес таму", + "(\\d+[.,]?\\d*) месяц таму", + "(\\d+[.,]?\\d*) месяца таму" ], "\\1 second ago": [ - "(\\d+) с таму", - "(\\d+) секунду таму", - "(\\d+) секунды таму" + "(\\d+[.,]?\\d*) с таму", + "(\\d+[.,]?\\d*) секунду таму", + "(\\d+[.,]?\\d*) секунды таму" ], "\\1 week ago": [ - "(\\d+) тыд таму", - "(\\d+) тыдзень таму", - "(\\d+) тыдня таму" + "(\\d+[.,]?\\d*) тыд таму", + "(\\d+[.,]?\\d*) тыдзень таму", + "(\\d+[.,]?\\d*) тыдня таму" ], "\\1 year ago": [ - "(\\d+) г таму", - "(\\d+) год таму", - "(\\d+) года таму" + "(\\d+[.,]?\\d*) г таму", + "(\\d+[.,]?\\d*) год таму", + "(\\d+[.,]?\\d*) года таму" ], "in \\1 day": [ - "праз (\\d+) д", - "праз (\\d+) дзень", - "праз (\\d+) дня" + "праз (\\d+[.,]?\\d*) д", + "праз (\\d+[.,]?\\d*) дзень", + "праз (\\d+[.,]?\\d*) дня" ], "in \\1 hour": [ - "праз (\\d+) гадз", - "праз (\\d+) гадзіну", - "праз (\\d+) гадзіны" + "праз (\\d+[.,]?\\d*) гадз", + "праз (\\d+[.,]?\\d*) гадзіну", + "праз (\\d+[.,]?\\d*) гадзіны" ], "in \\1 minute": [ - "праз (\\d+) хв", - "праз (\\d+) хвіліну", - "праз (\\d+) хвіліны" + "праз (\\d+[.,]?\\d*) хв", + "праз (\\d+[.,]?\\d*) хвіліну", + "праз (\\d+[.,]?\\d*) хвіліны" ], "in \\1 month": [ - "праз (\\d+) мес", - "праз (\\d+) месяц", - "праз (\\d+) месяца" + "праз (\\d+[.,]?\\d*) мес", + "праз (\\d+[.,]?\\d*) месяц", + "праз (\\d+[.,]?\\d*) месяца" ], "in \\1 second": [ - "праз (\\d+) с", - "праз (\\d+) секунду", - "праз (\\d+) секунды" + "праз (\\d+[.,]?\\d*) с", + "праз (\\d+[.,]?\\d*) секунду", + "праз (\\d+[.,]?\\d*) секунды" ], "in \\1 week": [ - "праз (\\d+) тыд", - "праз (\\d+) тыдзень", - "праз (\\d+) тыдня" + "праз (\\d+[.,]?\\d*) тыд", + "праз (\\d+[.,]?\\d*) тыдзень", + "праз (\\d+[.,]?\\d*) тыдня" ], "in \\1 year": [ - "праз (\\d+) г", - "праз (\\d+) год", - "праз (\\d+) года" + "праз (\\d+[.,]?\\d*) г", + "праз (\\d+[.,]?\\d*) год", + "праз (\\d+[.,]?\\d*) года" ] }, "locale_specific": {}, @@ -334,7 +334,7 @@ "некалькі хвілін": "2 хвіліны" }, { - "(\\d+)\\s*гадзін\\s(\\d+)\\s*хвілін": "\\1:\\2" + "(\\d+[.,]?\\d*)\\s*гадзін\\s(\\d+[.,]?\\d*)\\s*хвілін": "\\1:\\2" } ] } diff --git a/dateparser/data/date_translation_data/bg.py b/dateparser/data/date_translation_data/bg.py index 321193f67..972971b60 100644 --- a/dateparser/data/date_translation_data/bg.py +++ b/dateparser/data/date_translation_data/bg.py @@ -219,86 +219,86 @@ }, "relative-type-regex": { "\\1 day ago": [ - "пр (\\d+) д", - "преди (\\d+) ден", - "преди (\\d+) дни" + "пр (\\d+[.,]?\\d*) д", + "преди (\\d+[.,]?\\d*) ден", + "преди (\\d+[.,]?\\d*) дни" ], "\\1 hour ago": [ - "пр (\\d+) ч", - "преди (\\d+) ч", - "преди (\\d+) час", - "преди (\\d+) часа" + "пр (\\d+[.,]?\\d*) ч", + "преди (\\d+[.,]?\\d*) ч", + "преди (\\d+[.,]?\\d*) час", + "преди (\\d+[.,]?\\d*) часа" ], "\\1 minute ago": [ - "пр (\\d+) мин", - "преди (\\d+) мин", - "преди (\\d+) минута", - "преди (\\d+) минути" + "пр (\\d+[.,]?\\d*) мин", + "преди (\\d+[.,]?\\d*) мин", + "преди (\\d+[.,]?\\d*) минута", + "преди (\\d+[.,]?\\d*) минути" ], "\\1 month ago": [ - "пр (\\d+) м", - "преди (\\d+) м", - "преди (\\d+) месец", - "преди (\\d+) месеца" + "пр (\\d+[.,]?\\d*) м", + "преди (\\d+[.,]?\\d*) м", + "преди (\\d+[.,]?\\d*) месец", + "преди (\\d+[.,]?\\d*) месеца" ], "\\1 second ago": [ - "пр (\\d+) сек", - "преди (\\d+) сек", - "преди (\\d+) секунда", - "преди (\\d+) секунди" + "пр (\\d+[.,]?\\d*) сек", + "преди (\\d+[.,]?\\d*) сек", + "преди (\\d+[.,]?\\d*) секунда", + "преди (\\d+[.,]?\\d*) секунди" ], "\\1 week ago": [ - "пр (\\d+) седм", - "преди (\\d+) седм", - "преди (\\d+) седмица", - "преди (\\d+) седмици" + "пр (\\d+[.,]?\\d*) седм", + "преди (\\d+[.,]?\\d*) седм", + "преди (\\d+[.,]?\\d*) седмица", + "преди (\\d+[.,]?\\d*) седмици" ], "\\1 year ago": [ - "пр (\\d+) г", - "преди (\\d+) г", - "преди (\\d+) година", - "преди (\\d+) години" + "пр (\\d+[.,]?\\d*) г", + "преди (\\d+[.,]?\\d*) г", + "преди (\\d+[.,]?\\d*) година", + "преди (\\d+[.,]?\\d*) години" ], "in \\1 day": [ - "сл (\\d+) д", - "след (\\d+) ден", - "след (\\d+) дни" + "сл (\\d+[.,]?\\d*) д", + "след (\\d+[.,]?\\d*) ден", + "след (\\d+[.,]?\\d*) дни" ], "in \\1 hour": [ - "сл (\\d+) ч", - "след (\\d+) ч", - "след (\\d+) час", - "след (\\d+) часа" + "сл (\\d+[.,]?\\d*) ч", + "след (\\d+[.,]?\\d*) ч", + "след (\\d+[.,]?\\d*) час", + "след (\\d+[.,]?\\d*) часа" ], "in \\1 minute": [ - "сл (\\d+) мин", - "след (\\d+) мин", - "след (\\d+) минута", - "след (\\d+) минути" + "сл (\\d+[.,]?\\d*) мин", + "след (\\d+[.,]?\\d*) мин", + "след (\\d+[.,]?\\d*) минута", + "след (\\d+[.,]?\\d*) минути" ], "in \\1 month": [ - "сл (\\d+) м", - "след (\\d+) м", - "след (\\d+) месец", - "след (\\d+) месеца" + "сл (\\d+[.,]?\\d*) м", + "след (\\d+[.,]?\\d*) м", + "след (\\d+[.,]?\\d*) месец", + "след (\\d+[.,]?\\d*) месеца" ], "in \\1 second": [ - "сл (\\d+) сек", - "след (\\d+) сек", - "след (\\d+) секунда", - "след (\\d+) секунди" + "сл (\\d+[.,]?\\d*) сек", + "след (\\d+[.,]?\\d*) сек", + "след (\\d+[.,]?\\d*) секунда", + "след (\\d+[.,]?\\d*) секунди" ], "in \\1 week": [ - "сл (\\d+) седм", - "след (\\d+) седм", - "след (\\d+) седмица", - "след (\\d+) седмици" + "сл (\\d+[.,]?\\d*) седм", + "след (\\d+[.,]?\\d*) седм", + "след (\\d+[.,]?\\d*) седмица", + "след (\\d+[.,]?\\d*) седмици" ], "in \\1 year": [ - "сл (\\d+) г", - "след (\\d+) г", - "след (\\d+) година", - "след (\\d+) години" + "сл (\\d+[.,]?\\d*) г", + "след (\\d+[.,]?\\d*) г", + "след (\\d+[.,]?\\d*) година", + "след (\\d+[.,]?\\d*) години" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/bn.py b/dateparser/data/date_translation_data/bn.py index bb47c4acc..409f0d587 100644 --- a/dateparser/data/date_translation_data/bn.py +++ b/dateparser/data/date_translation_data/bn.py @@ -154,48 +154,48 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) দিন আগে" + "(\\d+[.,]?\\d*) দিন আগে" ], "\\1 hour ago": [ - "(\\d+) ঘন্টা আগে" + "(\\d+[.,]?\\d*) ঘন্টা আগে" ], "\\1 minute ago": [ - "(\\d+) মিনিট আগে", - "(\\d+) মিনিট পূর্বে" + "(\\d+[.,]?\\d*) মিনিট আগে", + "(\\d+[.,]?\\d*) মিনিট পূর্বে" ], "\\1 month ago": [ - "(\\d+) মাস আগে" + "(\\d+[.,]?\\d*) মাস আগে" ], "\\1 second ago": [ - "(\\d+) সেকেন্ড আগে", - "(\\d+) সেকেন্ড পূর্বে" + "(\\d+[.,]?\\d*) সেকেন্ড আগে", + "(\\d+[.,]?\\d*) সেকেন্ড পূর্বে" ], "\\1 week ago": [ - "(\\d+) সপ্তাহ আগে" + "(\\d+[.,]?\\d*) সপ্তাহ আগে" ], "\\1 year ago": [ - "(\\d+) বছর পূর্বে" + "(\\d+[.,]?\\d*) বছর পূর্বে" ], "in \\1 day": [ - "(\\d+) দিনের মধ্যে" + "(\\d+[.,]?\\d*) দিনের মধ্যে" ], "in \\1 hour": [ - "(\\d+) ঘন্টায়" + "(\\d+[.,]?\\d*) ঘন্টায়" ], "in \\1 minute": [ - "(\\d+) মিনিটে" + "(\\d+[.,]?\\d*) মিনিটে" ], "in \\1 month": [ - "(\\d+) মাসে" + "(\\d+[.,]?\\d*) মাসে" ], "in \\1 second": [ - "(\\d+) সেকেন্ডে" + "(\\d+[.,]?\\d*) সেকেন্ডে" ], "in \\1 week": [ - "(\\d+) সপ্তাহে" + "(\\d+[.,]?\\d*) সপ্তাহে" ], "in \\1 year": [ - "(\\d+) বছরে" + "(\\d+[.,]?\\d*) বছরে" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/br.py b/dateparser/data/date_translation_data/br.py index 3bfdcf366..38c5ae437 100644 --- a/dateparser/data/date_translation_data/br.py +++ b/dateparser/data/date_translation_data/br.py @@ -154,58 +154,58 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) d zo", - "(\\d+) deiz zo" + "(\\d+[.,]?\\d*) d zo", + "(\\d+[.,]?\\d*) deiz zo" ], "\\1 hour ago": [ - "(\\d+) e zo", - "(\\d+) eur zo" + "(\\d+[.,]?\\d*) e zo", + "(\\d+[.,]?\\d*) eur zo" ], "\\1 minute ago": [ - "(\\d+) min zo", - "(\\d+) munut zo" + "(\\d+[.,]?\\d*) min zo", + "(\\d+[.,]?\\d*) munut zo" ], "\\1 month ago": [ - "(\\d+) miz zo" + "(\\d+[.,]?\\d*) miz zo" ], "\\1 second ago": [ - "(\\d+) eilenn zo", - "(\\d+) s zo" + "(\\d+[.,]?\\d*) eilenn zo", + "(\\d+[.,]?\\d*) s zo" ], "\\1 week ago": [ - "(\\d+) sizhun zo" + "(\\d+[.,]?\\d*) sizhun zo" ], "\\1 year ago": [ - "(\\d+) bl zo", - "(\\d+) bloaz zo", - "(\\d+) vloaz zo" + "(\\d+[.,]?\\d*) bl zo", + "(\\d+[.,]?\\d*) bloaz zo", + "(\\d+[.,]?\\d*) vloaz zo" ], "in \\1 day": [ - "a-benn (\\d+) d", - "a-benn (\\d+) deiz" + "a-benn (\\d+[.,]?\\d*) d", + "a-benn (\\d+[.,]?\\d*) deiz" ], "in \\1 hour": [ - "a-benn (\\d+) e", - "a-benn (\\d+) eur" + "a-benn (\\d+[.,]?\\d*) e", + "a-benn (\\d+[.,]?\\d*) eur" ], "in \\1 minute": [ - "a-benn (\\d+) min", - "a-benn (\\d+) munut" + "a-benn (\\d+[.,]?\\d*) min", + "a-benn (\\d+[.,]?\\d*) munut" ], "in \\1 month": [ - "a-benn (\\d+) miz" + "a-benn (\\d+[.,]?\\d*) miz" ], "in \\1 second": [ - "a-benn (\\d+) eilenn", - "a-benn (\\d+) s" + "a-benn (\\d+[.,]?\\d*) eilenn", + "a-benn (\\d+[.,]?\\d*) s" ], "in \\1 week": [ - "a-benn (\\d+) sizhun" + "a-benn (\\d+[.,]?\\d*) sizhun" ], "in \\1 year": [ - "a-benn (\\d+) bl", - "a-benn (\\d+) bloaz", - "a-benn (\\d+) vloaz" + "a-benn (\\d+[.,]?\\d*) bl", + "a-benn (\\d+[.,]?\\d*) bloaz", + "a-benn (\\d+[.,]?\\d*) vloaz" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/bs-Cyrl.py b/dateparser/data/date_translation_data/bs-Cyrl.py index dc4671610..c07a696f8 100644 --- a/dateparser/data/date_translation_data/bs-Cyrl.py +++ b/dateparser/data/date_translation_data/bs-Cyrl.py @@ -152,60 +152,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "пре (\\d+) дан", - "пре (\\d+) дана" + "пре (\\d+[.,]?\\d*) дан", + "пре (\\d+[.,]?\\d*) дана" ], "\\1 hour ago": [ - "пре (\\d+) сат", - "пре (\\d+) сати" + "пре (\\d+[.,]?\\d*) сат", + "пре (\\d+[.,]?\\d*) сати" ], "\\1 minute ago": [ - "пре (\\d+) минут", - "пре (\\d+) минута" + "пре (\\d+[.,]?\\d*) минут", + "пре (\\d+[.,]?\\d*) минута" ], "\\1 month ago": [ - "пре (\\d+) месец", - "пре (\\d+) месеци" + "пре (\\d+[.,]?\\d*) месец", + "пре (\\d+[.,]?\\d*) месеци" ], "\\1 second ago": [ - "пре (\\d+) секунд", - "пре (\\d+) секунди" + "пре (\\d+[.,]?\\d*) секунд", + "пре (\\d+[.,]?\\d*) секунди" ], "\\1 week ago": [ - "пре (\\d+) недеља", - "пре (\\d+) недељу" + "пре (\\d+[.,]?\\d*) недеља", + "пре (\\d+[.,]?\\d*) недељу" ], "\\1 year ago": [ - "пре (\\d+) година", - "пре (\\d+) годину" + "пре (\\d+[.,]?\\d*) година", + "пре (\\d+[.,]?\\d*) годину" ], "in \\1 day": [ - "за (\\d+) дан", - "за (\\d+) дана" + "за (\\d+[.,]?\\d*) дан", + "за (\\d+[.,]?\\d*) дана" ], "in \\1 hour": [ - "за (\\d+) сат", - "за (\\d+) сати" + "за (\\d+[.,]?\\d*) сат", + "за (\\d+[.,]?\\d*) сати" ], "in \\1 minute": [ - "за (\\d+) минут", - "за (\\d+) минута" + "за (\\d+[.,]?\\d*) минут", + "за (\\d+[.,]?\\d*) минута" ], "in \\1 month": [ - "за (\\d+) месец", - "за (\\d+) месеци" + "за (\\d+[.,]?\\d*) месец", + "за (\\d+[.,]?\\d*) месеци" ], "in \\1 second": [ - "за (\\d+) секунд", - "за (\\d+) секунди" + "за (\\d+[.,]?\\d*) секунд", + "за (\\d+[.,]?\\d*) секунди" ], "in \\1 week": [ - "за (\\d+) недеља", - "за (\\d+) недељу" + "за (\\d+[.,]?\\d*) недеља", + "за (\\d+[.,]?\\d*) недељу" ], "in \\1 year": [ - "за (\\d+) година", - "за (\\d+) годину" + "за (\\d+[.,]?\\d*) година", + "за (\\d+[.,]?\\d*) годину" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/bs-Latn.py b/dateparser/data/date_translation_data/bs-Latn.py index cd1b51f96..b0cbe0c99 100644 --- a/dateparser/data/date_translation_data/bs-Latn.py +++ b/dateparser/data/date_translation_data/bs-Latn.py @@ -160,74 +160,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "prije (\\d+) d", - "prije (\\d+) dan", - "prije (\\d+) dana" + "prije (\\d+[.,]?\\d*) d", + "prije (\\d+[.,]?\\d*) dan", + "prije (\\d+[.,]?\\d*) dana" ], "\\1 hour ago": [ - "prije (\\d+) sat", - "prije (\\d+) sati" + "prije (\\d+[.,]?\\d*) sat", + "prije (\\d+[.,]?\\d*) sati" ], "\\1 minute ago": [ - "prije (\\d+) min", - "prije (\\d+) minuta", - "prije (\\d+) minutu" + "prije (\\d+[.,]?\\d*) min", + "prije (\\d+[.,]?\\d*) minuta", + "prije (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "prije (\\d+) mj", - "prije (\\d+) mjesec", - "prije (\\d+) mjeseci" + "prije (\\d+[.,]?\\d*) mj", + "prije (\\d+[.,]?\\d*) mjesec", + "prije (\\d+[.,]?\\d*) mjeseci" ], "\\1 second ago": [ - "prije (\\d+) sek", - "prije (\\d+) sekundi", - "prije (\\d+) sekundu" + "prije (\\d+[.,]?\\d*) sek", + "prije (\\d+[.,]?\\d*) sekundi", + "prije (\\d+[.,]?\\d*) sekundu" ], "\\1 week ago": [ - "prije (\\d+) sed", - "prije (\\d+) sedmica", - "prije (\\d+) sedmicu" + "prije (\\d+[.,]?\\d*) sed", + "prije (\\d+[.,]?\\d*) sedmica", + "prije (\\d+[.,]?\\d*) sedmicu" ], "\\1 year ago": [ - "prije (\\d+) g", - "prije (\\d+) god", - "prije (\\d+) godina", - "prije (\\d+) godinu" + "prije (\\d+[.,]?\\d*) g", + "prije (\\d+[.,]?\\d*) god", + "prije (\\d+[.,]?\\d*) godina", + "prije (\\d+[.,]?\\d*) godinu" ], "in \\1 day": [ - "za (\\d+) d", - "za (\\d+) dan", - "za (\\d+) dana" + "za (\\d+[.,]?\\d*) d", + "za (\\d+[.,]?\\d*) dan", + "za (\\d+[.,]?\\d*) dana" ], "in \\1 hour": [ - "za (\\d+) sat", - "za (\\d+) sati" + "za (\\d+[.,]?\\d*) sat", + "za (\\d+[.,]?\\d*) sati" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minuta", - "za (\\d+) minutu" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minuta", + "za (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "za (\\d+) mj", - "za (\\d+) mjesec", - "za (\\d+) mjeseci" + "za (\\d+[.,]?\\d*) mj", + "za (\\d+[.,]?\\d*) mjesec", + "za (\\d+[.,]?\\d*) mjeseci" ], "in \\1 second": [ - "za (\\d+) sek", - "za (\\d+) sekundi", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundi", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) sed", - "za (\\d+) sedmica", - "za (\\d+) sedmicu" + "za (\\d+[.,]?\\d*) sed", + "za (\\d+[.,]?\\d*) sedmica", + "za (\\d+[.,]?\\d*) sedmicu" ], "in \\1 year": [ - "za (\\d+) g", - "za (\\d+) god", - "za (\\d+) godina", - "za (\\d+) godinu" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) god", + "za (\\d+[.,]?\\d*) godina", + "za (\\d+[.,]?\\d*) godinu" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/bs.py b/dateparser/data/date_translation_data/bs.py index e9b003776..7c0ba09a7 100644 --- a/dateparser/data/date_translation_data/bs.py +++ b/dateparser/data/date_translation_data/bs.py @@ -160,74 +160,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "prije (\\d+) d", - "prije (\\d+) dan", - "prije (\\d+) dana" + "prije (\\d+[.,]?\\d*) d", + "prije (\\d+[.,]?\\d*) dan", + "prije (\\d+[.,]?\\d*) dana" ], "\\1 hour ago": [ - "prije (\\d+) sat", - "prije (\\d+) sati" + "prije (\\d+[.,]?\\d*) sat", + "prije (\\d+[.,]?\\d*) sati" ], "\\1 minute ago": [ - "prije (\\d+) min", - "prije (\\d+) minuta", - "prije (\\d+) minutu" + "prije (\\d+[.,]?\\d*) min", + "prije (\\d+[.,]?\\d*) minuta", + "prije (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "prije (\\d+) mj", - "prije (\\d+) mjesec", - "prije (\\d+) mjeseci" + "prije (\\d+[.,]?\\d*) mj", + "prije (\\d+[.,]?\\d*) mjesec", + "prije (\\d+[.,]?\\d*) mjeseci" ], "\\1 second ago": [ - "prije (\\d+) sek", - "prije (\\d+) sekundi", - "prije (\\d+) sekundu" + "prije (\\d+[.,]?\\d*) sek", + "prije (\\d+[.,]?\\d*) sekundi", + "prije (\\d+[.,]?\\d*) sekundu" ], "\\1 week ago": [ - "prije (\\d+) sed", - "prije (\\d+) sedmica", - "prije (\\d+) sedmicu" + "prije (\\d+[.,]?\\d*) sed", + "prije (\\d+[.,]?\\d*) sedmica", + "prije (\\d+[.,]?\\d*) sedmicu" ], "\\1 year ago": [ - "prije (\\d+) g", - "prije (\\d+) god", - "prije (\\d+) godina", - "prije (\\d+) godinu" + "prije (\\d+[.,]?\\d*) g", + "prije (\\d+[.,]?\\d*) god", + "prije (\\d+[.,]?\\d*) godina", + "prije (\\d+[.,]?\\d*) godinu" ], "in \\1 day": [ - "za (\\d+) d", - "za (\\d+) dan", - "za (\\d+) dana" + "za (\\d+[.,]?\\d*) d", + "za (\\d+[.,]?\\d*) dan", + "za (\\d+[.,]?\\d*) dana" ], "in \\1 hour": [ - "za (\\d+) sat", - "za (\\d+) sati" + "za (\\d+[.,]?\\d*) sat", + "za (\\d+[.,]?\\d*) sati" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minuta", - "za (\\d+) minutu" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minuta", + "za (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "za (\\d+) mj", - "za (\\d+) mjesec", - "za (\\d+) mjeseci" + "za (\\d+[.,]?\\d*) mj", + "za (\\d+[.,]?\\d*) mjesec", + "za (\\d+[.,]?\\d*) mjeseci" ], "in \\1 second": [ - "za (\\d+) sek", - "za (\\d+) sekundi", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundi", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) sed", - "za (\\d+) sedmica", - "za (\\d+) sedmicu" + "za (\\d+[.,]?\\d*) sed", + "za (\\d+[.,]?\\d*) sedmica", + "za (\\d+[.,]?\\d*) sedmicu" ], "in \\1 year": [ - "za (\\d+) g", - "za (\\d+) god", - "za (\\d+) godina", - "za (\\d+) godinu" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) god", + "za (\\d+[.,]?\\d*) godina", + "za (\\d+[.,]?\\d*) godinu" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ca.py b/dateparser/data/date_translation_data/ca.py index 3abcb75cc..4d0a2f2cd 100644 --- a/dateparser/data/date_translation_data/ca.py +++ b/dateparser/data/date_translation_data/ca.py @@ -201,69 +201,69 @@ }, "relative-type-regex": { "\\1 day ago": [ - "fa (\\d+) dia", - "fa (\\d+) dies" + "fa (\\d+[.,]?\\d*) dia", + "fa (\\d+[.,]?\\d*) dies" ], "\\1 hour ago": [ - "fa (\\d+) h", - "fa (\\d+) hora", - "fa (\\d+) hores" + "fa (\\d+[.,]?\\d*) h", + "fa (\\d+[.,]?\\d*) hora", + "fa (\\d+[.,]?\\d*) hores" ], "\\1 minute ago": [ - "fa (\\d+) min", - "fa (\\d+) minut", - "fa (\\d+) minuts" + "fa (\\d+[.,]?\\d*) min", + "fa (\\d+[.,]?\\d*) minut", + "fa (\\d+[.,]?\\d*) minuts" ], "\\1 month ago": [ - "fa (\\d+) mes", - "fa (\\d+) mesos" + "fa (\\d+[.,]?\\d*) mes", + "fa (\\d+[.,]?\\d*) mesos" ], "\\1 second ago": [ - "fa (\\d+) s", - "fa (\\d+) segon", - "fa (\\d+) segons" + "fa (\\d+[.,]?\\d*) s", + "fa (\\d+[.,]?\\d*) segon", + "fa (\\d+[.,]?\\d*) segons" ], "\\1 week ago": [ - "fa (\\d+) setm", - "fa (\\d+) setmana", - "fa (\\d+) setmanes" + "fa (\\d+[.,]?\\d*) setm", + "fa (\\d+[.,]?\\d*) setmana", + "fa (\\d+[.,]?\\d*) setmanes" ], "\\1 year ago": [ - "fa (\\d+) any", - "fa (\\d+) anys" + "fa (\\d+[.,]?\\d*) any", + "fa (\\d+[.,]?\\d*) anys" ], "in \\1 day": [ - "d'aquí a (\\d+) dia", - "d'aquí a (\\d+) dies" + "d'aquí a (\\d+[.,]?\\d*) dia", + "d'aquí a (\\d+[.,]?\\d*) dies" ], "in \\1 hour": [ - "d'aquí a (\\d+) h", - "d'aquí a (\\d+) hora", - "d'aquí a (\\d+) hores", - "d‘aquí a (\\d+) h" + "d'aquí a (\\d+[.,]?\\d*) h", + "d'aquí a (\\d+[.,]?\\d*) hora", + "d'aquí a (\\d+[.,]?\\d*) hores", + "d‘aquí a (\\d+[.,]?\\d*) h" ], "in \\1 minute": [ - "d'aquí a (\\d+) min", - "d'aquí a (\\d+) minut", - "d'aquí a (\\d+) minuts" + "d'aquí a (\\d+[.,]?\\d*) min", + "d'aquí a (\\d+[.,]?\\d*) minut", + "d'aquí a (\\d+[.,]?\\d*) minuts" ], "in \\1 month": [ - "d'aquí a (\\d+) mes", - "d'aquí a (\\d+) mesos" + "d'aquí a (\\d+[.,]?\\d*) mes", + "d'aquí a (\\d+[.,]?\\d*) mesos" ], "in \\1 second": [ - "d'aquí a (\\d+) s", - "d'aquí a (\\d+) segon", - "d'aquí a (\\d+) segons" + "d'aquí a (\\d+[.,]?\\d*) s", + "d'aquí a (\\d+[.,]?\\d*) segon", + "d'aquí a (\\d+[.,]?\\d*) segons" ], "in \\1 week": [ - "d'aquí a (\\d+) setm", - "d'aquí a (\\d+) setmana", - "d'aquí a (\\d+) setmanes" + "d'aquí a (\\d+[.,]?\\d*) setm", + "d'aquí a (\\d+[.,]?\\d*) setmana", + "d'aquí a (\\d+[.,]?\\d*) setmanes" ], "in \\1 year": [ - "d'aquí a (\\d+) any", - "d'aquí a (\\d+) anys" + "d'aquí a (\\d+[.,]?\\d*) any", + "d'aquí a (\\d+[.,]?\\d*) anys" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ce.py b/dateparser/data/date_translation_data/ce.py index f6eb2625e..494d945cd 100644 --- a/dateparser/data/date_translation_data/ce.py +++ b/dateparser/data/date_translation_data/ce.py @@ -151,60 +151,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) д хьалха", - "(\\d+) де хьалха" + "(\\d+[.,]?\\d*) д хьалха", + "(\\d+[.,]?\\d*) де хьалха" ], "\\1 hour ago": [ - "(\\d+) сахь хьалха", - "(\\d+) сахьт хьалха" + "(\\d+[.,]?\\d*) сахь хьалха", + "(\\d+[.,]?\\d*) сахьт хьалха" ], "\\1 minute ago": [ - "(\\d+) мин хьалха", - "(\\d+) минот хьалха" + "(\\d+[.,]?\\d*) мин хьалха", + "(\\d+[.,]?\\d*) минот хьалха" ], "\\1 month ago": [ - "(\\d+) б хьалха", - "(\\d+) бутт хьалха" + "(\\d+[.,]?\\d*) б хьалха", + "(\\d+[.,]?\\d*) бутт хьалха" ], "\\1 second ago": [ - "(\\d+) сек хьалха", - "(\\d+) секунд хьалха" + "(\\d+[.,]?\\d*) сек хьалха", + "(\\d+[.,]?\\d*) секунд хьалха" ], "\\1 week ago": [ - "(\\d+) кӏир хьалха", - "(\\d+) кӏира хьалха" + "(\\d+[.,]?\\d*) кӏир хьалха", + "(\\d+[.,]?\\d*) кӏира хьалха" ], "\\1 year ago": [ - "(\\d+) ш хьалха", - "(\\d+) шо хьалха" + "(\\d+[.,]?\\d*) ш хьалха", + "(\\d+[.,]?\\d*) шо хьалха" ], "in \\1 day": [ - "(\\d+) д даьлча", - "(\\d+) де даьлча" + "(\\d+[.,]?\\d*) д даьлча", + "(\\d+[.,]?\\d*) де даьлча" ], "in \\1 hour": [ - "(\\d+) сахь даьлча", - "(\\d+) сахьт даьлча" + "(\\d+[.,]?\\d*) сахь даьлча", + "(\\d+[.,]?\\d*) сахьт даьлча" ], "in \\1 minute": [ - "(\\d+) мин яьлча", - "(\\d+) минот яьлча" + "(\\d+[.,]?\\d*) мин яьлча", + "(\\d+[.,]?\\d*) минот яьлча" ], "in \\1 month": [ - "(\\d+) б баьлча", - "(\\d+) бутт баьлча" + "(\\d+[.,]?\\d*) б баьлча", + "(\\d+[.,]?\\d*) бутт баьлча" ], "in \\1 second": [ - "(\\d+) сек яьлча", - "(\\d+) секунд яьлча" + "(\\d+[.,]?\\d*) сек яьлча", + "(\\d+[.,]?\\d*) секунд яьлча" ], "in \\1 week": [ - "(\\d+) кӏир даьлча", - "(\\d+) кӏира даьлча" + "(\\d+[.,]?\\d*) кӏир даьлча", + "(\\d+[.,]?\\d*) кӏира даьлча" ], "in \\1 year": [ - "(\\d+) ш даьлча", - "(\\d+) шо даьлча" + "(\\d+[.,]?\\d*) ш даьлча", + "(\\d+[.,]?\\d*) шо даьлча" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/chr.py b/dateparser/data/date_translation_data/chr.py index 67ca45808..baf375fb6 100644 --- a/dateparser/data/date_translation_data/chr.py +++ b/dateparser/data/date_translation_data/chr.py @@ -158,68 +158,68 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ꭲꭶ ꮵꭸꮢ", - "(\\d+) ꭿꮈꮝꭹ ꮷꮢꭿꮫ ꮵꭸꮢ" + "(\\d+[.,]?\\d*) ꭲꭶ ꮵꭸꮢ", + "(\\d+[.,]?\\d*) ꭿꮈꮝꭹ ꮷꮢꭿꮫ ꮵꭸꮢ" ], "\\1 hour ago": [ - "(\\d+) ꭲᏻꮯꮆꮣ ꮵꭸꮢ", - "(\\d+) ꮡꮯꮆꮣ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꮡꮯ ꮵꭸꮢ" + "(\\d+[.,]?\\d*) ꭲᏻꮯꮆꮣ ꮵꭸꮢ", + "(\\d+[.,]?\\d*) ꮡꮯꮆꮣ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮡꮯ ꮵꭸꮢ" ], "\\1 minute ago": [ - "ꮎꮏ (\\d+) ꭲꮿꮤ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꭲꮿꮤꮼꮝꮤꮕ ꮵꭸꮢ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꮿꮤ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꮿꮤꮼꮝꮤꮕ ꮵꭸꮢ" ], "\\1 month ago": [ - "ꮎꮏ (\\d+) ꭷꮈ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꭷꮈꭲ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꮧꭷꮈꭲ ꮵꭸꮢ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭷꮈ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭷꮈꭲ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮧꭷꮈꭲ ꮵꭸꮢ" ], "\\1 second ago": [ - "(\\d+) ꭰꮞꮲ ꮵꭸꮢ", - "(\\d+) ꮣꮣꮎꮹꮝꭼ ꮵꭸꮢ" + "(\\d+[.,]?\\d*) ꭰꮞꮲ ꮵꭸꮢ", + "(\\d+[.,]?\\d*) ꮣꮣꮎꮹꮝꭼ ꮵꭸꮢ" ], "\\1 week ago": [ - "ꮎꮏ (\\d+) ꭲᏻꮎꮩꮣꮖꮝꮧ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꮢꮎ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꮢꮎꮩꮣꮖꮝꮧ ꮵꭸꮢ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲᏻꮎꮩꮣꮖꮝꮧ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮢꮎ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮢꮎꮩꮣꮖꮝꮧ ꮵꭸꮢ" ], "\\1 year ago": [ - "(\\d+) ꭲꮷꮥꮨᏼꮜꮧꮢꭲ ꮵꭸꮢ", - "(\\d+) ꭴꮥꮨᏼꮜꮧꮢꭲ ꮵꭸꮢ", - "ꮎꮏ (\\d+) ꭴꮥ ꮵꭸꮢ" + "(\\d+[.,]?\\d*) ꭲꮷꮥꮨᏼꮜꮧꮢꭲ ꮵꭸꮢ", + "(\\d+[.,]?\\d*) ꭴꮥꮨᏼꮜꮧꮢꭲ ꮵꭸꮢ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭴꮥ ꮵꭸꮢ" ], "in \\1 day": [ - "ꮎꮏ (\\d+) ꭲꭶ", - "ꮎꮏ (\\d+) ꭿꮈꮝꭹ ꮷꮢꭿꮫ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꭶ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭿꮈꮝꭹ ꮷꮢꭿꮫ" ], "in \\1 hour": [ - "ꮎꮏ (\\d+) ꭲᏻꮯꮆꮣ", - "ꮎꮏ (\\d+) ꮡꮯ", - "ꮎꮏ (\\d+) ꮡꮯꮆꮣ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲᏻꮯꮆꮣ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮡꮯ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮡꮯꮆꮣ" ], "in \\1 minute": [ - "ꮎꮏ (\\d+) ꭲꮿꮤ", - "ꮎꮏ (\\d+) ꭲꮿꮤꮼꮝꮤꮕ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꮿꮤ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꮿꮤꮼꮝꮤꮕ" ], "in \\1 month": [ - "ꮎꮏ (\\d+) ꭷꮈ", - "ꮎꮏ (\\d+) ꭷꮈꭲ", - "ꮎꮏ (\\d+) ꮧꭷꮈꭲ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭷꮈ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭷꮈꭲ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮧꭷꮈꭲ" ], "in \\1 second": [ - "ꮎꮏ (\\d+) ꭰꮞꮲ", - "ꮎꮏ (\\d+) ꮣꮣꮎꮹꮝꭼ ꮵꭸꮢ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭰꮞꮲ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮣꮣꮎꮹꮝꭼ ꮵꭸꮢ" ], "in \\1 week": [ - "ꮎꮏ (\\d+) ꭲᏻꮎꮩꮣꮖꮝꮧ", - "ꮎꮏ (\\d+) ꮢꮎ", - "ꮎꮏ (\\d+) ꮢꮎꮩꮣꮖꮝꮧ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲᏻꮎꮩꮣꮖꮝꮧ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮢꮎ", + "ꮎꮏ (\\d+[.,]?\\d*) ꮢꮎꮩꮣꮖꮝꮧ" ], "in \\1 year": [ - "ꮎꮏ (\\d+) ꭲꮷꮥꮨᏼꮜꮧꮢꭲ", - "ꮎꮏ (\\d+) ꭴꮥ", - "ꮎꮏ (\\d+) ꭴꮥꮨᏼꮜꮧꮢꭲ" + "ꮎꮏ (\\d+[.,]?\\d*) ꭲꮷꮥꮨᏼꮜꮧꮢꭲ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭴꮥ", + "ꮎꮏ (\\d+[.,]?\\d*) ꭴꮥꮨᏼꮜꮧꮢꭲ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/cs.py b/dateparser/data/date_translation_data/cs.py index f683fc64e..ed3d0fd5e 100644 --- a/dateparser/data/date_translation_data/cs.py +++ b/dateparser/data/date_translation_data/cs.py @@ -207,74 +207,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "před (\\d+) dnem", - "před (\\d+) dny" + "před (\\d+[.,]?\\d*) dnem", + "před (\\d+[.,]?\\d*) dny" ], "\\1 hour ago": [ - "před (\\d+) h", - "před (\\d+) hodinami", - "před (\\d+) hodinou" + "před (\\d+[.,]?\\d*) h", + "před (\\d+[.,]?\\d*) hodinami", + "před (\\d+[.,]?\\d*) hodinou" ], "\\1 minute ago": [ - "před (\\d+) min", - "před (\\d+) minutami", - "před (\\d+) minutou" + "před (\\d+[.,]?\\d*) min", + "před (\\d+[.,]?\\d*) minutami", + "před (\\d+[.,]?\\d*) minutou" ], "\\1 month ago": [ - "před (\\d+) měs", - "před (\\d+) měsícem", - "před (\\d+) měsíci" + "před (\\d+[.,]?\\d*) měs", + "před (\\d+[.,]?\\d*) měsícem", + "před (\\d+[.,]?\\d*) měsíci" ], "\\1 second ago": [ - "před (\\d+) s", - "před (\\d+) sekundami", - "před (\\d+) sekundou" + "před (\\d+[.,]?\\d*) s", + "před (\\d+[.,]?\\d*) sekundami", + "před (\\d+[.,]?\\d*) sekundou" ], "\\1 week ago": [ - "před (\\d+) týd", - "před (\\d+) týdnem", - "před (\\d+) týdny" + "před (\\d+[.,]?\\d*) týd", + "před (\\d+[.,]?\\d*) týdnem", + "před (\\d+[.,]?\\d*) týdny" ], "\\1 year ago": [ - "před (\\d+) l", - "před (\\d+) lety", - "před (\\d+) r", - "před (\\d+) rokem" + "před (\\d+[.,]?\\d*) l", + "před (\\d+[.,]?\\d*) lety", + "před (\\d+[.,]?\\d*) r", + "před (\\d+[.,]?\\d*) rokem" ], "in \\1 day": [ - "za (\\d+) den", - "za (\\d+) dní" + "za (\\d+[.,]?\\d*) den", + "za (\\d+[.,]?\\d*) dní" ], "in \\1 hour": [ - "za (\\d+) h", - "za (\\d+) hodin", - "za (\\d+) hodinu" + "za (\\d+[.,]?\\d*) h", + "za (\\d+[.,]?\\d*) hodin", + "za (\\d+[.,]?\\d*) hodinu" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minut", - "za (\\d+) minutu" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minut", + "za (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "za (\\d+) měs", - "za (\\d+) měsíc", - "za (\\d+) měsíců" + "za (\\d+[.,]?\\d*) měs", + "za (\\d+[.,]?\\d*) měsíc", + "za (\\d+[.,]?\\d*) měsíců" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sekund", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sekund", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) týd", - "za (\\d+) týden", - "za (\\d+) týdnů" + "za (\\d+[.,]?\\d*) týd", + "za (\\d+[.,]?\\d*) týden", + "za (\\d+[.,]?\\d*) týdnů" ], "in \\1 year": [ - "za (\\d+) l", - "za (\\d+) let", - "za (\\d+) r", - "za (\\d+) rok" + "za (\\d+[.,]?\\d*) l", + "za (\\d+[.,]?\\d*) let", + "za (\\d+[.,]?\\d*) r", + "za (\\d+[.,]?\\d*) rok" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/cy.py b/dateparser/data/date_translation_data/cy.py index 379c8c44e..da5e8a8d5 100644 --- a/dateparser/data/date_translation_data/cy.py +++ b/dateparser/data/date_translation_data/cy.py @@ -155,48 +155,48 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) diwrnod yn ôl" + "(\\d+[.,]?\\d*) diwrnod yn ôl" ], "\\1 hour ago": [ - "(\\d+) awr yn ôl" + "(\\d+[.,]?\\d*) awr yn ôl" ], "\\1 minute ago": [ - "(\\d+) mun yn ôl", - "(\\d+) munud yn ôl" + "(\\d+[.,]?\\d*) mun yn ôl", + "(\\d+[.,]?\\d*) munud yn ôl" ], "\\1 month ago": [ - "(\\d+) mis yn ôl" + "(\\d+[.,]?\\d*) mis yn ôl" ], "\\1 second ago": [ - "(\\d+) eiliad yn ôl" + "(\\d+[.,]?\\d*) eiliad yn ôl" ], "\\1 week ago": [ - "(\\d+) wythnos yn ôl" + "(\\d+[.,]?\\d*) wythnos yn ôl" ], "\\1 year ago": [ - "(\\d+) o flynyddoedd yn ôl" + "(\\d+[.,]?\\d*) o flynyddoedd yn ôl" ], "in \\1 day": [ - "ymhen (\\d+) diwrnod" + "ymhen (\\d+[.,]?\\d*) diwrnod" ], "in \\1 hour": [ - "ymhen (\\d+) awr" + "ymhen (\\d+[.,]?\\d*) awr" ], "in \\1 minute": [ - "ymhen (\\d+) mun", - "ymhen (\\d+) munud" + "ymhen (\\d+[.,]?\\d*) mun", + "ymhen (\\d+[.,]?\\d*) munud" ], "in \\1 month": [ - "ymhen (\\d+) mis" + "ymhen (\\d+[.,]?\\d*) mis" ], "in \\1 second": [ - "ymhen (\\d+) eiliad" + "ymhen (\\d+[.,]?\\d*) eiliad" ], "in \\1 week": [ - "ymhen (\\d+) wythnos" + "ymhen (\\d+[.,]?\\d*) wythnos" ], "in \\1 year": [ - "ymhen (\\d+) mlynedd" + "ymhen (\\d+[.,]?\\d*) mlynedd" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/da.py b/dateparser/data/date_translation_data/da.py index 2c90bb0c6..9350b648a 100644 --- a/dateparser/data/date_translation_data/da.py +++ b/dateparser/data/date_translation_data/da.py @@ -166,72 +166,72 @@ }, "relative-type-regex": { "\\1 day ago": [ - "for (\\d+) dag siden", - "for (\\d+) dage siden" + "for (\\d+[.,]?\\d*) dag siden", + "for (\\d+[.,]?\\d*) dage siden" ], "\\1 hour ago": [ - "for (\\d+) time siden", - "for (\\d+) timer siden", - "for (\\d+)\\s*h", - "for (\\d+) timer" + "for (\\d+[.,]?\\d*) time siden", + "for (\\d+[.,]?\\d*) timer siden", + "for (\\d+[.,]?\\d*)\\s*h", + "for (\\d+[.,]?\\d*) timer" ], "\\1 minute ago": [ - "for (\\d+) min siden", - "for (\\d+) minut siden", - "for (\\d+) minutter siden", - "for (\\d+)\\s*m", - "for (\\d+) minutter" + "for (\\d+[.,]?\\d*) min siden", + "for (\\d+[.,]?\\d*) minut siden", + "for (\\d+[.,]?\\d*) minutter siden", + "for (\\d+[.,]?\\d*)\\s*m", + "for (\\d+[.,]?\\d*) minutter" ], "\\1 month ago": [ - "for (\\d+) md siden", - "for (\\d+) mdr siden", - "for (\\d+) måned siden", - "for (\\d+) måneder siden" + "for (\\d+[.,]?\\d*) md siden", + "for (\\d+[.,]?\\d*) mdr siden", + "for (\\d+[.,]?\\d*) måned siden", + "for (\\d+[.,]?\\d*) måneder siden" ], "\\1 second ago": [ - "for (\\d+) sek siden", - "for (\\d+) sekund siden", - "for (\\d+) sekunder siden", - "for (\\d+)\\s*s", - "for (\\d+) sekunder" + "for (\\d+[.,]?\\d*) sek siden", + "for (\\d+[.,]?\\d*) sekund siden", + "for (\\d+[.,]?\\d*) sekunder siden", + "for (\\d+[.,]?\\d*)\\s*s", + "for (\\d+[.,]?\\d*) sekunder" ], "\\1 week ago": [ - "for (\\d+) uge siden", - "for (\\d+) uger siden" + "for (\\d+[.,]?\\d*) uge siden", + "for (\\d+[.,]?\\d*) uger siden" ], "\\1 year ago": [ - "for (\\d+) år siden" + "for (\\d+[.,]?\\d*) år siden" ], "in \\1 day": [ - "om (\\d+) dag", - "om (\\d+) dage" + "om (\\d+[.,]?\\d*) dag", + "om (\\d+[.,]?\\d*) dage" ], "in \\1 hour": [ - "om (\\d+) time", - "om (\\d+) timer" + "om (\\d+[.,]?\\d*) time", + "om (\\d+[.,]?\\d*) timer" ], "in \\1 minute": [ - "om (\\d+) min", - "om (\\d+) minut", - "om (\\d+) minutter" + "om (\\d+[.,]?\\d*) min", + "om (\\d+[.,]?\\d*) minut", + "om (\\d+[.,]?\\d*) minutter" ], "in \\1 month": [ - "om (\\d+) md", - "om (\\d+) mdr", - "om (\\d+) måned", - "om (\\d+) måneder" + "om (\\d+[.,]?\\d*) md", + "om (\\d+[.,]?\\d*) mdr", + "om (\\d+[.,]?\\d*) måned", + "om (\\d+[.,]?\\d*) måneder" ], "in \\1 second": [ - "om (\\d+) sek", - "om (\\d+) sekund", - "om (\\d+) sekunder" + "om (\\d+[.,]?\\d*) sek", + "om (\\d+[.,]?\\d*) sekund", + "om (\\d+[.,]?\\d*) sekunder" ], "in \\1 week": [ - "om (\\d+) uge", - "om (\\d+) uger" + "om (\\d+[.,]?\\d*) uge", + "om (\\d+[.,]?\\d*) uger" ], "in \\1 year": [ - "om (\\d+) år" + "om (\\d+[.,]?\\d*) år" ] }, "locale_specific": { @@ -272,13 +272,13 @@ "et": "1" }, { - "(\\d+)\\s*hr(s?)": "\\1 time\\2" + "(\\d+[.,]?\\d*)\\s*hr(s?)": "\\1 time\\2" }, { - "(\\d+)\\s*min(s?)": "\\1 minut\\2" + "(\\d+[.,]?\\d*)\\s*min(s?)": "\\1 minut\\2" }, { - "(\\d+)\\s*sec(s?)": "\\1 sekund\\2" + "(\\d+[.,]?\\d*)\\s*sec(s?)": "\\1 sekund\\2" }, { "middag": "12:00" @@ -287,7 +287,7 @@ "midnat": "00:00" }, { - "(\\d+)h(\\d+)m?": "\\1:\\2" + "(\\d+[.,]?\\d*)h(\\d+[.,]?\\d*)m?": "\\1:\\2" }, { "mindre end 1 minut siden": "45 seconds" diff --git a/dateparser/data/date_translation_data/de.py b/dateparser/data/date_translation_data/de.py index 6b3933c4c..0d85c0ee3 100644 --- a/dateparser/data/date_translation_data/de.py +++ b/dateparser/data/date_translation_data/de.py @@ -184,75 +184,75 @@ }, "relative-type-regex": { "\\1 day ago": [ - "vor (\\d+) tag", - "vor (\\d+) tagen" + "vor (\\d+[.,]?\\d*) tag", + "vor (\\d+[.,]?\\d*) tagen" ], "\\1 hour ago": [ - "vor (\\d+) std", - "vor (\\d+) stunde", - "vor (\\d+) stunden", - "vor (\\d+)\\s*h" + "vor (\\d+[.,]?\\d*) std", + "vor (\\d+[.,]?\\d*) stunde", + "vor (\\d+[.,]?\\d*) stunden", + "vor (\\d+[.,]?\\d*)\\s*h" ], "\\1 minute ago": [ - "vor (\\d+) m", - "vor (\\d+) min", - "vor (\\d+) minute", - "vor (\\d+) minuten", - "vor (\\d+)\\s*m" + "vor (\\d+[.,]?\\d*) m", + "vor (\\d+[.,]?\\d*) min", + "vor (\\d+[.,]?\\d*) minute", + "vor (\\d+[.,]?\\d*) minuten", + "vor (\\d+[.,]?\\d*)\\s*m" ], "\\1 month ago": [ - "vor (\\d+) monat", - "vor (\\d+) monaten" + "vor (\\d+[.,]?\\d*) monat", + "vor (\\d+[.,]?\\d*) monaten" ], "\\1 second ago": [ - "vor (\\d+) s", - "vor (\\d+) sek", - "vor (\\d+) sekunde", - "vor (\\d+) sekunden", - "vor (\\d+)\\s*s" + "vor (\\d+[.,]?\\d*) s", + "vor (\\d+[.,]?\\d*) sek", + "vor (\\d+[.,]?\\d*) sekunde", + "vor (\\d+[.,]?\\d*) sekunden", + "vor (\\d+[.,]?\\d*)\\s*s" ], "\\1 week ago": [ - "vor (\\d+) wo", - "vor (\\d+) woche", - "vor (\\d+) wochen" + "vor (\\d+[.,]?\\d*) wo", + "vor (\\d+[.,]?\\d*) woche", + "vor (\\d+[.,]?\\d*) wochen" ], "\\1 year ago": [ - "vor (\\d+) jahr", - "vor (\\d+) jahren" + "vor (\\d+[.,]?\\d*) jahr", + "vor (\\d+[.,]?\\d*) jahren" ], "in \\1 day": [ - "in (\\d+) tag", - "in (\\d+) tagen" + "in (\\d+[.,]?\\d*) tag", + "in (\\d+[.,]?\\d*) tagen" ], "in \\1 hour": [ - "in (\\d+) std", - "in (\\d+) stunde", - "in (\\d+) stunden" + "in (\\d+[.,]?\\d*) std", + "in (\\d+[.,]?\\d*) stunde", + "in (\\d+[.,]?\\d*) stunden" ], "in \\1 minute": [ - "in (\\d+) m", - "in (\\d+) min", - "in (\\d+) minute", - "in (\\d+) minuten" + "in (\\d+[.,]?\\d*) m", + "in (\\d+[.,]?\\d*) min", + "in (\\d+[.,]?\\d*) minute", + "in (\\d+[.,]?\\d*) minuten" ], "in \\1 month": [ - "in (\\d+) monat", - "in (\\d+) monaten" + "in (\\d+[.,]?\\d*) monat", + "in (\\d+[.,]?\\d*) monaten" ], "in \\1 second": [ - "in (\\d+) s", - "in (\\d+) sek", - "in (\\d+) sekunde", - "in (\\d+) sekunden" + "in (\\d+[.,]?\\d*) s", + "in (\\d+[.,]?\\d*) sek", + "in (\\d+[.,]?\\d*) sekunde", + "in (\\d+[.,]?\\d*) sekunden" ], "in \\1 week": [ - "in (\\d+) wo", - "in (\\d+) woche", - "in (\\d+) wochen" + "in (\\d+[.,]?\\d*) wo", + "in (\\d+[.,]?\\d*) woche", + "in (\\d+[.,]?\\d*) wochen" ], "in \\1 year": [ - "in (\\d+) jahr", - "in (\\d+) jahren" + "in (\\d+[.,]?\\d*) jahr", + "in (\\d+[.,]?\\d*) jahren" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/dsb.py b/dateparser/data/date_translation_data/dsb.py index aa92077ff..086d4ed96 100644 --- a/dateparser/data/date_translation_data/dsb.py +++ b/dateparser/data/date_translation_data/dsb.py @@ -174,82 +174,82 @@ }, "relative-type-regex": { "\\1 day ago": [ - "pśed (\\d+) d", - "pśed (\\d+) dnj", - "pśed (\\d+) dnjami", - "pśed (\\d+) dnjom" + "pśed (\\d+[.,]?\\d*) d", + "pśed (\\d+[.,]?\\d*) dnj", + "pśed (\\d+[.,]?\\d*) dnjami", + "pśed (\\d+[.,]?\\d*) dnjom" ], "\\1 hour ago": [ - "pśed (\\d+) g", - "pśed (\\d+) góź", - "pśed (\\d+) góźinami", - "pśed (\\d+) góźinu" + "pśed (\\d+[.,]?\\d*) g", + "pśed (\\d+[.,]?\\d*) góź", + "pśed (\\d+[.,]?\\d*) góźinami", + "pśed (\\d+[.,]?\\d*) góźinu" ], "\\1 minute ago": [ - "pśed (\\d+) m", - "pśed (\\d+) min", - "pśed (\\d+) minutami", - "pśed (\\d+) minutu" + "pśed (\\d+[.,]?\\d*) m", + "pśed (\\d+[.,]?\\d*) min", + "pśed (\\d+[.,]?\\d*) minutami", + "pśed (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "pśed (\\d+) mjas", - "pśed (\\d+) mjasecami", - "pśed (\\d+) mjasecom" + "pśed (\\d+[.,]?\\d*) mjas", + "pśed (\\d+[.,]?\\d*) mjasecami", + "pśed (\\d+[.,]?\\d*) mjasecom" ], "\\1 second ago": [ - "pśed (\\d+) s", - "pśed (\\d+) sek", - "pśed (\\d+) sekundami", - "pśed (\\d+) sekundu" + "pśed (\\d+[.,]?\\d*) s", + "pśed (\\d+[.,]?\\d*) sek", + "pśed (\\d+[.,]?\\d*) sekundami", + "pśed (\\d+[.,]?\\d*) sekundu" ], "\\1 week ago": [ - "pśed (\\d+) tyź", - "pśed (\\d+) tyźenjami", - "pśed (\\d+) tyźenjom" + "pśed (\\d+[.,]?\\d*) tyź", + "pśed (\\d+[.,]?\\d*) tyźenjami", + "pśed (\\d+[.,]?\\d*) tyźenjom" ], "\\1 year ago": [ - "pśed (\\d+) l", - "pśed (\\d+) lětami", - "pśed (\\d+) lětom" + "pśed (\\d+[.,]?\\d*) l", + "pśed (\\d+[.,]?\\d*) lětami", + "pśed (\\d+[.,]?\\d*) lětom" ], "in \\1 day": [ - "za (\\d+) dnj", - "za (\\d+) dnjow", - "za (\\d+) ź", - "za (\\d+) źeń" + "za (\\d+[.,]?\\d*) dnj", + "za (\\d+[.,]?\\d*) dnjow", + "za (\\d+[.,]?\\d*) ź", + "za (\\d+[.,]?\\d*) źeń" ], "in \\1 hour": [ - "za (\\d+) g", - "za (\\d+) góź", - "za (\\d+) góźin", - "za (\\d+) góźinu" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) góź", + "za (\\d+[.,]?\\d*) góźin", + "za (\\d+[.,]?\\d*) góźinu" ], "in \\1 minute": [ - "za (\\d+) m", - "za (\\d+) min", - "za (\\d+) minutow", - "za (\\d+) minutu" + "za (\\d+[.,]?\\d*) m", + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minutow", + "za (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "za (\\d+) mjas", - "za (\\d+) mjasec", - "za (\\d+) mjasecow" + "za (\\d+[.,]?\\d*) mjas", + "za (\\d+[.,]?\\d*) mjasec", + "za (\\d+[.,]?\\d*) mjasecow" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sek", - "za (\\d+) sekundow", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundow", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) tyź", - "za (\\d+) tyźenjow", - "za (\\d+) tyźeń" + "za (\\d+[.,]?\\d*) tyź", + "za (\\d+[.,]?\\d*) tyźenjow", + "za (\\d+[.,]?\\d*) tyźeń" ], "in \\1 year": [ - "za (\\d+) l", - "za (\\d+) lět", - "za (\\d+) lěto" + "za (\\d+[.,]?\\d*) l", + "za (\\d+[.,]?\\d*) lět", + "za (\\d+[.,]?\\d*) lěto" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/dz.py b/dateparser/data/date_translation_data/dz.py index ac25f20ff..d1d9013dd 100644 --- a/dateparser/data/date_translation_data/dz.py +++ b/dateparser/data/date_translation_data/dz.py @@ -165,46 +165,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "ཉིནམ་ (\\d+) ཧེ་མ་" + "ཉིནམ་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 hour ago": [ - "ཆུ་ཚོད་ (\\d+) ཧེ་མ་" + "ཆུ་ཚོད་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 minute ago": [ - "སྐར་མ་ (\\d+) ཧེ་མ་" + "སྐར་མ་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 month ago": [ - "ཟླཝ་ (\\d+) ཧེ་མ་" + "ཟླཝ་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 second ago": [ - "སྐར་ཆ་ (\\d+) ཧེ་མ་" + "སྐར་ཆ་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 week ago": [ - "བངུན་ཕྲག་ (\\d+) ཧེ་མ་" + "བངུན་ཕྲག་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "\\1 year ago": [ - "ལོ་འཁོར་ (\\d+) ཧེ་མ་" + "ལོ་འཁོར་ (\\d+[.,]?\\d*) ཧེ་མ་" ], "in \\1 day": [ - "ཉིནམ་ (\\d+) ནང་" + "ཉིནམ་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 hour": [ - "ཆུ་ཚོད་ (\\d+) ནང་" + "ཆུ་ཚོད་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 minute": [ - "སྐར་མ་ (\\d+) ནང་" + "སྐར་མ་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 month": [ - "ཟླཝ་ (\\d+) ནང་" + "ཟླཝ་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 second": [ - "སྐར་ཆ་ (\\d+) ནང་" + "སྐར་ཆ་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 week": [ - "བངུན་ཕྲག་ (\\d+) ནང་" + "བངུན་ཕྲག་ (\\d+[.,]?\\d*) ནང་" ], "in \\1 year": [ - "ལོ་འཁོར་ (\\d+) ནང་" + "ལོ་འཁོར་ (\\d+[.,]?\\d*) ནང་" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ee.py b/dateparser/data/date_translation_data/ee.py index bfd7b82c2..b6068c50d 100644 --- a/dateparser/data/date_translation_data/ee.py +++ b/dateparser/data/date_translation_data/ee.py @@ -153,62 +153,62 @@ }, "relative-type-regex": { "\\1 day ago": [ - "ŋkeke (\\d+) si va yi", - "ŋkeke (\\d+) si wo va yi" + "ŋkeke (\\d+[.,]?\\d*) si va yi", + "ŋkeke (\\d+[.,]?\\d*) si wo va yi" ], "\\1 hour ago": [ - "gaƒoƒo (\\d+) si va yi", - "gaƒoƒo (\\d+) si wo va yi" + "gaƒoƒo (\\d+[.,]?\\d*) si va yi", + "gaƒoƒo (\\d+[.,]?\\d*) si wo va yi" ], "\\1 minute ago": [ - "aɖabaƒoƒo (\\d+) si va yi", - "aɖabaƒoƒo (\\d+) si wo va yi" + "aɖabaƒoƒo (\\d+[.,]?\\d*) si va yi", + "aɖabaƒoƒo (\\d+[.,]?\\d*) si wo va yi" ], "\\1 month ago": [ - "ɣleti (\\d+) si va yi", - "ɣleti (\\d+) si wo va yi" + "ɣleti (\\d+[.,]?\\d*) si va yi", + "ɣleti (\\d+[.,]?\\d*) si wo va yi" ], "\\1 second ago": [ - "sekend (\\d+) si va yi", - "sekend (\\d+) si wo va yi" + "sekend (\\d+[.,]?\\d*) si va yi", + "sekend (\\d+[.,]?\\d*) si wo va yi" ], "\\1 week ago": [ - "kɔsiɖa (\\d+) si va yi", - "kɔsiɖa (\\d+) si wo va yi" + "kɔsiɖa (\\d+[.,]?\\d*) si va yi", + "kɔsiɖa (\\d+[.,]?\\d*) si wo va yi" ], "\\1 year ago": [ - "le ƒe (\\d+) si va yi me", - "ƒe (\\d+) si va yi", - "ƒe (\\d+) si va yi me", - "ƒe (\\d+) si wo va yi" + "le ƒe (\\d+[.,]?\\d*) si va yi me", + "ƒe (\\d+[.,]?\\d*) si va yi", + "ƒe (\\d+[.,]?\\d*) si va yi me", + "ƒe (\\d+[.,]?\\d*) si wo va yi" ], "in \\1 day": [ - "le ŋkeke (\\d+) me", - "le ŋkeke (\\d+) wo me" + "le ŋkeke (\\d+[.,]?\\d*) me", + "le ŋkeke (\\d+[.,]?\\d*) wo me" ], "in \\1 hour": [ - "le gaƒoƒo (\\d+) me", - "le gaƒoƒo (\\d+) wo me" + "le gaƒoƒo (\\d+[.,]?\\d*) me", + "le gaƒoƒo (\\d+[.,]?\\d*) wo me" ], "in \\1 minute": [ - "le aɖabaƒoƒo (\\d+) me", - "le aɖabaƒoƒo (\\d+) wo me" + "le aɖabaƒoƒo (\\d+[.,]?\\d*) me", + "le aɖabaƒoƒo (\\d+[.,]?\\d*) wo me" ], "in \\1 month": [ - "le ɣleti (\\d+) me", - "le ɣleti (\\d+) wo me" + "le ɣleti (\\d+[.,]?\\d*) me", + "le ɣleti (\\d+[.,]?\\d*) wo me" ], "in \\1 second": [ - "le sekend (\\d+) me", - "le sekend (\\d+) wo me" + "le sekend (\\d+[.,]?\\d*) me", + "le sekend (\\d+[.,]?\\d*) wo me" ], "in \\1 week": [ - "le kɔsiɖa (\\d+) me", - "le kɔsiɖa (\\d+) wo me" + "le kɔsiɖa (\\d+[.,]?\\d*) me", + "le kɔsiɖa (\\d+[.,]?\\d*) wo me" ], "in \\1 year": [ - "le ƒe (\\d+) me", - "le ƒe (\\d+) si gbɔna me" + "le ƒe (\\d+[.,]?\\d*) me", + "le ƒe (\\d+[.,]?\\d*) si gbɔna me" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/el.py b/dateparser/data/date_translation_data/el.py index bf5785db2..12c793285 100644 --- a/dateparser/data/date_translation_data/el.py +++ b/dateparser/data/date_translation_data/el.py @@ -180,81 +180,81 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ημ πριν", - "πριν από (\\d+) ημέρα", - "πριν από (\\d+) ημέρες" + "(\\d+[.,]?\\d*) ημ πριν", + "πριν από (\\d+[.,]?\\d*) ημέρα", + "πριν από (\\d+[.,]?\\d*) ημέρες" ], "\\1 hour ago": [ - "(\\d+) ώ πριν", - "πριν από (\\d+) ώρ", - "πριν από (\\d+) ώρα", - "πριν από (\\d+) ώρες" + "(\\d+[.,]?\\d*) ώ πριν", + "πριν από (\\d+[.,]?\\d*) ώρ", + "πριν από (\\d+[.,]?\\d*) ώρα", + "πριν από (\\d+[.,]?\\d*) ώρες" ], "\\1 minute ago": [ - "(\\d+) λ πριν", - "πριν από (\\d+) λεπ", - "πριν από (\\d+) λεπτά", - "πριν από (\\d+) λεπτό" + "(\\d+[.,]?\\d*) λ πριν", + "πριν από (\\d+[.,]?\\d*) λεπ", + "πριν από (\\d+[.,]?\\d*) λεπτά", + "πριν από (\\d+[.,]?\\d*) λεπτό" ], "\\1 month ago": [ - "(\\d+) μ πριν", - "πριν από (\\d+) μήνα", - "πριν από (\\d+) μήνες" + "(\\d+[.,]?\\d*) μ πριν", + "πριν από (\\d+[.,]?\\d*) μήνα", + "πριν από (\\d+[.,]?\\d*) μήνες" ], "\\1 second ago": [ - "(\\d+) δ πριν", - "πριν από (\\d+) δευτ", - "πριν από (\\d+) δευτερόλεπτα", - "πριν από (\\d+) δευτερόλεπτο" + "(\\d+[.,]?\\d*) δ πριν", + "πριν από (\\d+[.,]?\\d*) δευτ", + "πριν από (\\d+[.,]?\\d*) δευτερόλεπτα", + "πριν από (\\d+[.,]?\\d*) δευτερόλεπτο" ], "\\1 week ago": [ - "(\\d+) εβδ πριν", - "πριν από (\\d+) εβδ", - "πριν από (\\d+) εβδομάδα", - "πριν από (\\d+) εβδομάδες" + "(\\d+[.,]?\\d*) εβδ πριν", + "πριν από (\\d+[.,]?\\d*) εβδ", + "πριν από (\\d+[.,]?\\d*) εβδομάδα", + "πριν από (\\d+[.,]?\\d*) εβδομάδες" ], "\\1 year ago": [ - "(\\d+) έτη πριν", - "(\\d+) έτος πριν", - "πριν από (\\d+) έτη", - "πριν από (\\d+) έτος" + "(\\d+[.,]?\\d*) έτη πριν", + "(\\d+[.,]?\\d*) έτος πριν", + "πριν από (\\d+[.,]?\\d*) έτη", + "πριν από (\\d+[.,]?\\d*) έτος" ], "in \\1 day": [ - "σε (\\d+) ημ", - "σε (\\d+) ημέρα", - "σε (\\d+) ημέρες" + "σε (\\d+[.,]?\\d*) ημ", + "σε (\\d+[.,]?\\d*) ημέρα", + "σε (\\d+[.,]?\\d*) ημέρες" ], "in \\1 hour": [ - "σε (\\d+) ώ", - "σε (\\d+) ώρ", - "σε (\\d+) ώρα", - "σε (\\d+) ώρες" + "σε (\\d+[.,]?\\d*) ώ", + "σε (\\d+[.,]?\\d*) ώρ", + "σε (\\d+[.,]?\\d*) ώρα", + "σε (\\d+[.,]?\\d*) ώρες" ], "in \\1 minute": [ - "σε (\\d+) λ", - "σε (\\d+) λεπ", - "σε (\\d+) λεπτά", - "σε (\\d+) λεπτό" + "σε (\\d+[.,]?\\d*) λ", + "σε (\\d+[.,]?\\d*) λεπ", + "σε (\\d+[.,]?\\d*) λεπτά", + "σε (\\d+[.,]?\\d*) λεπτό" ], "in \\1 month": [ - "σε (\\d+) μ", - "σε (\\d+) μήνα", - "σε (\\d+) μήνες" + "σε (\\d+[.,]?\\d*) μ", + "σε (\\d+[.,]?\\d*) μήνα", + "σε (\\d+[.,]?\\d*) μήνες" ], "in \\1 second": [ - "σε (\\d+) δ", - "σε (\\d+) δευτ", - "σε (\\d+) δευτερόλεπτα", - "σε (\\d+) δευτερόλεπτο" + "σε (\\d+[.,]?\\d*) δ", + "σε (\\d+[.,]?\\d*) δευτ", + "σε (\\d+[.,]?\\d*) δευτερόλεπτα", + "σε (\\d+[.,]?\\d*) δευτερόλεπτο" ], "in \\1 week": [ - "σε (\\d+) εβδ", - "σε (\\d+) εβδομάδα", - "σε (\\d+) εβδομάδες" + "σε (\\d+[.,]?\\d*) εβδ", + "σε (\\d+[.,]?\\d*) εβδομάδα", + "σε (\\d+[.,]?\\d*) εβδομάδες" ], "in \\1 year": [ - "σε (\\d+) έτη", - "σε (\\d+) έτος" + "σε (\\d+[.,]?\\d*) έτη", + "σε (\\d+[.,]?\\d*) έτος" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/en.py b/dateparser/data/date_translation_data/en.py index 62e2649c2..4ba4a9e23 100644 --- a/dateparser/data/date_translation_data/en.py +++ b/dateparser/data/date_translation_data/en.py @@ -192,78 +192,78 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) day ago", - "(\\d+) days ago" + "(\\d+[.,]?\\d*) day ago", + "(\\d+[.,]?\\d*) days ago" ], "\\1 hour ago": [ - "(\\d+) hour ago", - "(\\d+) hours ago", - "(\\d+) hr ago" + "(\\d+[.,]?\\d*) hour ago", + "(\\d+[.,]?\\d*) hours ago", + "(\\d+[.,]?\\d*) hr ago" ], "\\1 minute ago": [ - "(\\d+) min ago", - "(\\d+) minute ago", - "(\\d+) minutes ago" + "(\\d+[.,]?\\d*) min ago", + "(\\d+[.,]?\\d*) minute ago", + "(\\d+[.,]?\\d*) minutes ago" ], "\\1 month ago": [ - "(\\d+) mo ago", - "(\\d+) month ago", - "(\\d+) months ago" + "(\\d+[.,]?\\d*) mo ago", + "(\\d+[.,]?\\d*) month ago", + "(\\d+[.,]?\\d*) months ago" ], "\\1 second ago": [ - "(\\d+) sec ago", - "(\\d+) second ago", - "(\\d+) seconds ago" + "(\\d+[.,]?\\d*) sec ago", + "(\\d+[.,]?\\d*) second ago", + "(\\d+[.,]?\\d*) seconds ago" ], "\\1 week ago": [ - "(\\d+) week ago", - "(\\d+) weeks ago", - "(\\d+) wk ago" + "(\\d+[.,]?\\d*) week ago", + "(\\d+[.,]?\\d*) weeks ago", + "(\\d+[.,]?\\d*) wk ago" ], "\\1 year ago": [ - "(\\d+) year ago", - "(\\d+) years ago", - "(\\d+) yr ago" + "(\\d+[.,]?\\d*) year ago", + "(\\d+[.,]?\\d*) years ago", + "(\\d+[.,]?\\d*) yr ago" ], "in \\1 day": [ - "in (\\d+) day", - "in (\\d+) days" + "in (\\d+[.,]?\\d*) day", + "in (\\d+[.,]?\\d*) days" ], "in \\1 hour": [ - "in (\\d+) hour", - "in (\\d+) hours", - "in (\\d+) hr" + "in (\\d+[.,]?\\d*) hour", + "in (\\d+[.,]?\\d*) hours", + "in (\\d+[.,]?\\d*) hr" ], "in \\1 minute": [ - "in (\\d+) min", - "in (\\d+) minute", - "in (\\d+) minutes" + "in (\\d+[.,]?\\d*) min", + "in (\\d+[.,]?\\d*) minute", + "in (\\d+[.,]?\\d*) minutes" ], "in \\1 month": [ - "in (\\d+) mo", - "in (\\d+) month", - "in (\\d+) months" + "in (\\d+[.,]?\\d*) mo", + "in (\\d+[.,]?\\d*) month", + "in (\\d+[.,]?\\d*) months" ], "in \\1 second": [ - "in (\\d+) sec", - "in (\\d+) second", - "in (\\d+) seconds" + "in (\\d+[.,]?\\d*) sec", + "in (\\d+[.,]?\\d*) second", + "in (\\d+[.,]?\\d*) seconds" ], "in \\1 week": [ - "in (\\d+) week", - "in (\\d+) weeks", - "in (\\d+) wk" + "in (\\d+[.,]?\\d*) week", + "in (\\d+[.,]?\\d*) weeks", + "in (\\d+[.,]?\\d*) wk" ], "in \\1 year": [ - "in (\\d+) year", - "in (\\d+) years", - "in (\\d+) yr" + "in (\\d+[.,]?\\d*) year", + "in (\\d+[.,]?\\d*) years", + "in (\\d+[.,]?\\d*) yr" ], "in \\1 decade": [ - "in (\\d+) decades?" + "in (\\d+[.,]?\\d*) decades?" ], "\\1 decade ago": [ - "(\\d+) decades? ago" + "(\\d+[.,]?\\d*) decades? ago" ] }, "locale_specific": { @@ -329,40 +329,40 @@ "date_order": "YMD", "relative-type-regex": { "\\1 hour ago": [ - "(\\d+) hrs ago" + "(\\d+[.,]?\\d*) hrs ago" ], "\\1 minute ago": [ - "(\\d+) mins ago" + "(\\d+[.,]?\\d*) mins ago" ], "\\1 month ago": [ - "(\\d+) mos ago" + "(\\d+[.,]?\\d*) mos ago" ], "\\1 second ago": [ - "(\\d+) secs ago" + "(\\d+[.,]?\\d*) secs ago" ], "\\1 week ago": [ - "(\\d+) wks ago" + "(\\d+[.,]?\\d*) wks ago" ], "\\1 year ago": [ - "(\\d+) yrs ago" + "(\\d+[.,]?\\d*) yrs ago" ], "in \\1 hour": [ - "in (\\d+) hrs" + "in (\\d+[.,]?\\d*) hrs" ], "in \\1 minute": [ - "in (\\d+) mins" + "in (\\d+[.,]?\\d*) mins" ], "in \\1 month": [ - "in (\\d+) mos" + "in (\\d+[.,]?\\d*) mos" ], "in \\1 second": [ - "in (\\d+) secs" + "in (\\d+[.,]?\\d*) secs" ], "in \\1 week": [ - "in (\\d+) wks" + "in (\\d+[.,]?\\d*) wks" ], "in \\1 year": [ - "in (\\d+) yrs" + "in (\\d+[.,]?\\d*) yrs" ] } }, @@ -641,10 +641,10 @@ }, "relative-type-regex": { "\\1 month ago": [ - "(\\d+) mth ago" + "(\\d+[.,]?\\d*) mth ago" ], "in \\1 month": [ - "in (\\d+) mth" + "in (\\d+[.,]?\\d*) mth" ] } }, @@ -792,7 +792,7 @@ "(?:12\\s+)?midnight": "00:00" }, { - "(\\d+)h(\\d+)m?": "\\1:\\2" + "(\\d+[.,]?\\d*)h(\\d+[.,]?\\d*)m?": "\\1:\\2" }, { "(?<=from\\s+)now": "in" diff --git a/dateparser/data/date_translation_data/es.py b/dateparser/data/date_translation_data/es.py index bdf86772e..ea36dbf81 100644 --- a/dateparser/data/date_translation_data/es.py +++ b/dateparser/data/date_translation_data/es.py @@ -179,72 +179,72 @@ }, "relative-type-regex": { "\\1 day ago": [ - "hace (\\d+) día", - "hace (\\d+) días" + "hace (\\d+[.,]?\\d*) día", + "hace (\\d+[.,]?\\d*) días" ], "\\1 hour ago": [ - "hace (\\d+) h", - "hace (\\d+) hora", - "hace (\\d+) horas" + "hace (\\d+[.,]?\\d*) h", + "hace (\\d+[.,]?\\d*) hora", + "hace (\\d+[.,]?\\d*) horas" ], "\\1 minute ago": [ - "hace (\\d+) min", - "hace (\\d+) minuto", - "hace (\\d+) minutos" + "hace (\\d+[.,]?\\d*) min", + "hace (\\d+[.,]?\\d*) minuto", + "hace (\\d+[.,]?\\d*) minutos" ], "\\1 month ago": [ - "hace (\\d+) m", - "hace (\\d+) mes", - "hace (\\d+) meses" + "hace (\\d+[.,]?\\d*) m", + "hace (\\d+[.,]?\\d*) mes", + "hace (\\d+[.,]?\\d*) meses" ], "\\1 second ago": [ - "hace (\\d+) s", - "hace (\\d+) segundo", - "hace (\\d+) segundos" + "hace (\\d+[.,]?\\d*) s", + "hace (\\d+[.,]?\\d*) segundo", + "hace (\\d+[.,]?\\d*) segundos" ], "\\1 week ago": [ - "hace (\\d+) sem", - "hace (\\d+) semana", - "hace (\\d+) semanas" + "hace (\\d+[.,]?\\d*) sem", + "hace (\\d+[.,]?\\d*) semana", + "hace (\\d+[.,]?\\d*) semanas" ], "\\1 year ago": [ - "hace (\\d+) a", - "hace (\\d+) año", - "hace (\\d+) años" + "hace (\\d+[.,]?\\d*) a", + "hace (\\d+[.,]?\\d*) año", + "hace (\\d+[.,]?\\d*) años" ], "in \\1 day": [ - "dentro de (\\d+) día", - "dentro de (\\d+) días" + "dentro de (\\d+[.,]?\\d*) día", + "dentro de (\\d+[.,]?\\d*) días" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) m", - "dentro de (\\d+) mes", - "dentro de (\\d+) meses" + "dentro de (\\d+[.,]?\\d*) m", + "dentro de (\\d+[.,]?\\d*) mes", + "dentro de (\\d+[.,]?\\d*) meses" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) a", - "dentro de (\\d+) año", - "dentro de (\\d+) años" + "dentro de (\\d+[.,]?\\d*) a", + "dentro de (\\d+[.,]?\\d*) año", + "dentro de (\\d+[.,]?\\d*) años" ] }, "locale_specific": { @@ -264,10 +264,10 @@ ], "relative-type-regex": { "\\1 second ago": [ - "hace (\\d+) seg" + "hace (\\d+[.,]?\\d*) seg" ], "in \\1 second": [ - "dentro de (\\d+) seg" + "dentro de (\\d+[.,]?\\d*) seg" ] } }, @@ -364,29 +364,29 @@ }, "relative-type-regex": { "in \\1 day": [ - "en (\\d+) día", - "en (\\d+) días" + "en (\\d+[.,]?\\d*) día", + "en (\\d+[.,]?\\d*) días" ], "in \\1 hour": [ - "en (\\d+) h", - "en (\\d+) n" + "en (\\d+[.,]?\\d*) h", + "en (\\d+[.,]?\\d*) n" ], "in \\1 minute": [ - "en (\\d+) min" + "en (\\d+[.,]?\\d*) min" ], "in \\1 month": [ - "en (\\d+) m", - "en (\\d+) mes", - "en (\\d+) meses" + "en (\\d+[.,]?\\d*) m", + "en (\\d+[.,]?\\d*) mes", + "en (\\d+[.,]?\\d*) meses" ], "in \\1 second": [ - "en (\\d+) s" + "en (\\d+[.,]?\\d*) s" ], "in \\1 week": [ - "en (\\d+) sem" + "en (\\d+[.,]?\\d*) sem" ], "in \\1 year": [ - "en (\\d+) a" + "en (\\d+[.,]?\\d*) a" ] } }, @@ -427,10 +427,10 @@ ], "relative-type-regex": { "\\1 second ago": [ - "hace (\\d+) seg" + "hace (\\d+[.,]?\\d*) seg" ], "in \\1 second": [ - "dentro de (\\d+) seg" + "dentro de (\\d+[.,]?\\d*) seg" ] } }, diff --git a/dateparser/data/date_translation_data/et.py b/dateparser/data/date_translation_data/et.py index 77948dcd6..d17276fb5 100644 --- a/dateparser/data/date_translation_data/et.py +++ b/dateparser/data/date_translation_data/et.py @@ -157,62 +157,62 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) p eest", - "(\\d+) päeva eest" + "(\\d+[.,]?\\d*) p eest", + "(\\d+[.,]?\\d*) päeva eest" ], "\\1 hour ago": [ - "(\\d+) t eest", - "(\\d+) tunni eest" + "(\\d+[.,]?\\d*) t eest", + "(\\d+[.,]?\\d*) tunni eest" ], "\\1 minute ago": [ - "(\\d+) min eest", - "(\\d+) minuti eest" + "(\\d+[.,]?\\d*) min eest", + "(\\d+[.,]?\\d*) minuti eest" ], "\\1 month ago": [ - "(\\d+) k eest", - "(\\d+) kuu eest" + "(\\d+[.,]?\\d*) k eest", + "(\\d+[.,]?\\d*) kuu eest" ], "\\1 second ago": [ - "(\\d+) s eest", - "(\\d+) sek eest", - "(\\d+) sekundi eest" + "(\\d+[.,]?\\d*) s eest", + "(\\d+[.,]?\\d*) sek eest", + "(\\d+[.,]?\\d*) sekundi eest" ], "\\1 week ago": [ - "(\\d+) näd eest", - "(\\d+) nädala eest" + "(\\d+[.,]?\\d*) näd eest", + "(\\d+[.,]?\\d*) nädala eest" ], "\\1 year ago": [ - "(\\d+) a eest", - "(\\d+) aasta eest" + "(\\d+[.,]?\\d*) a eest", + "(\\d+[.,]?\\d*) aasta eest" ], "in \\1 day": [ - "(\\d+) p pärast", - "(\\d+) päeva pärast" + "(\\d+[.,]?\\d*) p pärast", + "(\\d+[.,]?\\d*) päeva pärast" ], "in \\1 hour": [ - "(\\d+) t pärast", - "(\\d+) tunni pärast" + "(\\d+[.,]?\\d*) t pärast", + "(\\d+[.,]?\\d*) tunni pärast" ], "in \\1 minute": [ - "(\\d+) min pärast", - "(\\d+) minuti pärast" + "(\\d+[.,]?\\d*) min pärast", + "(\\d+[.,]?\\d*) minuti pärast" ], "in \\1 month": [ - "(\\d+) k pärast", - "(\\d+) kuu pärast" + "(\\d+[.,]?\\d*) k pärast", + "(\\d+[.,]?\\d*) kuu pärast" ], "in \\1 second": [ - "(\\d+) s pärast", - "(\\d+) sek pärast", - "(\\d+) sekundi pärast" + "(\\d+[.,]?\\d*) s pärast", + "(\\d+[.,]?\\d*) sek pärast", + "(\\d+[.,]?\\d*) sekundi pärast" ], "in \\1 week": [ - "(\\d+) näd pärast", - "(\\d+) nädala pärast" + "(\\d+[.,]?\\d*) näd pärast", + "(\\d+[.,]?\\d*) nädala pärast" ], "in \\1 year": [ - "(\\d+) a pärast", - "(\\d+) aasta pärast" + "(\\d+[.,]?\\d*) a pärast", + "(\\d+[.,]?\\d*) aasta pärast" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/eu.py b/dateparser/data/date_translation_data/eu.py index b47100228..2e8a6c436 100644 --- a/dateparser/data/date_translation_data/eu.py +++ b/dateparser/data/date_translation_data/eu.py @@ -159,46 +159,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "duela (\\d+) egun" + "duela (\\d+[.,]?\\d*) egun" ], "\\1 hour ago": [ - "duela (\\d+) ordu" + "duela (\\d+[.,]?\\d*) ordu" ], "\\1 minute ago": [ - "duela (\\d+) minutu" + "duela (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "duela (\\d+) hilabete" + "duela (\\d+[.,]?\\d*) hilabete" ], "\\1 second ago": [ - "duela (\\d+) segundo" + "duela (\\d+[.,]?\\d*) segundo" ], "\\1 week ago": [ - "duela (\\d+) aste" + "duela (\\d+[.,]?\\d*) aste" ], "\\1 year ago": [ - "duela (\\d+) urte" + "duela (\\d+[.,]?\\d*) urte" ], "in \\1 day": [ - "(\\d+) egun barru" + "(\\d+[.,]?\\d*) egun barru" ], "in \\1 hour": [ - "(\\d+) ordu barru" + "(\\d+[.,]?\\d*) ordu barru" ], "in \\1 minute": [ - "(\\d+) minutu barru" + "(\\d+[.,]?\\d*) minutu barru" ], "in \\1 month": [ - "(\\d+) hilabete barru" + "(\\d+[.,]?\\d*) hilabete barru" ], "in \\1 second": [ - "(\\d+) segundo barru" + "(\\d+[.,]?\\d*) segundo barru" ], "in \\1 week": [ - "(\\d+) aste barru" + "(\\d+[.,]?\\d*) aste barru" ], "in \\1 year": [ - "(\\d+) urte barru" + "(\\d+[.,]?\\d*) urte barru" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/fa.py b/dateparser/data/date_translation_data/fa.py index e68fbc408..8fa28ceaf 100644 --- a/dateparser/data/date_translation_data/fa.py +++ b/dateparser/data/date_translation_data/fa.py @@ -160,46 +160,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) روز پیش" + "(\\d+[.,]?\\d*) روز پیش" ], "\\1 hour ago": [ - "(\\d+) ساعت پیش" + "(\\d+[.,]?\\d*) ساعت پیش" ], "\\1 minute ago": [ - "(\\d+) دقیقه پیش" + "(\\d+[.,]?\\d*) دقیقه پیش" ], "\\1 month ago": [ - "(\\d+) ماه پیش" + "(\\d+[.,]?\\d*) ماه پیش" ], "\\1 second ago": [ - "(\\d+) ثانیه پیش" + "(\\d+[.,]?\\d*) ثانیه پیش" ], "\\1 week ago": [ - "(\\d+) هفته پیش" + "(\\d+[.,]?\\d*) هفته پیش" ], "\\1 year ago": [ - "(\\d+) سال پیش" + "(\\d+[.,]?\\d*) سال پیش" ], "in \\1 day": [ - "(\\d+) روز بعد" + "(\\d+[.,]?\\d*) روز بعد" ], "in \\1 hour": [ - "(\\d+) ساعت بعد" + "(\\d+[.,]?\\d*) ساعت بعد" ], "in \\1 minute": [ - "(\\d+) دقیقه بعد" + "(\\d+[.,]?\\d*) دقیقه بعد" ], "in \\1 month": [ - "(\\d+) ماه بعد" + "(\\d+[.,]?\\d*) ماه بعد" ], "in \\1 second": [ - "(\\d+) ثانیه بعد" + "(\\d+[.,]?\\d*) ثانیه بعد" ], "in \\1 week": [ - "(\\d+) هفته بعد" + "(\\d+[.,]?\\d*) هفته بعد" ], "in \\1 year": [ - "(\\d+) سال بعد" + "(\\d+[.,]?\\d*) سال بعد" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/fi.py b/dateparser/data/date_translation_data/fi.py index 4dc802f5a..3b8f7646e 100644 --- a/dateparser/data/date_translation_data/fi.py +++ b/dateparser/data/date_translation_data/fi.py @@ -250,67 +250,67 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) pv sitten", - "(\\d+) päivä sitten", - "(\\d+) päivää sitten" + "(\\d+[.,]?\\d*) pv sitten", + "(\\d+[.,]?\\d*) päivä sitten", + "(\\d+[.,]?\\d*) päivää sitten" ], "\\1 hour ago": [ - "(\\d+) t sitten", - "(\\d+) tunti sitten", - "(\\d+) tuntia sitten" + "(\\d+[.,]?\\d*) t sitten", + "(\\d+[.,]?\\d*) tunti sitten", + "(\\d+[.,]?\\d*) tuntia sitten" ], "\\1 minute ago": [ - "(\\d+) min sitten", - "(\\d+) minuutti sitten", - "(\\d+) minuuttia sitten" + "(\\d+[.,]?\\d*) min sitten", + "(\\d+[.,]?\\d*) minuutti sitten", + "(\\d+[.,]?\\d*) minuuttia sitten" ], "\\1 month ago": [ - "(\\d+) kk sitten", - "(\\d+) kuukausi sitten", - "(\\d+) kuukautta sitten" + "(\\d+[.,]?\\d*) kk sitten", + "(\\d+[.,]?\\d*) kuukausi sitten", + "(\\d+[.,]?\\d*) kuukautta sitten" ], "\\1 second ago": [ - "(\\d+) s sitten", - "(\\d+) sekunti sitten", - "(\\d+) sekuntia sitten" + "(\\d+[.,]?\\d*) s sitten", + "(\\d+[.,]?\\d*) sekunti sitten", + "(\\d+[.,]?\\d*) sekuntia sitten" ], "\\1 week ago": [ - "(\\d+) viikko sitten", - "(\\d+) viikkoa sitten", - "(\\d+) vk sitten" + "(\\d+[.,]?\\d*) viikko sitten", + "(\\d+[.,]?\\d*) viikkoa sitten", + "(\\d+[.,]?\\d*) vk sitten" ], "\\1 year ago": [ - "(\\d+) v sitten", - "(\\d+) vuosi sitten", - "(\\d+) vuotta sitten" + "(\\d+[.,]?\\d*) v sitten", + "(\\d+[.,]?\\d*) vuosi sitten", + "(\\d+[.,]?\\d*) vuotta sitten" ], "in \\1 day": [ - "(\\d+) pv päästä", - "(\\d+) päivän päästä" + "(\\d+[.,]?\\d*) pv päästä", + "(\\d+[.,]?\\d*) päivän päästä" ], "in \\1 hour": [ - "(\\d+) t päästä", - "(\\d+) tunnin päästä" + "(\\d+[.,]?\\d*) t päästä", + "(\\d+[.,]?\\d*) tunnin päästä" ], "in \\1 minute": [ - "(\\d+) min päästä", - "(\\d+) minuutin päästä" + "(\\d+[.,]?\\d*) min päästä", + "(\\d+[.,]?\\d*) minuutin päästä" ], "in \\1 month": [ - "(\\d+) kk päästä", - "(\\d+) kuukauden päästä" + "(\\d+[.,]?\\d*) kk päästä", + "(\\d+[.,]?\\d*) kuukauden päästä" ], "in \\1 second": [ - "(\\d+) s päästä", - "(\\d+) sekunnin päästä" + "(\\d+[.,]?\\d*) s päästä", + "(\\d+[.,]?\\d*) sekunnin päästä" ], "in \\1 week": [ - "(\\d+) viikon päästä", - "(\\d+) vk päästä" + "(\\d+[.,]?\\d*) viikon päästä", + "(\\d+[.,]?\\d*) vk päästä" ], "in \\1 year": [ - "(\\d+) v päästä", - "(\\d+) vuoden päästä" + "(\\d+[.,]?\\d*) v päästä", + "(\\d+[.,]?\\d*) vuoden päästä" ] }, "locale_specific": {}, @@ -339,7 +339,7 @@ ], "simplifications": [ { - "(\\d+) (sekunnin|sekuntin|minuutin|tunnin|päivän|viikon|kuukauden|vuoden) (päästä|kuluttua)": "\\3 \\1 \\2" + "(\\d+[.,]?\\d*) (sekunnin|sekuntin|minuutin|tunnin|päivän|viikon|kuukauden|vuoden) (päästä|kuluttua)": "\\3 \\1 \\2" } ] } diff --git a/dateparser/data/date_translation_data/fil.py b/dateparser/data/date_translation_data/fil.py index fbe540a20..e2e598803 100644 --- a/dateparser/data/date_translation_data/fil.py +++ b/dateparser/data/date_translation_data/fil.py @@ -157,52 +157,52 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) araw ang nakalipas" + "(\\d+[.,]?\\d*) araw ang nakalipas" ], "\\1 hour ago": [ - "(\\d+) oras ang nakalipas", - "(\\d+) oras nakalipas" + "(\\d+[.,]?\\d*) oras ang nakalipas", + "(\\d+[.,]?\\d*) oras nakalipas" ], "\\1 minute ago": [ - "(\\d+) min ang nakalipas", - "(\\d+) minuto ang nakalipas" + "(\\d+[.,]?\\d*) min ang nakalipas", + "(\\d+[.,]?\\d*) minuto ang nakalipas" ], "\\1 month ago": [ - "(\\d+) buwan ang nakalipas" + "(\\d+[.,]?\\d*) buwan ang nakalipas" ], "\\1 second ago": [ - "(\\d+) seg ang nakalipas", - "(\\d+) seg nakalipas", - "(\\d+) segundo ang nakalipas" + "(\\d+[.,]?\\d*) seg ang nakalipas", + "(\\d+[.,]?\\d*) seg nakalipas", + "(\\d+[.,]?\\d*) segundo ang nakalipas" ], "\\1 week ago": [ - "(\\d+) linggo ang nakalipas" + "(\\d+[.,]?\\d*) linggo ang nakalipas" ], "\\1 year ago": [ - "(\\d+) taon ang nakalipas" + "(\\d+[.,]?\\d*) taon ang nakalipas" ], "in \\1 day": [ - "sa (\\d+) araw" + "sa (\\d+[.,]?\\d*) araw" ], "in \\1 hour": [ - "sa (\\d+) oras" + "sa (\\d+[.,]?\\d*) oras" ], "in \\1 minute": [ - "sa (\\d+) min", - "sa (\\d+) minuto" + "sa (\\d+[.,]?\\d*) min", + "sa (\\d+[.,]?\\d*) minuto" ], "in \\1 month": [ - "sa (\\d+) buwan" + "sa (\\d+[.,]?\\d*) buwan" ], "in \\1 second": [ - "sa (\\d+) seg", - "sa (\\d+) segundo" + "sa (\\d+[.,]?\\d*) seg", + "sa (\\d+[.,]?\\d*) segundo" ], "in \\1 week": [ - "sa (\\d+) linggo" + "sa (\\d+[.,]?\\d*) linggo" ], "in \\1 year": [ - "sa (\\d+) taon" + "sa (\\d+[.,]?\\d*) taon" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/fo.py b/dateparser/data/date_translation_data/fo.py index 6efa8776b..d1ffe66a2 100644 --- a/dateparser/data/date_translation_data/fo.py +++ b/dateparser/data/date_translation_data/fo.py @@ -162,76 +162,76 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) d síðan", - "(\\d+) da síðan", - "(\\d+) dagar síðan", - "(\\d+) dagur síðan" + "(\\d+[.,]?\\d*) d síðan", + "(\\d+[.,]?\\d*) da síðan", + "(\\d+[.,]?\\d*) dagar síðan", + "(\\d+[.,]?\\d*) dagur síðan" ], "\\1 hour ago": [ - "(\\d+) t síðan", - "(\\d+) tímar síðan", - "(\\d+) tími síðan" + "(\\d+[.,]?\\d*) t síðan", + "(\\d+[.,]?\\d*) tímar síðan", + "(\\d+[.,]?\\d*) tími síðan" ], "\\1 minute ago": [ - "(\\d+) m síðan", - "(\\d+) min síðan", - "(\\d+) minutt síðan", - "(\\d+) minuttir síðan" + "(\\d+[.,]?\\d*) m síðan", + "(\\d+[.,]?\\d*) min síðan", + "(\\d+[.,]?\\d*) minutt síðan", + "(\\d+[.,]?\\d*) minuttir síðan" ], "\\1 month ago": [ - "(\\d+) mnð síðan", - "(\\d+) mánað síðan", - "(\\d+) mánaðir síðan" + "(\\d+[.,]?\\d*) mnð síðan", + "(\\d+[.,]?\\d*) mánað síðan", + "(\\d+[.,]?\\d*) mánaðir síðan" ], "\\1 second ago": [ - "(\\d+) s síðan", - "(\\d+) sek síðan", - "(\\d+) sekund síðan" + "(\\d+[.,]?\\d*) s síðan", + "(\\d+[.,]?\\d*) sek síðan", + "(\\d+[.,]?\\d*) sekund síðan" ], "\\1 week ago": [ - "(\\d+) v síðan", - "(\\d+) vi síðan", - "(\\d+) vika síðan", - "(\\d+) vikur síðan" + "(\\d+[.,]?\\d*) v síðan", + "(\\d+[.,]?\\d*) vi síðan", + "(\\d+[.,]?\\d*) vika síðan", + "(\\d+[.,]?\\d*) vikur síðan" ], "\\1 year ago": [ - "(\\d+) ár síðan" + "(\\d+[.,]?\\d*) ár síðan" ], "in \\1 day": [ - "um (\\d+) d", - "um (\\d+) da", - "um (\\d+) dag", - "um (\\d+) dagar" + "um (\\d+[.,]?\\d*) d", + "um (\\d+[.,]?\\d*) da", + "um (\\d+[.,]?\\d*) dag", + "um (\\d+[.,]?\\d*) dagar" ], "in \\1 hour": [ - "um (\\d+) t", - "um (\\d+) tíma", - "um (\\d+) tímar" + "um (\\d+[.,]?\\d*) t", + "um (\\d+[.,]?\\d*) tíma", + "um (\\d+[.,]?\\d*) tímar" ], "in \\1 minute": [ - "um (\\d+) m", - "um (\\d+) min", - "um (\\d+) minutt", - "um (\\d+) minuttir" + "um (\\d+[.,]?\\d*) m", + "um (\\d+[.,]?\\d*) min", + "um (\\d+[.,]?\\d*) minutt", + "um (\\d+[.,]?\\d*) minuttir" ], "in \\1 month": [ - "um (\\d+) mnð", - "um (\\d+) mánað", - "um (\\d+) mánaðir" + "um (\\d+[.,]?\\d*) mnð", + "um (\\d+[.,]?\\d*) mánað", + "um (\\d+[.,]?\\d*) mánaðir" ], "in \\1 second": [ - "um (\\d+) s", - "um (\\d+) sek", - "um (\\d+) sekund" + "um (\\d+[.,]?\\d*) s", + "um (\\d+[.,]?\\d*) sek", + "um (\\d+[.,]?\\d*) sekund" ], "in \\1 week": [ - "um (\\d+) v", - "um (\\d+) vi", - "um (\\d+) viku", - "um (\\d+) vikur" + "um (\\d+[.,]?\\d*) v", + "um (\\d+[.,]?\\d*) vi", + "um (\\d+[.,]?\\d*) viku", + "um (\\d+[.,]?\\d*) vikur" ], "in \\1 year": [ - "um (\\d+) ár" + "um (\\d+[.,]?\\d*) ár" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/fr.py b/dateparser/data/date_translation_data/fr.py index ba2d1a498..ee7f4c5ba 100644 --- a/dateparser/data/date_translation_data/fr.py +++ b/dateparser/data/date_translation_data/fr.py @@ -183,75 +183,75 @@ }, "relative-type-regex": { "\\1 day ago": [ - "il y a (\\d+) j", - "il y a (\\d+) jour", - "il y a (\\d+) jours" + "il y a (\\d+[.,]?\\d*) j", + "il y a (\\d+[.,]?\\d*) jour", + "il y a (\\d+[.,]?\\d*) jours" ], "\\1 hour ago": [ - "il y a (\\d+) h", - "il y a (\\d+) heure", - "il y a (\\d+) heures", - "il y a (\\d+)h" + "il y a (\\d+[.,]?\\d*) h", + "il y a (\\d+[.,]?\\d*) heure", + "il y a (\\d+[.,]?\\d*) heures", + "il y a (\\d+[.,]?\\d*)h" ], "\\1 minute ago": [ - "il y a (\\d+) min", - "il y a (\\d+) minute", - "il y a (\\d+) minutes", - "il y a (\\d+)min" + "il y a (\\d+[.,]?\\d*) min", + "il y a (\\d+[.,]?\\d*) minute", + "il y a (\\d+[.,]?\\d*) minutes", + "il y a (\\d+[.,]?\\d*)min" ], "\\1 month ago": [ - "il y a (\\d+) m", - "il y a (\\d+) mois" + "il y a (\\d+[.,]?\\d*) m", + "il y a (\\d+[.,]?\\d*) mois" ], "\\1 second ago": [ - "il y a (\\d+) s", - "il y a (\\d+) seconde", - "il y a (\\d+) secondes" + "il y a (\\d+[.,]?\\d*) s", + "il y a (\\d+[.,]?\\d*) seconde", + "il y a (\\d+[.,]?\\d*) secondes" ], "\\1 week ago": [ - "il y a (\\d+) sem", - "il y a (\\d+) semaine", - "il y a (\\d+) semaines" + "il y a (\\d+[.,]?\\d*) sem", + "il y a (\\d+[.,]?\\d*) semaine", + "il y a (\\d+[.,]?\\d*) semaines" ], "\\1 year ago": [ - "il y a (\\d+) a", - "il y a (\\d+) an", - "il y a (\\d+) ans" + "il y a (\\d+[.,]?\\d*) a", + "il y a (\\d+[.,]?\\d*) an", + "il y a (\\d+[.,]?\\d*) ans" ], "in \\1 day": [ - "dans (\\d+) j", - "dans (\\d+) jour", - "dans (\\d+) jours" + "dans (\\d+[.,]?\\d*) j", + "dans (\\d+[.,]?\\d*) jour", + "dans (\\d+[.,]?\\d*) jours" ], "in \\1 hour": [ - "dans (\\d+) h", - "dans (\\d+) heure", - "dans (\\d+) heures", - "dans (\\d+)h" + "dans (\\d+[.,]?\\d*) h", + "dans (\\d+[.,]?\\d*) heure", + "dans (\\d+[.,]?\\d*) heures", + "dans (\\d+[.,]?\\d*)h" ], "in \\1 minute": [ - "dans (\\d+) min", - "dans (\\d+) minute", - "dans (\\d+) minutes" + "dans (\\d+[.,]?\\d*) min", + "dans (\\d+[.,]?\\d*) minute", + "dans (\\d+[.,]?\\d*) minutes" ], "in \\1 month": [ - "dans (\\d+) m", - "dans (\\d+) mois" + "dans (\\d+[.,]?\\d*) m", + "dans (\\d+[.,]?\\d*) mois" ], "in \\1 second": [ - "dans (\\d+) s", - "dans (\\d+) seconde", - "dans (\\d+) secondes" + "dans (\\d+[.,]?\\d*) s", + "dans (\\d+[.,]?\\d*) seconde", + "dans (\\d+[.,]?\\d*) secondes" ], "in \\1 week": [ - "dans (\\d+) sem", - "dans (\\d+) semaine", - "dans (\\d+) semaines" + "dans (\\d+[.,]?\\d*) sem", + "dans (\\d+[.,]?\\d*) semaine", + "dans (\\d+[.,]?\\d*) semaines" ], "in \\1 year": [ - "dans (\\d+) a", - "dans (\\d+) an", - "dans (\\d+) ans" + "dans (\\d+[.,]?\\d*) a", + "dans (\\d+[.,]?\\d*) an", + "dans (\\d+[.,]?\\d*) ans" ] }, "locale_specific": { @@ -466,22 +466,22 @@ "un": "1" }, { - "(\\d+)\\s+h\\s+(\\d+)\\s+min": "\\1h\\2m" + "(\\d+[.,]?\\d*)\\s+h\\s+(\\d+[.,]?\\d*)\\s+min": "\\1h\\2m" }, { - "(\\d+)h(\\d+)m?": "\\1:\\2" + "(\\d+[.,]?\\d*)h(\\d+[.,]?\\d*)m?": "\\1:\\2" }, { - "moins\\s(?:de\\s)?(\\d+)\\s?(minute|seconde|heure)": "\\1 \\2" + "moins\\s(?:de\\s)?(\\d+[.,]?\\d*)\\s?(minute|seconde|heure)": "\\1 \\2" }, { - "moins\\s(?:de\\s)?(\\d+)\\s?s": "\\1 seconde" + "moins\\s(?:de\\s)?(\\d+[.,]?\\d*)\\s?s": "\\1 seconde" }, { - "moins\\s(?:de\\s)?(\\d+)\\s?m": "\\1 minute" + "moins\\s(?:de\\s)?(\\d+[.,]?\\d*)\\s?m": "\\1 minute" }, { - "moins\\s(?:de\\s)?(\\d+)\\s?h": "\\1 heure" + "moins\\s(?:de\\s)?(\\d+[.,]?\\d*)\\s?h": "\\1 heure" }, { "deux": "2" diff --git a/dateparser/data/date_translation_data/fur.py b/dateparser/data/date_translation_data/fur.py index d0d35dfcc..de6789147 100644 --- a/dateparser/data/date_translation_data/fur.py +++ b/dateparser/data/date_translation_data/fur.py @@ -151,58 +151,58 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) zornade indaûr", - "(\\d+) zornadis indaûr" + "(\\d+[.,]?\\d*) zornade indaûr", + "(\\d+[.,]?\\d*) zornadis indaûr" ], "\\1 hour ago": [ - "(\\d+) ore indaûr", - "(\\d+) oris indaûr" + "(\\d+[.,]?\\d*) ore indaûr", + "(\\d+[.,]?\\d*) oris indaûr" ], "\\1 minute ago": [ - "(\\d+) minût indaûr", - "(\\d+) minûts indaûr" + "(\\d+[.,]?\\d*) minût indaûr", + "(\\d+[.,]?\\d*) minûts indaûr" ], "\\1 month ago": [ - "(\\d+) mês indaûr" + "(\\d+[.,]?\\d*) mês indaûr" ], "\\1 second ago": [ - "(\\d+) secont indaûr", - "(\\d+) seconts indaûr" + "(\\d+[.,]?\\d*) secont indaûr", + "(\\d+[.,]?\\d*) seconts indaûr" ], "\\1 week ago": [ - "(\\d+) setemane indaûr", - "(\\d+) setemanis indaûr" + "(\\d+[.,]?\\d*) setemane indaûr", + "(\\d+[.,]?\\d*) setemanis indaûr" ], "\\1 year ago": [ - "(\\d+) agns indaûr", - "(\\d+) an indaûr" + "(\\d+[.,]?\\d*) agns indaûr", + "(\\d+[.,]?\\d*) an indaûr" ], "in \\1 day": [ - "ca di (\\d+) zornade", - "ca di (\\d+) zornadis" + "ca di (\\d+[.,]?\\d*) zornade", + "ca di (\\d+[.,]?\\d*) zornadis" ], "in \\1 hour": [ - "ca di (\\d+) ore", - "ca di (\\d+) oris" + "ca di (\\d+[.,]?\\d*) ore", + "ca di (\\d+[.,]?\\d*) oris" ], "in \\1 minute": [ - "ca di (\\d+) minût", - "ca di (\\d+) minûts" + "ca di (\\d+[.,]?\\d*) minût", + "ca di (\\d+[.,]?\\d*) minûts" ], "in \\1 month": [ - "ca di (\\d+) mês" + "ca di (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "ca di (\\d+) secont", - "ca di (\\d+) seconts" + "ca di (\\d+[.,]?\\d*) secont", + "ca di (\\d+[.,]?\\d*) seconts" ], "in \\1 week": [ - "ca di (\\d+) setemane", - "ca di (\\d+) setemanis" + "ca di (\\d+[.,]?\\d*) setemane", + "ca di (\\d+[.,]?\\d*) setemanis" ], "in \\1 year": [ - "ca di (\\d+) agns", - "ca di (\\d+) an" + "ca di (\\d+[.,]?\\d*) agns", + "ca di (\\d+[.,]?\\d*) an" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/fy.py b/dateparser/data/date_translation_data/fy.py index 9edc544d7..f79680119 100644 --- a/dateparser/data/date_translation_data/fy.py +++ b/dateparser/data/date_translation_data/fy.py @@ -153,56 +153,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) dei lyn", - "(\\d+) deien lyn" + "(\\d+[.,]?\\d*) dei lyn", + "(\\d+[.,]?\\d*) deien lyn" ], "\\1 hour ago": [ - "(\\d+) oere lyn" + "(\\d+[.,]?\\d*) oere lyn" ], "\\1 minute ago": [ - "(\\d+) minuten lyn", - "(\\d+) minút lyn" + "(\\d+[.,]?\\d*) minuten lyn", + "(\\d+[.,]?\\d*) minút lyn" ], "\\1 month ago": [ - "(\\d+) moanne lyn", - "(\\d+) moannen lyn" + "(\\d+[.,]?\\d*) moanne lyn", + "(\\d+[.,]?\\d*) moannen lyn" ], "\\1 second ago": [ - "(\\d+) sekonde lyn", - "(\\d+) sekonden lyn" + "(\\d+[.,]?\\d*) sekonde lyn", + "(\\d+[.,]?\\d*) sekonden lyn" ], "\\1 week ago": [ - "(\\d+) wike lyn", - "(\\d+) wiken lyn" + "(\\d+[.,]?\\d*) wike lyn", + "(\\d+[.,]?\\d*) wiken lyn" ], "\\1 year ago": [ - "(\\d+) jier lyn" + "(\\d+[.,]?\\d*) jier lyn" ], "in \\1 day": [ - "oer (\\d+) dei", - "oer (\\d+) deien" + "oer (\\d+[.,]?\\d*) dei", + "oer (\\d+[.,]?\\d*) deien" ], "in \\1 hour": [ - "oer (\\d+) oere" + "oer (\\d+[.,]?\\d*) oere" ], "in \\1 minute": [ - "oer (\\d+) minuten", - "oer (\\d+) minút" + "oer (\\d+[.,]?\\d*) minuten", + "oer (\\d+[.,]?\\d*) minút" ], "in \\1 month": [ - "oer (\\d+) moanne", - "oer (\\d+) moannen" + "oer (\\d+[.,]?\\d*) moanne", + "oer (\\d+[.,]?\\d*) moannen" ], "in \\1 second": [ - "oer (\\d+) sekonde", - "oer (\\d+) sekonden" + "oer (\\d+[.,]?\\d*) sekonde", + "oer (\\d+[.,]?\\d*) sekonden" ], "in \\1 week": [ - "oer (\\d+) wike", - "oer (\\d+) wiken" + "oer (\\d+[.,]?\\d*) wike", + "oer (\\d+[.,]?\\d*) wiken" ], "in \\1 year": [ - "oer (\\d+) jier" + "oer (\\d+[.,]?\\d*) jier" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ga.py b/dateparser/data/date_translation_data/ga.py index e9e831891..daa9b4904 100644 --- a/dateparser/data/date_translation_data/ga.py +++ b/dateparser/data/date_translation_data/ga.py @@ -163,61 +163,61 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) lá ó shin" + "(\\d+[.,]?\\d*) lá ó shin" ], "\\1 hour ago": [ - "(\\d+) uair an chloig ó shin", - "(\\d+) uair ó shin" + "(\\d+[.,]?\\d*) uair an chloig ó shin", + "(\\d+[.,]?\\d*) uair ó shin" ], "\\1 minute ago": [ - "(\\d+) nóim ó shin", - "(\\d+) nóiméad ó shin" + "(\\d+[.,]?\\d*) nóim ó shin", + "(\\d+[.,]?\\d*) nóiméad ó shin" ], "\\1 month ago": [ - "(\\d+) mhí ó shin", - "(\\d+) mí ó shin" + "(\\d+[.,]?\\d*) mhí ó shin", + "(\\d+[.,]?\\d*) mí ó shin" ], "\\1 second ago": [ - "(\\d+) soic ó shin", - "(\\d+) soicind ó shin" + "(\\d+[.,]?\\d*) soic ó shin", + "(\\d+[.,]?\\d*) soicind ó shin" ], "\\1 week ago": [ - "(\\d+) scht ó shin", - "(\\d+) seachtain ó shin" + "(\\d+[.,]?\\d*) scht ó shin", + "(\\d+[.,]?\\d*) seachtain ó shin" ], "\\1 year ago": [ - "(\\d+) bhl ó shin", - "(\\d+) bhliain ó shin", - "(\\d+) bl ó shin", - "(\\d+) bliain ó shin" + "(\\d+[.,]?\\d*) bhl ó shin", + "(\\d+[.,]?\\d*) bhliain ó shin", + "(\\d+[.,]?\\d*) bl ó shin", + "(\\d+[.,]?\\d*) bliain ó shin" ], "in \\1 day": [ - "i gceann (\\d+) lá" + "i gceann (\\d+[.,]?\\d*) lá" ], "in \\1 hour": [ - "i gceann (\\d+) uair", - "i gceann (\\d+) uair an chloig" + "i gceann (\\d+[.,]?\\d*) uair", + "i gceann (\\d+[.,]?\\d*) uair an chloig" ], "in \\1 minute": [ - "i gceann (\\d+) nóim", - "i gceann (\\d+) nóiméad" + "i gceann (\\d+[.,]?\\d*) nóim", + "i gceann (\\d+[.,]?\\d*) nóiméad" ], "in \\1 month": [ - "i gceann (\\d+) mhí", - "i gceann (\\d+) mí" + "i gceann (\\d+[.,]?\\d*) mhí", + "i gceann (\\d+[.,]?\\d*) mí" ], "in \\1 second": [ - "i gceann (\\d+) soic", - "i gceann (\\d+) soicind" + "i gceann (\\d+[.,]?\\d*) soic", + "i gceann (\\d+[.,]?\\d*) soicind" ], "in \\1 week": [ - "i gceann (\\d+) scht", - "i gceann (\\d+) seachtain" + "i gceann (\\d+[.,]?\\d*) scht", + "i gceann (\\d+[.,]?\\d*) seachtain" ], "in \\1 year": [ - "i gceann (\\d+) bhliain", - "i gceann (\\d+) bl", - "i gceann (\\d+) bliain" + "i gceann (\\d+[.,]?\\d*) bhliain", + "i gceann (\\d+[.,]?\\d*) bl", + "i gceann (\\d+[.,]?\\d*) bliain" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/gd.py b/dateparser/data/date_translation_data/gd.py index 516777bc4..83660ecf8 100644 --- a/dateparser/data/date_translation_data/gd.py +++ b/dateparser/data/date_translation_data/gd.py @@ -189,74 +189,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "o (\\d+) là", - "(\\d+) latha air ais" + "o (\\d+[.,]?\\d*) là", + "(\\d+[.,]?\\d*) latha air ais" ], "\\1 hour ago": [ - "o (\\d+) uair", - "(\\d+) uair a thìde air ais" + "o (\\d+[.,]?\\d*) uair", + "(\\d+[.,]?\\d*) uair a thìde air ais" ], "\\1 minute ago": [ - "o (\\d+) mhion", - "o (\\d+) mion", - "(\\d+) mhionaid air ais", - "(\\d+) mionaid air ais" + "o (\\d+[.,]?\\d*) mhion", + "o (\\d+[.,]?\\d*) mion", + "(\\d+[.,]?\\d*) mhionaid air ais", + "(\\d+[.,]?\\d*) mionaid air ais" ], "\\1 month ago": [ - "o (\\d+) mhìos", - "o (\\d+) mìos", - "(\\d+) mhìos air ais", - "(\\d+) mìos air ais" + "o (\\d+[.,]?\\d*) mhìos", + "o (\\d+[.,]?\\d*) mìos", + "(\\d+[.,]?\\d*) mhìos air ais", + "(\\d+[.,]?\\d*) mìos air ais" ], "\\1 second ago": [ - "o (\\d+) diog", - "(\\d+) diog air ais" + "o (\\d+[.,]?\\d*) diog", + "(\\d+[.,]?\\d*) diog air ais" ], "\\1 week ago": [ - "o (\\d+) seachd", - "o (\\d+) sheachd", - "(\\d+) seachdain air ais" + "o (\\d+[.,]?\\d*) seachd", + "o (\\d+[.,]?\\d*) sheachd", + "(\\d+[.,]?\\d*) seachdain air ais" ], "\\1 year ago": [ - "o (\\d+) bhlia", - "o (\\d+) blia", - "(\\d+) bhliadhna air ais", - "(\\d+) bliadhna air ais" + "o (\\d+[.,]?\\d*) bhlia", + "o (\\d+[.,]?\\d*) blia", + "(\\d+[.,]?\\d*) bhliadhna air ais", + "(\\d+[.,]?\\d*) bliadhna air ais" ], "in \\1 day": [ - "an ceann (\\d+) latha", - "an (\\d+) là" + "an ceann (\\d+[.,]?\\d*) latha", + "an (\\d+[.,]?\\d*) là" ], "in \\1 hour": [ - "an ceann (\\d+) uair a thìde", - "an (\\d+) uair" + "an ceann (\\d+[.,]?\\d*) uair a thìde", + "an (\\d+[.,]?\\d*) uair" ], "in \\1 minute": [ - "an ceann (\\d+) mhionaid", - "an ceann (\\d+) mionaid", - "an (\\d+) mhion", - "an (\\d+) mion" + "an ceann (\\d+[.,]?\\d*) mhionaid", + "an ceann (\\d+[.,]?\\d*) mionaid", + "an (\\d+[.,]?\\d*) mhion", + "an (\\d+[.,]?\\d*) mion" ], "in \\1 month": [ - "an ceann (\\d+) mhìosa", - "an ceann (\\d+) mìosa", - "an (\\d+) mhìos", - "an (\\d+) mìos" + "an ceann (\\d+[.,]?\\d*) mhìosa", + "an ceann (\\d+[.,]?\\d*) mìosa", + "an (\\d+[.,]?\\d*) mhìos", + "an (\\d+[.,]?\\d*) mìos" ], "in \\1 second": [ - "an ceann (\\d+) diog", - "an (\\d+) diog" + "an ceann (\\d+[.,]?\\d*) diog", + "an (\\d+[.,]?\\d*) diog" ], "in \\1 week": [ - "an ceann (\\d+) seachdain", - "an (\\d+) seachd", - "an (\\d+) sheachd" + "an ceann (\\d+[.,]?\\d*) seachdain", + "an (\\d+[.,]?\\d*) seachd", + "an (\\d+[.,]?\\d*) sheachd" ], "in \\1 year": [ - "an ceann (\\d+) bhliadhna", - "an ceann (\\d+) bliadhna", - "an (\\d+) bhlia", - "an (\\d+) blia" + "an ceann (\\d+[.,]?\\d*) bhliadhna", + "an ceann (\\d+[.,]?\\d*) bliadhna", + "an (\\d+[.,]?\\d*) bhlia", + "an (\\d+[.,]?\\d*) blia" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/gl.py b/dateparser/data/date_translation_data/gl.py index 9f63df2a7..367412444 100644 --- a/dateparser/data/date_translation_data/gl.py +++ b/dateparser/data/date_translation_data/gl.py @@ -165,74 +165,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "hai (\\d+) d", - "hai (\\d+) día", - "hai (\\d+) días" + "hai (\\d+[.,]?\\d*) d", + "hai (\\d+[.,]?\\d*) día", + "hai (\\d+[.,]?\\d*) días" ], "\\1 hour ago": [ - "hai (\\d+) h", - "hai (\\d+) hora", - "hai (\\d+) horas" + "hai (\\d+[.,]?\\d*) h", + "hai (\\d+[.,]?\\d*) hora", + "hai (\\d+[.,]?\\d*) horas" ], "\\1 minute ago": [ - "hai (\\d+) min", - "hai (\\d+) minuto", - "hai (\\d+) minutos" + "hai (\\d+[.,]?\\d*) min", + "hai (\\d+[.,]?\\d*) minuto", + "hai (\\d+[.,]?\\d*) minutos" ], "\\1 month ago": [ - "hai (\\d+) m", - "hai (\\d+) mes", - "hai (\\d+) meses" + "hai (\\d+[.,]?\\d*) m", + "hai (\\d+[.,]?\\d*) mes", + "hai (\\d+[.,]?\\d*) meses" ], "\\1 second ago": [ - "hai (\\d+) s", - "hai (\\d+) segundo", - "hai (\\d+) segundos" + "hai (\\d+[.,]?\\d*) s", + "hai (\\d+[.,]?\\d*) segundo", + "hai (\\d+[.,]?\\d*) segundos" ], "\\1 week ago": [ - "hai (\\d+) sem", - "hai (\\d+) semana", - "hai (\\d+) semanas" + "hai (\\d+[.,]?\\d*) sem", + "hai (\\d+[.,]?\\d*) semana", + "hai (\\d+[.,]?\\d*) semanas" ], "\\1 year ago": [ - "hai (\\d+) a", - "hai (\\d+) ano", - "hai (\\d+) anos" + "hai (\\d+[.,]?\\d*) a", + "hai (\\d+[.,]?\\d*) ano", + "hai (\\d+[.,]?\\d*) anos" ], "in \\1 day": [ - "en (\\d+) d", - "en (\\d+) día", - "en (\\d+) días" + "en (\\d+[.,]?\\d*) d", + "en (\\d+[.,]?\\d*) día", + "en (\\d+[.,]?\\d*) días" ], "in \\1 hour": [ - "en (\\d+) h", - "en (\\d+) hora", - "en (\\d+) horas" + "en (\\d+[.,]?\\d*) h", + "en (\\d+[.,]?\\d*) hora", + "en (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "en (\\d+) min", - "en (\\d+) minuto", - "en (\\d+) minutos" + "en (\\d+[.,]?\\d*) min", + "en (\\d+[.,]?\\d*) minuto", + "en (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "en (\\d+) m", - "en (\\d+) mes", - "en (\\d+) meses" + "en (\\d+[.,]?\\d*) m", + "en (\\d+[.,]?\\d*) mes", + "en (\\d+[.,]?\\d*) meses" ], "in \\1 second": [ - "en (\\d+) s", - "en (\\d+) segundo", - "en (\\d+) segundos" + "en (\\d+[.,]?\\d*) s", + "en (\\d+[.,]?\\d*) segundo", + "en (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "en (\\d+) sem", - "en (\\d+) semana", - "en (\\d+) semanas" + "en (\\d+[.,]?\\d*) sem", + "en (\\d+[.,]?\\d*) semana", + "en (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "en (\\d+) a", - "en (\\d+) ano", - "en (\\d+) anos" + "en (\\d+[.,]?\\d*) a", + "en (\\d+[.,]?\\d*) ano", + "en (\\d+[.,]?\\d*) anos" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/gu.py b/dateparser/data/date_translation_data/gu.py index fac166eab..161fa15b2 100644 --- a/dateparser/data/date_translation_data/gu.py +++ b/dateparser/data/date_translation_data/gu.py @@ -153,49 +153,49 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) દિવસ પહેલાં" + "(\\d+[.,]?\\d*) દિવસ પહેલાં" ], "\\1 hour ago": [ - "(\\d+) કલાક પહેલાં" + "(\\d+[.,]?\\d*) કલાક પહેલાં" ], "\\1 minute ago": [ - "(\\d+) મિનિટ પહેલાં" + "(\\d+[.,]?\\d*) મિનિટ પહેલાં" ], "\\1 month ago": [ - "(\\d+) મહિના પહેલાં" + "(\\d+[.,]?\\d*) મહિના પહેલાં" ], "\\1 second ago": [ - "(\\d+) સેકંડ પહેલાં" + "(\\d+[.,]?\\d*) સેકંડ પહેલાં" ], "\\1 week ago": [ - "(\\d+) અઠ પહેલાં", - "(\\d+) અઠવાડિયા પહેલાં" + "(\\d+[.,]?\\d*) અઠ પહેલાં", + "(\\d+[.,]?\\d*) અઠવાડિયા પહેલાં" ], "\\1 year ago": [ - "(\\d+) વર્ષ પહેલા", - "(\\d+) વર્ષ પહેલાં" + "(\\d+[.,]?\\d*) વર્ષ પહેલા", + "(\\d+[.,]?\\d*) વર્ષ પહેલાં" ], "in \\1 day": [ - "(\\d+) દિવસમાં" + "(\\d+[.,]?\\d*) દિવસમાં" ], "in \\1 hour": [ - "(\\d+) કલાકમાં" + "(\\d+[.,]?\\d*) કલાકમાં" ], "in \\1 minute": [ - "(\\d+) મિનિટમાં" + "(\\d+[.,]?\\d*) મિનિટમાં" ], "in \\1 month": [ - "(\\d+) મહિનામાં" + "(\\d+[.,]?\\d*) મહિનામાં" ], "in \\1 second": [ - "(\\d+) સેકંડમાં" + "(\\d+[.,]?\\d*) સેકંડમાં" ], "in \\1 week": [ - "(\\d+) અઠ માં", - "(\\d+) અઠવાડિયામાં" + "(\\d+[.,]?\\d*) અઠ માં", + "(\\d+[.,]?\\d*) અઠવાડિયામાં" ], "in \\1 year": [ - "(\\d+) વર્ષમાં" + "(\\d+[.,]?\\d*) વર્ષમાં" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/he.py b/dateparser/data/date_translation_data/he.py index e04e7359f..1f6ce4cef 100644 --- a/dateparser/data/date_translation_data/he.py +++ b/dateparser/data/date_translation_data/he.py @@ -218,60 +218,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "לפני (\\d+) ימים", - "לפני (\\d+) ימ׳", - "לפני יום (\\d+)" + "לפני (\\d+[.,]?\\d*) ימים", + "לפני (\\d+[.,]?\\d*) ימ׳", + "לפני יום (\\d+[.,]?\\d*)" ], "\\1 hour ago": [ - "לפני (\\d+) שעות", - "לפני (\\d+) שע׳" + "לפני (\\d+[.,]?\\d*) שעות", + "לפני (\\d+[.,]?\\d*) שע׳" ], "\\1 minute ago": [ - "לפני (\\d+) דקות", - "לפני (\\d+) דק׳" + "לפני (\\d+[.,]?\\d*) דקות", + "לפני (\\d+[.,]?\\d*) דק׳" ], "\\1 month ago": [ - "לפני (\\d+) חודשים", - "לפני (\\d+) חו׳" + "לפני (\\d+[.,]?\\d*) חודשים", + "לפני (\\d+[.,]?\\d*) חו׳" ], "\\1 second ago": [ - "לפני (\\d+) שניות", - "לפני (\\d+) שנ׳" + "לפני (\\d+[.,]?\\d*) שניות", + "לפני (\\d+[.,]?\\d*) שנ׳" ], "\\1 week ago": [ - "לפני (\\d+) שבועות", - "לפני (\\d+) שב׳" + "לפני (\\d+[.,]?\\d*) שבועות", + "לפני (\\d+[.,]?\\d*) שב׳" ], "\\1 year ago": [ - "לפני (\\d+) שנים" + "לפני (\\d+[.,]?\\d*) שנים" ], "in \\1 day": [ - "בעוד (\\d+) ימים", - "בעוד (\\d+) ימ׳", - "בעוד יום (\\d+)" + "בעוד (\\d+[.,]?\\d*) ימים", + "בעוד (\\d+[.,]?\\d*) ימ׳", + "בעוד יום (\\d+[.,]?\\d*)" ], "in \\1 hour": [ - "בעוד (\\d+) שעות", - "בעוד (\\d+) שע׳" + "בעוד (\\d+[.,]?\\d*) שעות", + "בעוד (\\d+[.,]?\\d*) שע׳" ], "in \\1 minute": [ - "בעוד (\\d+) דקות", - "בעוד (\\d+) דק׳" + "בעוד (\\d+[.,]?\\d*) דקות", + "בעוד (\\d+[.,]?\\d*) דק׳" ], "in \\1 month": [ - "בעוד (\\d+) חודשים", - "בעוד (\\d+) חו׳" + "בעוד (\\d+[.,]?\\d*) חודשים", + "בעוד (\\d+[.,]?\\d*) חו׳" ], "in \\1 second": [ - "בעוד (\\d+) שניות", - "בעוד (\\d+) שנ׳" + "בעוד (\\d+[.,]?\\d*) שניות", + "בעוד (\\d+[.,]?\\d*) שנ׳" ], "in \\1 week": [ - "בעוד (\\d+) שבועות", - "בעוד (\\d+) שב׳" + "בעוד (\\d+[.,]?\\d*) שבועות", + "בעוד (\\d+[.,]?\\d*) שב׳" ], "in \\1 year": [ - "בעוד (\\d+) שנים" + "בעוד (\\d+[.,]?\\d*) שנים" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/hi.py b/dateparser/data/date_translation_data/hi.py index 613bf69db..8dcafa87c 100644 --- a/dateparser/data/date_translation_data/hi.py +++ b/dateparser/data/date_translation_data/hi.py @@ -166,52 +166,52 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) दिन पहले" + "(\\d+[.,]?\\d*) दिन पहले" ], "\\1 hour ago": [ - "(\\d+) घं पहले", - "(\\d+) घंटे पहले" + "(\\d+[.,]?\\d*) घं पहले", + "(\\d+[.,]?\\d*) घंटे पहले" ], "\\1 minute ago": [ - "(\\d+) मि पहले", - "(\\d+) मिनट पहले" + "(\\d+[.,]?\\d*) मि पहले", + "(\\d+[.,]?\\d*) मिनट पहले" ], "\\1 month ago": [ - "(\\d+) माह पहले" + "(\\d+[.,]?\\d*) माह पहले" ], "\\1 second ago": [ - "(\\d+) से पहले", - "(\\d+) सेकंड पहले" + "(\\d+[.,]?\\d*) से पहले", + "(\\d+[.,]?\\d*) सेकंड पहले" ], "\\1 week ago": [ - "(\\d+) सप्ताह पहले" + "(\\d+[.,]?\\d*) सप्ताह पहले" ], "\\1 year ago": [ - "(\\d+) वर्ष पहले" + "(\\d+[.,]?\\d*) वर्ष पहले" ], "in \\1 day": [ - "(\\d+) दिन में" + "(\\d+[.,]?\\d*) दिन में" ], "in \\1 hour": [ - "(\\d+) घं में", - "(\\d+) घंटे में" + "(\\d+[.,]?\\d*) घं में", + "(\\d+[.,]?\\d*) घंटे में" ], "in \\1 minute": [ - "(\\d+) मि में", - "(\\d+) मिनट में" + "(\\d+[.,]?\\d*) मि में", + "(\\d+[.,]?\\d*) मिनट में" ], "in \\1 month": [ - "(\\d+) माह में" + "(\\d+[.,]?\\d*) माह में" ], "in \\1 second": [ - "(\\d+) से में", - "(\\d+) सेकंड में" + "(\\d+[.,]?\\d*) से में", + "(\\d+[.,]?\\d*) सेकंड में" ], "in \\1 week": [ - "(\\d+) सप्ताह में" + "(\\d+[.,]?\\d*) सप्ताह में" ], "in \\1 year": [ - "(\\d+) वर्ष में" + "(\\d+[.,]?\\d*) वर्ष में" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/hr.py b/dateparser/data/date_translation_data/hr.py index 25cbb56dc..781c52cb4 100644 --- a/dateparser/data/date_translation_data/hr.py +++ b/dateparser/data/date_translation_data/hr.py @@ -261,88 +261,88 @@ }, "relative-type-regex": { "\\1 day ago": [ - "prije (\\d+) d", - "prije (\\d+) dan", - "prije (\\d+) dana" + "prije (\\d+[.,]?\\d*) d", + "prije (\\d+[.,]?\\d*) dan", + "prije (\\d+[.,]?\\d*) dana" ], "\\1 hour ago": [ - "prije (\\d+) h", - "prije (\\d+) sat", - "prije (\\d+) sati", - "prije (\\d+) sata" + "prije (\\d+[.,]?\\d*) h", + "prije (\\d+[.,]?\\d*) sat", + "prije (\\d+[.,]?\\d*) sati", + "prije (\\d+[.,]?\\d*) sata" ], "\\1 minute ago": [ - "prije (\\d+) min", - "prije (\\d+) minuta", - "prije (\\d+) minutu", - "prije (\\d+) minute" + "prije (\\d+[.,]?\\d*) min", + "prije (\\d+[.,]?\\d*) minuta", + "prije (\\d+[.,]?\\d*) minutu", + "prije (\\d+[.,]?\\d*) minute" ], "\\1 month ago": [ - "prije (\\d+) mj", - "prije (\\d+) mjesec", - "prije (\\d+) mjeseci", - "prije (\\d+) mjeseca" + "prije (\\d+[.,]?\\d*) mj", + "prije (\\d+[.,]?\\d*) mjesec", + "prije (\\d+[.,]?\\d*) mjeseci", + "prije (\\d+[.,]?\\d*) mjeseca" ], "\\1 second ago": [ - "prije (\\d+) s", - "prije (\\d+) sekundi", - "prije (\\d+) sekundu", - "prije (\\d+) sekunde", - "prije (\\d+) sekundu" + "prije (\\d+[.,]?\\d*) s", + "prije (\\d+[.,]?\\d*) sekundi", + "prije (\\d+[.,]?\\d*) sekundu", + "prije (\\d+[.,]?\\d*) sekunde", + "prije (\\d+[.,]?\\d*) sekundu" ], "\\1 week ago": [ - "prije (\\d+) tj", - "prije (\\d+) tjedan", - "prije (\\d+) tjedana", - "prije (\\d+) tjedna" + "prije (\\d+[.,]?\\d*) tj", + "prije (\\d+[.,]?\\d*) tjedan", + "prije (\\d+[.,]?\\d*) tjedana", + "prije (\\d+[.,]?\\d*) tjedna" ], "\\1 year ago": [ - "prije (\\d+) g", - "prije (\\d+) godina", - "prije (\\d+) godinu", - "prije (\\d+) godine" + "prije (\\d+[.,]?\\d*) g", + "prije (\\d+[.,]?\\d*) godina", + "prije (\\d+[.,]?\\d*) godinu", + "prije (\\d+[.,]?\\d*) godine" ], "in \\1 day": [ - "za (\\d+) d", - "za (\\d+) dan", - "za (\\d+) dana" + "za (\\d+[.,]?\\d*) d", + "za (\\d+[.,]?\\d*) dan", + "za (\\d+[.,]?\\d*) dana" ], "in \\1 hour": [ - "za (\\d+) h", - "za (\\d+) sat", - "za (\\d+) sati", - "za (\\d+) sata" + "za (\\d+[.,]?\\d*) h", + "za (\\d+[.,]?\\d*) sat", + "za (\\d+[.,]?\\d*) sati", + "za (\\d+[.,]?\\d*) sata" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minuta", - "za (\\d+) minutu", - "za (\\d+) minute" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minuta", + "za (\\d+[.,]?\\d*) minutu", + "za (\\d+[.,]?\\d*) minute" ], "in \\1 month": [ - "za (\\d+) mj", - "za (\\d+) mjesec", - "za (\\d+) mjeseci", - "za (\\d+) mjeseca" + "za (\\d+[.,]?\\d*) mj", + "za (\\d+[.,]?\\d*) mjesec", + "za (\\d+[.,]?\\d*) mjeseci", + "za (\\d+[.,]?\\d*) mjeseca" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sekundi", - "za (\\d+) sekundu", - "za (\\d+) sekunde", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sekundi", + "za (\\d+[.,]?\\d*) sekundu", + "za (\\d+[.,]?\\d*) sekunde", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) tj", - "za (\\d+) tjedan", - "za (\\d+) tjedana", - "za (\\d+) tjedna" + "za (\\d+[.,]?\\d*) tj", + "za (\\d+[.,]?\\d*) tjedan", + "za (\\d+[.,]?\\d*) tjedana", + "za (\\d+[.,]?\\d*) tjedna" ], "in \\1 year": [ - "za (\\d+) g", - "za (\\d+) godina", - "za (\\d+) godinu", - "za (\\d+) godine" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) godina", + "za (\\d+[.,]?\\d*) godinu", + "za (\\d+[.,]?\\d*) godine" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/hsb.py b/dateparser/data/date_translation_data/hsb.py index 99d3f2bcd..52b53866c 100644 --- a/dateparser/data/date_translation_data/hsb.py +++ b/dateparser/data/date_translation_data/hsb.py @@ -175,82 +175,82 @@ }, "relative-type-regex": { "\\1 day ago": [ - "před (\\d+) d", - "před (\\d+) dnj", - "před (\\d+) dnjemi", - "před (\\d+) dnjom" + "před (\\d+[.,]?\\d*) d", + "před (\\d+[.,]?\\d*) dnj", + "před (\\d+[.,]?\\d*) dnjemi", + "před (\\d+[.,]?\\d*) dnjom" ], "\\1 hour ago": [ - "před (\\d+) h", - "před (\\d+) hodź", - "před (\\d+) hodźinami", - "před (\\d+) hodźinu" + "před (\\d+[.,]?\\d*) h", + "před (\\d+[.,]?\\d*) hodź", + "před (\\d+[.,]?\\d*) hodźinami", + "před (\\d+[.,]?\\d*) hodźinu" ], "\\1 minute ago": [ - "před (\\d+) m", - "před (\\d+) min", - "před (\\d+) minutami", - "před (\\d+) minutu" + "před (\\d+[.,]?\\d*) m", + "před (\\d+[.,]?\\d*) min", + "před (\\d+[.,]?\\d*) minutami", + "před (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "před (\\d+) měs", - "před (\\d+) měsacami", - "před (\\d+) měsacom" + "před (\\d+[.,]?\\d*) měs", + "před (\\d+[.,]?\\d*) měsacami", + "před (\\d+[.,]?\\d*) měsacom" ], "\\1 second ago": [ - "před (\\d+) s", - "před (\\d+) sek", - "před (\\d+) sekundami", - "před (\\d+) sekundu" + "před (\\d+[.,]?\\d*) s", + "před (\\d+[.,]?\\d*) sek", + "před (\\d+[.,]?\\d*) sekundami", + "před (\\d+[.,]?\\d*) sekundu" ], "\\1 week ago": [ - "před (\\d+) tydź", - "před (\\d+) tydźenjemi", - "před (\\d+) tydźenjom" + "před (\\d+[.,]?\\d*) tydź", + "před (\\d+[.,]?\\d*) tydźenjemi", + "před (\\d+[.,]?\\d*) tydźenjom" ], "\\1 year ago": [ - "před (\\d+) l", - "před (\\d+) lětami", - "před (\\d+) lětom" + "před (\\d+[.,]?\\d*) l", + "před (\\d+[.,]?\\d*) lětami", + "před (\\d+[.,]?\\d*) lětom" ], "in \\1 day": [ - "za (\\d+) d", - "za (\\d+) dnj", - "za (\\d+) dnjow", - "za (\\d+) dźeń" + "za (\\d+[.,]?\\d*) d", + "za (\\d+[.,]?\\d*) dnj", + "za (\\d+[.,]?\\d*) dnjow", + "za (\\d+[.,]?\\d*) dźeń" ], "in \\1 hour": [ - "za (\\d+) h", - "za (\\d+) hodź", - "za (\\d+) hodźin", - "za (\\d+) hodźinu" + "za (\\d+[.,]?\\d*) h", + "za (\\d+[.,]?\\d*) hodź", + "za (\\d+[.,]?\\d*) hodźin", + "za (\\d+[.,]?\\d*) hodźinu" ], "in \\1 minute": [ - "za (\\d+) m", - "za (\\d+) min", - "za (\\d+) minutow", - "za (\\d+) minutu" + "za (\\d+[.,]?\\d*) m", + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minutow", + "za (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "za (\\d+) měs", - "za (\\d+) měsac", - "za (\\d+) měsacow" + "za (\\d+[.,]?\\d*) měs", + "za (\\d+[.,]?\\d*) měsac", + "za (\\d+[.,]?\\d*) měsacow" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sek", - "za (\\d+) sekundow", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundow", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) tydź", - "za (\\d+) tydźenjow", - "za (\\d+) tydźeń" + "za (\\d+[.,]?\\d*) tydź", + "za (\\d+[.,]?\\d*) tydźenjow", + "za (\\d+[.,]?\\d*) tydźeń" ], "in \\1 year": [ - "za (\\d+) l", - "za (\\d+) lět", - "za (\\d+) lěto" + "za (\\d+[.,]?\\d*) l", + "za (\\d+[.,]?\\d*) lět", + "za (\\d+[.,]?\\d*) lěto" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/hu.py b/dateparser/data/date_translation_data/hu.py index 3c0afd70f..e45d89a33 100644 --- a/dateparser/data/date_translation_data/hu.py +++ b/dateparser/data/date_translation_data/hu.py @@ -202,47 +202,47 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) napja", - "(\\d+) nappal ezelőtt" + "(\\d+[.,]?\\d*) napja", + "(\\d+[.,]?\\d*) nappal ezelőtt" ], "\\1 hour ago": [ - "(\\d+) órával ezelőtt" + "(\\d+[.,]?\\d*) órával ezelőtt" ], "\\1 minute ago": [ - "(\\d+) perccel ezelőtt" + "(\\d+[.,]?\\d*) perccel ezelőtt" ], "\\1 month ago": [ - "(\\d+) hónappal ezelőtt" + "(\\d+[.,]?\\d*) hónappal ezelőtt" ], "\\1 second ago": [ - "(\\d+) másodperccel ezelőtt" + "(\\d+[.,]?\\d*) másodperccel ezelőtt" ], "\\1 week ago": [ - "(\\d+) héttel ezelőtt" + "(\\d+[.,]?\\d*) héttel ezelőtt" ], "\\1 year ago": [ - "(\\d+) évvel ezelőtt" + "(\\d+[.,]?\\d*) évvel ezelőtt" ], "in \\1 day": [ - "(\\d+) nap múlva" + "(\\d+[.,]?\\d*) nap múlva" ], "in \\1 hour": [ - "(\\d+) óra múlva" + "(\\d+[.,]?\\d*) óra múlva" ], "in \\1 minute": [ - "(\\d+) perc múlva" + "(\\d+[.,]?\\d*) perc múlva" ], "in \\1 month": [ - "(\\d+) hónap múlva" + "(\\d+[.,]?\\d*) hónap múlva" ], "in \\1 second": [ - "(\\d+) másodperc múlva" + "(\\d+[.,]?\\d*) másodperc múlva" ], "in \\1 week": [ - "(\\d+) hét múlva" + "(\\d+[.,]?\\d*) hét múlva" ], "in \\1 year": [ - "(\\d+) év múlva" + "(\\d+[.,]?\\d*) év múlva" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/hy.py b/dateparser/data/date_translation_data/hy.py index d9207cd6e..596a2658d 100644 --- a/dateparser/data/date_translation_data/hy.py +++ b/dateparser/data/date_translation_data/hy.py @@ -174,58 +174,58 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) օր առաջ" + "(\\d+[.,]?\\d*) օր առաջ" ], "\\1 hour ago": [ - "(\\d+) ժ առաջ", - "(\\d+) ժամ առաջ" + "(\\d+[.,]?\\d*) ժ առաջ", + "(\\d+[.,]?\\d*) ժամ առաջ" ], "\\1 minute ago": [ - "(\\d+) ր առաջ", - "(\\d+) րոպե առաջ" + "(\\d+[.,]?\\d*) ր առաջ", + "(\\d+[.,]?\\d*) րոպե առաջ" ], "\\1 month ago": [ - "(\\d+) ամիս առաջ" + "(\\d+[.,]?\\d*) ամիս առաջ" ], "\\1 second ago": [ - "(\\d+) վ առաջ", - "(\\d+) վայրկյան առաջ", - "(\\d+) վրկ առաջ" + "(\\d+[.,]?\\d*) վ առաջ", + "(\\d+[.,]?\\d*) վայրկյան առաջ", + "(\\d+[.,]?\\d*) վրկ առաջ" ], "\\1 week ago": [ - "(\\d+) շաբ առաջ", - "(\\d+) շաբաթ առաջ" + "(\\d+[.,]?\\d*) շաբ առաջ", + "(\\d+[.,]?\\d*) շաբաթ առաջ" ], "\\1 year ago": [ - "(\\d+) տ առաջ", - "(\\d+) տարի առաջ" + "(\\d+[.,]?\\d*) տ առաջ", + "(\\d+[.,]?\\d*) տարի առաջ" ], "in \\1 day": [ - "(\\d+) օրից" + "(\\d+[.,]?\\d*) օրից" ], "in \\1 hour": [ - "(\\d+) ժ-ից", - "(\\d+) ժամից" + "(\\d+[.,]?\\d*) ժ-ից", + "(\\d+[.,]?\\d*) ժամից" ], "in \\1 minute": [ - "(\\d+) ր-ից", - "(\\d+) րոպեից" + "(\\d+[.,]?\\d*) ր-ից", + "(\\d+[.,]?\\d*) րոպեից" ], "in \\1 month": [ - "(\\d+) ամսից" + "(\\d+[.,]?\\d*) ամսից" ], "in \\1 second": [ - "(\\d+) վ-ից", - "(\\d+) վայրկյանից", - "(\\d+) վրկ-ից" + "(\\d+[.,]?\\d*) վ-ից", + "(\\d+[.,]?\\d*) վայրկյանից", + "(\\d+[.,]?\\d*) վրկ-ից" ], "in \\1 week": [ - "(\\d+) շաբ անց", - "(\\d+) շաբ-ից", - "(\\d+) շաբաթից" + "(\\d+[.,]?\\d*) շաբ անց", + "(\\d+[.,]?\\d*) շաբ-ից", + "(\\d+[.,]?\\d*) շաբաթից" ], "in \\1 year": [ - "(\\d+) տարուց" + "(\\d+[.,]?\\d*) տարուց" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/id.py b/dateparser/data/date_translation_data/id.py index caf1ebc8d..56e523726 100644 --- a/dateparser/data/date_translation_data/id.py +++ b/dateparser/data/date_translation_data/id.py @@ -180,59 +180,59 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) h lalu", - "(\\d+) hari yang lalu" + "(\\d+[.,]?\\d*) h lalu", + "(\\d+[.,]?\\d*) hari yang lalu" ], "\\1 hour ago": [ - "(\\d+) jam lalu", - "(\\d+) jam yang lalu" + "(\\d+[.,]?\\d*) jam lalu", + "(\\d+[.,]?\\d*) jam yang lalu" ], "\\1 minute ago": [ - "(\\d+) menit yang lalu", - "(\\d+) mnt lalu" + "(\\d+[.,]?\\d*) menit yang lalu", + "(\\d+[.,]?\\d*) mnt lalu" ], "\\1 month ago": [ - "(\\d+) bln lalu", - "(\\d+) bulan yang lalu" + "(\\d+[.,]?\\d*) bln lalu", + "(\\d+[.,]?\\d*) bulan yang lalu" ], "\\1 second ago": [ - "(\\d+) detik yang lalu", - "(\\d+) dtk lalu" + "(\\d+[.,]?\\d*) detik yang lalu", + "(\\d+[.,]?\\d*) dtk lalu" ], "\\1 week ago": [ - "(\\d+) mgg lalu", - "(\\d+) minggu yang lalu" + "(\\d+[.,]?\\d*) mgg lalu", + "(\\d+[.,]?\\d*) minggu yang lalu" ], "\\1 year ago": [ - "(\\d+) tahun yang lalu", - "(\\d+) thn lalu" + "(\\d+[.,]?\\d*) tahun yang lalu", + "(\\d+[.,]?\\d*) thn lalu" ], "in \\1 day": [ - "dalam (\\d+) h", - "dalam (\\d+) hari" + "dalam (\\d+[.,]?\\d*) h", + "dalam (\\d+[.,]?\\d*) hari" ], "in \\1 hour": [ - "dalam (\\d+) jam" + "dalam (\\d+[.,]?\\d*) jam" ], "in \\1 minute": [ - "dalam (\\d+) menit", - "dlm (\\d+) mnt" + "dalam (\\d+[.,]?\\d*) menit", + "dlm (\\d+[.,]?\\d*) mnt" ], "in \\1 month": [ - "dalam (\\d+) bulan", - "dlm (\\d+) bln" + "dalam (\\d+[.,]?\\d*) bulan", + "dlm (\\d+[.,]?\\d*) bln" ], "in \\1 second": [ - "dalam (\\d+) detik", - "dlm (\\d+) dtk" + "dalam (\\d+[.,]?\\d*) detik", + "dlm (\\d+[.,]?\\d*) dtk" ], "in \\1 week": [ - "dalam (\\d+) minggu", - "dlm (\\d+) mgg" + "dalam (\\d+[.,]?\\d*) minggu", + "dlm (\\d+[.,]?\\d*) mgg" ], "in \\1 year": [ - "dalam (\\d+) tahun", - "dlm (\\d+) thn" + "dalam (\\d+[.,]?\\d*) tahun", + "dlm (\\d+[.,]?\\d*) thn" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/is.py b/dateparser/data/date_translation_data/is.py index 781cc5901..40e481bb7 100644 --- a/dateparser/data/date_translation_data/is.py +++ b/dateparser/data/date_translation_data/is.py @@ -161,67 +161,67 @@ }, "relative-type-regex": { "\\1 day ago": [ - "fyrir (\\d+) degi", - "fyrir (\\d+) dögum" + "fyrir (\\d+[.,]?\\d*) degi", + "fyrir (\\d+[.,]?\\d*) dögum" ], "\\1 hour ago": [ - "fyrir (\\d+) klst", - "fyrir (\\d+) klukkustund", - "fyrir (\\d+) klukkustundum" + "fyrir (\\d+[.,]?\\d*) klst", + "fyrir (\\d+[.,]?\\d*) klukkustund", + "fyrir (\\d+[.,]?\\d*) klukkustundum" ], "\\1 minute ago": [ - "fyrir (\\d+) mín", - "fyrir (\\d+) mínútu", - "fyrir (\\d+) mínútum" + "fyrir (\\d+[.,]?\\d*) mín", + "fyrir (\\d+[.,]?\\d*) mínútu", + "fyrir (\\d+[.,]?\\d*) mínútum" ], "\\1 month ago": [ - "fyrir (\\d+) mán", - "fyrir (\\d+) mánuði", - "fyrir (\\d+) mánuðum" + "fyrir (\\d+[.,]?\\d*) mán", + "fyrir (\\d+[.,]?\\d*) mánuði", + "fyrir (\\d+[.,]?\\d*) mánuðum" ], "\\1 second ago": [ - "fyrir (\\d+) sek", - "fyrir (\\d+) sekúndu", - "fyrir (\\d+) sekúndum" + "fyrir (\\d+[.,]?\\d*) sek", + "fyrir (\\d+[.,]?\\d*) sekúndu", + "fyrir (\\d+[.,]?\\d*) sekúndum" ], "\\1 week ago": [ - "fyrir (\\d+) viku", - "fyrir (\\d+) vikum" + "fyrir (\\d+[.,]?\\d*) viku", + "fyrir (\\d+[.,]?\\d*) vikum" ], "\\1 year ago": [ - "fyrir (\\d+) ári", - "fyrir (\\d+) árum" + "fyrir (\\d+[.,]?\\d*) ári", + "fyrir (\\d+[.,]?\\d*) árum" ], "in \\1 day": [ - "eftir (\\d+) dag", - "eftir (\\d+) daga" + "eftir (\\d+[.,]?\\d*) dag", + "eftir (\\d+[.,]?\\d*) daga" ], "in \\1 hour": [ - "eftir (\\d+) klst", - "eftir (\\d+) klukkustund", - "eftir (\\d+) klukkustundir" + "eftir (\\d+[.,]?\\d*) klst", + "eftir (\\d+[.,]?\\d*) klukkustund", + "eftir (\\d+[.,]?\\d*) klukkustundir" ], "in \\1 minute": [ - "eftir (\\d+) mín", - "eftir (\\d+) mínútu", - "eftir (\\d+) mínútur" + "eftir (\\d+[.,]?\\d*) mín", + "eftir (\\d+[.,]?\\d*) mínútu", + "eftir (\\d+[.,]?\\d*) mínútur" ], "in \\1 month": [ - "eftir (\\d+) mán", - "eftir (\\d+) mánuð", - "eftir (\\d+) mánuði" + "eftir (\\d+[.,]?\\d*) mán", + "eftir (\\d+[.,]?\\d*) mánuð", + "eftir (\\d+[.,]?\\d*) mánuði" ], "in \\1 second": [ - "eftir (\\d+) sek", - "eftir (\\d+) sekúndu", - "eftir (\\d+) sekúndur" + "eftir (\\d+[.,]?\\d*) sek", + "eftir (\\d+[.,]?\\d*) sekúndu", + "eftir (\\d+[.,]?\\d*) sekúndur" ], "in \\1 week": [ - "eftir (\\d+) viku", - "eftir (\\d+) vikur" + "eftir (\\d+[.,]?\\d*) viku", + "eftir (\\d+[.,]?\\d*) vikur" ], "in \\1 year": [ - "eftir (\\d+) ár" + "eftir (\\d+[.,]?\\d*) ár" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/it.py b/dateparser/data/date_translation_data/it.py index b6e2735ca..fee99ccc1 100644 --- a/dateparser/data/date_translation_data/it.py +++ b/dateparser/data/date_translation_data/it.py @@ -170,74 +170,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) g fa", - "(\\d+) gg fa", - "(\\d+) giorni fa", - "(\\d+) giorno fa" + "(\\d+[.,]?\\d*) g fa", + "(\\d+[.,]?\\d*) gg fa", + "(\\d+[.,]?\\d*) giorni fa", + "(\\d+[.,]?\\d*) giorno fa" ], "\\1 hour ago": [ - "(\\d+) h fa", - "(\\d+) ora fa", - "(\\d+) ore fa" + "(\\d+[.,]?\\d*) h fa", + "(\\d+[.,]?\\d*) ora fa", + "(\\d+[.,]?\\d*) ore fa" ], "\\1 minute ago": [ - "(\\d+) min fa", - "(\\d+) minuti fa", - "(\\d+) minuto fa" + "(\\d+[.,]?\\d*) min fa", + "(\\d+[.,]?\\d*) minuti fa", + "(\\d+[.,]?\\d*) minuto fa" ], "\\1 month ago": [ - "(\\d+) mese fa", - "(\\d+) mesi fa" + "(\\d+[.,]?\\d*) mese fa", + "(\\d+[.,]?\\d*) mesi fa" ], "\\1 second ago": [ - "(\\d+) s fa", - "(\\d+) sec fa", - "(\\d+) secondi fa", - "(\\d+) secondo fa" + "(\\d+[.,]?\\d*) s fa", + "(\\d+[.,]?\\d*) sec fa", + "(\\d+[.,]?\\d*) secondi fa", + "(\\d+[.,]?\\d*) secondo fa" ], "\\1 week ago": [ - "(\\d+) sett fa", - "(\\d+) settimana fa", - "(\\d+) settimane fa" + "(\\d+[.,]?\\d*) sett fa", + "(\\d+[.,]?\\d*) settimana fa", + "(\\d+[.,]?\\d*) settimane fa" ], "\\1 year ago": [ - "(\\d+) anni fa", - "(\\d+) anno fa" + "(\\d+[.,]?\\d*) anni fa", + "(\\d+[.,]?\\d*) anno fa" ], "in \\1 day": [ - "tra (\\d+) g", - "tra (\\d+) gg", - "tra (\\d+) giorni", - "tra (\\d+) giorno" + "tra (\\d+[.,]?\\d*) g", + "tra (\\d+[.,]?\\d*) gg", + "tra (\\d+[.,]?\\d*) giorni", + "tra (\\d+[.,]?\\d*) giorno" ], "in \\1 hour": [ - "tra (\\d+) h", - "tra (\\d+) ora", - "tra (\\d+) ore" + "tra (\\d+[.,]?\\d*) h", + "tra (\\d+[.,]?\\d*) ora", + "tra (\\d+[.,]?\\d*) ore" ], "in \\1 minute": [ - "tra (\\d+) min", - "tra (\\d+) minuti", - "tra (\\d+) minuto" + "tra (\\d+[.,]?\\d*) min", + "tra (\\d+[.,]?\\d*) minuti", + "tra (\\d+[.,]?\\d*) minuto" ], "in \\1 month": [ - "tra (\\d+) mese", - "tra (\\d+) mesi" + "tra (\\d+[.,]?\\d*) mese", + "tra (\\d+[.,]?\\d*) mesi" ], "in \\1 second": [ - "tra (\\d+) s", - "tra (\\d+) sec", - "tra (\\d+) secondi", - "tra (\\d+) secondo" + "tra (\\d+[.,]?\\d*) s", + "tra (\\d+[.,]?\\d*) sec", + "tra (\\d+[.,]?\\d*) secondi", + "tra (\\d+[.,]?\\d*) secondo" ], "in \\1 week": [ - "tra (\\d+) sett", - "tra (\\d+) settimana", - "tra (\\d+) settimane" + "tra (\\d+[.,]?\\d*) sett", + "tra (\\d+[.,]?\\d*) settimana", + "tra (\\d+[.,]?\\d*) settimane" ], "in \\1 year": [ - "tra (\\d+) anni", - "tra (\\d+) anno" + "tra (\\d+[.,]?\\d*) anni", + "tra (\\d+[.,]?\\d*) anno" ] }, "locale_specific": { @@ -276,7 +276,7 @@ ], "simplifications": [ { - "(\\d+)\\s+ora": "\\1 ore" + "(\\d+[.,]?\\d*)\\s+ora": "\\1 ore" } ] } diff --git a/dateparser/data/date_translation_data/ja.py b/dateparser/data/date_translation_data/ja.py index aacba6f4b..fe1d3391d 100644 --- a/dateparser/data/date_translation_data/ja.py +++ b/dateparser/data/date_translation_data/ja.py @@ -176,60 +176,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) 日前", - "(\\d+)日前" + "(\\d+[.,]?\\d*) 日前", + "(\\d+[.,]?\\d*)日前" ], "\\1 hour ago": [ - "(\\d+) 時間前", - "(\\d+)時間前" + "(\\d+[.,]?\\d*) 時間前", + "(\\d+[.,]?\\d*)時間前" ], "\\1 minute ago": [ - "(\\d+) 分前", - "(\\d+)分前" + "(\\d+[.,]?\\d*) 分前", + "(\\d+[.,]?\\d*)分前" ], "\\1 month ago": [ - "(\\d+) か月前", - "(\\d+)か月前" + "(\\d+[.,]?\\d*) か月前", + "(\\d+[.,]?\\d*)か月前" ], "\\1 second ago": [ - "(\\d+) 秒前", - "(\\d+)秒前" + "(\\d+[.,]?\\d*) 秒前", + "(\\d+[.,]?\\d*)秒前" ], "\\1 week ago": [ - "(\\d+) 週間前", - "(\\d+)週間前" + "(\\d+[.,]?\\d*) 週間前", + "(\\d+[.,]?\\d*)週間前" ], "\\1 year ago": [ - "(\\d+) 年前", - "(\\d+)年前" + "(\\d+[.,]?\\d*) 年前", + "(\\d+[.,]?\\d*)年前" ], "in \\1 day": [ - "(\\d+) 日後", - "(\\d+)日後" + "(\\d+[.,]?\\d*) 日後", + "(\\d+[.,]?\\d*)日後" ], "in \\1 hour": [ - "(\\d+) 時間後", - "(\\d+)時間後" + "(\\d+[.,]?\\d*) 時間後", + "(\\d+[.,]?\\d*)時間後" ], "in \\1 minute": [ - "(\\d+) 分後", - "(\\d+)分後" + "(\\d+[.,]?\\d*) 分後", + "(\\d+[.,]?\\d*)分後" ], "in \\1 month": [ - "(\\d+) か月後", - "(\\d+)か月後" + "(\\d+[.,]?\\d*) か月後", + "(\\d+[.,]?\\d*)か月後" ], "in \\1 second": [ - "(\\d+) 秒後", - "(\\d+)秒後" + "(\\d+[.,]?\\d*) 秒後", + "(\\d+[.,]?\\d*)秒後" ], "in \\1 week": [ - "(\\d+) 週間後", - "(\\d+)週間後" + "(\\d+[.,]?\\d*) 週間後", + "(\\d+[.,]?\\d*)週間後" ], "in \\1 year": [ - "(\\d+) 年後", - "(\\d+)年後" + "(\\d+[.,]?\\d*) 年後", + "(\\d+[.,]?\\d*)年後" ] }, "locale_specific": {}, @@ -259,19 +259,19 @@ ], "simplifications": [ { - "(\\d+)年(?:\\s+)?(\\d+)月(?:\\s+)?(\\d+)日": "\\1-\\2-\\3" + "(\\d+[.,]?\\d*)年(?:\\s+)?(\\d+[.,]?\\d*)月(?:\\s+)?(\\d+[.,]?\\d*)日": "\\1-\\2-\\3" }, { - "(\\d+)月(?:\\s+)?(\\d+)日": "\\1-\\2" + "(\\d+[.,]?\\d*)月(?:\\s+)?(\\d+[.,]?\\d*)日": "\\1-\\2" }, { - "(\\d+)時(?:\\s+)?(\\d+)分(?:\\s+)?(\\d+)秒": "\\1:\\2:\\3" + "(\\d+[.,]?\\d*)時(?:\\s+)?(\\d+[.,]?\\d*)分(?:\\s+)?(\\d+[.,]?\\d*)秒": "\\1:\\2:\\3" }, { - "(\\d+)時(?:\\s+)?(\\d+)分": "\\1:\\2" + "(\\d+[.,]?\\d*)時(?:\\s+)?(\\d+[.,]?\\d*)分": "\\1:\\2" }, { - "(\\d+)時$": "\\1:00" + "(\\d+[.,]?\\d*)時$": "\\1:00" } ] } diff --git a/dateparser/data/date_translation_data/jgo.py b/dateparser/data/date_translation_data/jgo.py index 172f8fdf0..9e52f34bc 100644 --- a/dateparser/data/date_translation_data/jgo.py +++ b/dateparser/data/date_translation_data/jgo.py @@ -134,40 +134,40 @@ }, "relative-type-regex": { "\\1 day ago": [ - "ɛ́ gɛ́ mɔ́ lɛ́ꞌ (\\d+)" + "ɛ́ gɛ́ mɔ́ lɛ́ꞌ (\\d+[.,]?\\d*)" ], "\\1 hour ago": [ - "ɛ́ gɛ mɔ́ (\\d+) háwa" + "ɛ́ gɛ mɔ́ (\\d+[.,]?\\d*) háwa" ], "\\1 minute ago": [ - "ɛ́ gɛ́ mɔ́ minút (\\d+)" + "ɛ́ gɛ́ mɔ́ minút (\\d+[.,]?\\d*)" ], "\\1 month ago": [ - "ɛ́ gɛ́ mɔ́ pɛsaŋ (\\d+)" + "ɛ́ gɛ́ mɔ́ pɛsaŋ (\\d+[.,]?\\d*)" ], "\\1 week ago": [ - "ɛ́ gɛ́ mɔ (\\d+) ŋgap-mbi" + "ɛ́ gɛ́ mɔ (\\d+[.,]?\\d*) ŋgap-mbi" ], "\\1 year ago": [ - "ɛ́gɛ́ mɔ́ ŋguꞌ (\\d+)" + "ɛ́gɛ́ mɔ́ ŋguꞌ (\\d+[.,]?\\d*)" ], "in \\1 day": [ - "nǔu lɛ́ꞌ (\\d+)" + "nǔu lɛ́ꞌ (\\d+[.,]?\\d*)" ], "in \\1 hour": [ - "nǔu háwa (\\d+)" + "nǔu háwa (\\d+[.,]?\\d*)" ], "in \\1 minute": [ - "nǔu (\\d+) minút" + "nǔu (\\d+[.,]?\\d*) minút" ], "in \\1 month": [ - "nǔu (\\d+) saŋ" + "nǔu (\\d+[.,]?\\d*) saŋ" ], "in \\1 week": [ - "nǔu ŋgap-mbi (\\d+)" + "nǔu ŋgap-mbi (\\d+[.,]?\\d*)" ], "in \\1 year": [ - "nǔu ŋguꞌ (\\d+)" + "nǔu ŋguꞌ (\\d+[.,]?\\d*)" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ka.py b/dateparser/data/date_translation_data/ka.py index a711c757a..f303291fd 100644 --- a/dateparser/data/date_translation_data/ka.py +++ b/dateparser/data/date_translation_data/ka.py @@ -160,51 +160,51 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) დღის წინ" + "(\\d+[.,]?\\d*) დღის წინ" ], "\\1 hour ago": [ - "(\\d+) საათის წინ", - "(\\d+) სთ წინ" + "(\\d+[.,]?\\d*) საათის წინ", + "(\\d+[.,]?\\d*) სთ წინ" ], "\\1 minute ago": [ - "(\\d+) წთ წინ", - "(\\d+) წუთის წინ" + "(\\d+[.,]?\\d*) წთ წინ", + "(\\d+[.,]?\\d*) წუთის წინ" ], "\\1 month ago": [ - "(\\d+) თვის წინ" + "(\\d+[.,]?\\d*) თვის წინ" ], "\\1 second ago": [ - "(\\d+) წამის წინ", - "(\\d+) წმ წინ" + "(\\d+[.,]?\\d*) წამის წინ", + "(\\d+[.,]?\\d*) წმ წინ" ], "\\1 week ago": [ - "(\\d+) კვ წინ", - "(\\d+) კვირის წინ" + "(\\d+[.,]?\\d*) კვ წინ", + "(\\d+[.,]?\\d*) კვირის წინ" ], "\\1 year ago": [ - "(\\d+) წლის წინ" + "(\\d+[.,]?\\d*) წლის წინ" ], "in \\1 day": [ - "(\\d+) დღეში" + "(\\d+[.,]?\\d*) დღეში" ], "in \\1 hour": [ - "(\\d+) საათში" + "(\\d+[.,]?\\d*) საათში" ], "in \\1 minute": [ - "(\\d+) წუთში" + "(\\d+[.,]?\\d*) წუთში" ], "in \\1 month": [ - "(\\d+) თვეში" + "(\\d+[.,]?\\d*) თვეში" ], "in \\1 second": [ - "(\\d+) წამში" + "(\\d+[.,]?\\d*) წამში" ], "in \\1 week": [ - "(\\d+) კვირაში" + "(\\d+[.,]?\\d*) კვირაში" ], "in \\1 year": [ - "(\\d+) წელიწადში", - "(\\d+) წელში" + "(\\d+[.,]?\\d*) წელიწადში", + "(\\d+[.,]?\\d*) წელში" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/kea.py b/dateparser/data/date_translation_data/kea.py index c74d526e0..b642fa156 100644 --- a/dateparser/data/date_translation_data/kea.py +++ b/dateparser/data/date_translation_data/kea.py @@ -160,56 +160,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "a ten (\\d+) dia" + "a ten (\\d+[.,]?\\d*) dia" ], "\\1 hour ago": [ - "a ten (\\d+) ora" + "a ten (\\d+[.,]?\\d*) ora" ], "\\1 minute ago": [ - "a ten (\\d+) m", - "a ten (\\d+) min", - "a ten (\\d+) minutu" + "a ten (\\d+[.,]?\\d*) m", + "a ten (\\d+[.,]?\\d*) min", + "a ten (\\d+[.,]?\\d*) minutu" ], "\\1 month ago": [ - "a ten (\\d+) mes" + "a ten (\\d+[.,]?\\d*) mes" ], "\\1 second ago": [ - "a ten (\\d+) s", - "a ten (\\d+) sig", - "a ten (\\d+) sigundu" + "a ten (\\d+[.,]?\\d*) s", + "a ten (\\d+[.,]?\\d*) sig", + "a ten (\\d+[.,]?\\d*) sigundu" ], "\\1 week ago": [ - "a ten (\\d+) sim", - "a ten (\\d+) simana" + "a ten (\\d+[.,]?\\d*) sim", + "a ten (\\d+[.,]?\\d*) simana" ], "\\1 year ago": [ - "a ten (\\d+) anu" + "a ten (\\d+[.,]?\\d*) anu" ], "in \\1 day": [ - "di li (\\d+) dia" + "di li (\\d+[.,]?\\d*) dia" ], "in \\1 hour": [ - "di li (\\d+) ora" + "di li (\\d+[.,]?\\d*) ora" ], "in \\1 minute": [ - "di li (\\d+) m", - "di li (\\d+) min", - "di li (\\d+) minutu" + "di li (\\d+[.,]?\\d*) m", + "di li (\\d+[.,]?\\d*) min", + "di li (\\d+[.,]?\\d*) minutu" ], "in \\1 month": [ - "di li (\\d+) mes" + "di li (\\d+[.,]?\\d*) mes" ], "in \\1 second": [ - "di li (\\d+) s", - "di li (\\d+) sig", - "di li (\\d+) sigundu" + "di li (\\d+[.,]?\\d*) s", + "di li (\\d+[.,]?\\d*) sig", + "di li (\\d+[.,]?\\d*) sigundu" ], "in \\1 week": [ - "di li (\\d+) sim", - "di li (\\d+) simana" + "di li (\\d+[.,]?\\d*) sim", + "di li (\\d+[.,]?\\d*) simana" ], "in \\1 year": [ - "di li (\\d+) anu" + "di li (\\d+[.,]?\\d*) anu" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/kk.py b/dateparser/data/date_translation_data/kk.py index 04181b4f5..733522348 100644 --- a/dateparser/data/date_translation_data/kk.py +++ b/dateparser/data/date_translation_data/kk.py @@ -158,56 +158,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) күн бұрын" + "(\\d+[.,]?\\d*) күн бұрын" ], "\\1 hour ago": [ - "(\\d+) сағ бұрын", - "(\\d+) сағат бұрын" + "(\\d+[.,]?\\d*) сағ бұрын", + "(\\d+[.,]?\\d*) сағат бұрын" ], "\\1 minute ago": [ - "(\\d+) мин бұрын", - "(\\d+) минут бұрын" + "(\\d+[.,]?\\d*) мин бұрын", + "(\\d+[.,]?\\d*) минут бұрын" ], "\\1 month ago": [ - "(\\d+) ай бұрын" + "(\\d+[.,]?\\d*) ай бұрын" ], "\\1 second ago": [ - "(\\d+) сек бұрын", - "(\\d+) секунд бұрын" + "(\\d+[.,]?\\d*) сек бұрын", + "(\\d+[.,]?\\d*) секунд бұрын" ], "\\1 week ago": [ - "(\\d+) ап бұрын", - "(\\d+) апта бұрын" + "(\\d+[.,]?\\d*) ап бұрын", + "(\\d+[.,]?\\d*) апта бұрын" ], "\\1 year ago": [ - "(\\d+) ж бұрын", - "(\\d+) жыл бұрын" + "(\\d+[.,]?\\d*) ж бұрын", + "(\\d+[.,]?\\d*) жыл бұрын" ], "in \\1 day": [ - "(\\d+) күннен кейін" + "(\\d+[.,]?\\d*) күннен кейін" ], "in \\1 hour": [ - "(\\d+) сағ кейін", - "(\\d+) сағаттан кейін" + "(\\d+[.,]?\\d*) сағ кейін", + "(\\d+[.,]?\\d*) сағаттан кейін" ], "in \\1 minute": [ - "(\\d+) мин кейін", - "(\\d+) минуттан кейін" + "(\\d+[.,]?\\d*) мин кейін", + "(\\d+[.,]?\\d*) минуттан кейін" ], "in \\1 month": [ - "(\\d+) айдан кейін" + "(\\d+[.,]?\\d*) айдан кейін" ], "in \\1 second": [ - "(\\d+) сек кейін", - "(\\d+) секундтан кейін" + "(\\d+[.,]?\\d*) сек кейін", + "(\\d+[.,]?\\d*) секундтан кейін" ], "in \\1 week": [ - "(\\d+) ап кейін", - "(\\d+) аптадан кейін" + "(\\d+[.,]?\\d*) ап кейін", + "(\\d+[.,]?\\d*) аптадан кейін" ], "in \\1 year": [ - "(\\d+) ж кейін", - "(\\d+) жылдан кейін" + "(\\d+[.,]?\\d*) ж кейін", + "(\\d+[.,]?\\d*) жылдан кейін" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/kl.py b/dateparser/data/date_translation_data/kl.py index be7e5bf09..eddcea08e 100644 --- a/dateparser/data/date_translation_data/kl.py +++ b/dateparser/data/date_translation_data/kl.py @@ -153,46 +153,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "for (\\d+) ulloq unnuarlu siden" + "for (\\d+[.,]?\\d*) ulloq unnuarlu siden" ], "\\1 hour ago": [ - "for (\\d+) nalunaaquttap-akunnera siden" + "for (\\d+[.,]?\\d*) nalunaaquttap-akunnera siden" ], "\\1 minute ago": [ - "for (\\d+) minutsi siden" + "for (\\d+[.,]?\\d*) minutsi siden" ], "\\1 month ago": [ - "for (\\d+) qaammat siden" + "for (\\d+[.,]?\\d*) qaammat siden" ], "\\1 second ago": [ - "for (\\d+) sekundi siden" + "for (\\d+[.,]?\\d*) sekundi siden" ], "\\1 week ago": [ - "for (\\d+) sapaatip-akunnera siden" + "for (\\d+[.,]?\\d*) sapaatip-akunnera siden" ], "\\1 year ago": [ - "for (\\d+) ukioq siden" + "for (\\d+[.,]?\\d*) ukioq siden" ], "in \\1 day": [ - "om (\\d+) ulloq unnuarlu" + "om (\\d+[.,]?\\d*) ulloq unnuarlu" ], "in \\1 hour": [ - "om (\\d+) nalunaaquttap-akunnera" + "om (\\d+[.,]?\\d*) nalunaaquttap-akunnera" ], "in \\1 minute": [ - "om (\\d+) minutsi" + "om (\\d+[.,]?\\d*) minutsi" ], "in \\1 month": [ - "om (\\d+) qaammat" + "om (\\d+[.,]?\\d*) qaammat" ], "in \\1 second": [ - "om (\\d+) sekundi" + "om (\\d+[.,]?\\d*) sekundi" ], "in \\1 week": [ - "om (\\d+) sapaatip-akunnera" + "om (\\d+[.,]?\\d*) sapaatip-akunnera" ], "in \\1 year": [ - "om (\\d+) ukioq" + "om (\\d+[.,]?\\d*) ukioq" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/km.py b/dateparser/data/date_translation_data/km.py index 075408244..cda9dad61 100644 --- a/dateparser/data/date_translation_data/km.py +++ b/dateparser/data/date_translation_data/km.py @@ -135,49 +135,49 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ថ្ងៃ​មុន", - "(\\d+) ថ្ងៃ​​មុន" + "(\\d+[.,]?\\d*) ថ្ងៃ​មុន", + "(\\d+[.,]?\\d*) ថ្ងៃ​​មុន" ], "\\1 hour ago": [ - "(\\d+) ម៉ោង​មុន" + "(\\d+[.,]?\\d*) ម៉ោង​មុន" ], "\\1 minute ago": [ - "(\\d+) នាទី​មុន", - "(\\d+) នាទី​​មុន" + "(\\d+[.,]?\\d*) នាទី​មុន", + "(\\d+[.,]?\\d*) នាទី​​មុន" ], "\\1 month ago": [ - "(\\d+) ខែមុន" + "(\\d+[.,]?\\d*) ខែមុន" ], "\\1 second ago": [ - "(\\d+) វិនាទី​មុន" + "(\\d+[.,]?\\d*) វិនាទី​មុន" ], "\\1 week ago": [ - "(\\d+) សប្ដាហ៍​មុន" + "(\\d+[.,]?\\d*) សប្ដាហ៍​មុន" ], "\\1 year ago": [ - "(\\d+) ឆ្នាំ​មុន" + "(\\d+[.,]?\\d*) ឆ្នាំ​មុន" ], "in \\1 day": [ - "(\\d+) ថ្ងៃទៀត" + "(\\d+[.,]?\\d*) ថ្ងៃទៀត" ], "in \\1 hour": [ - "(\\d+) ម៉ោងទៀត", - "ក្នុង​រយៈ​ពេល (\\d+) ម៉ោង" + "(\\d+[.,]?\\d*) ម៉ោងទៀត", + "ក្នុង​រយៈ​ពេល (\\d+[.,]?\\d*) ម៉ោង" ], "in \\1 minute": [ - "(\\d+) នាទីទៀត" + "(\\d+[.,]?\\d*) នាទីទៀត" ], "in \\1 month": [ - "(\\d+) ខែទៀត" + "(\\d+[.,]?\\d*) ខែទៀត" ], "in \\1 second": [ - "(\\d+) វិនាទីទៀត" + "(\\d+[.,]?\\d*) វិនាទីទៀត" ], "in \\1 week": [ - "(\\d+) សប្ដាហ៍ទៀត" + "(\\d+[.,]?\\d*) សប្ដាហ៍ទៀត" ], "in \\1 year": [ - "(\\d+) ឆ្នាំទៀត" + "(\\d+[.,]?\\d*) ឆ្នាំទៀត" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/kn.py b/dateparser/data/date_translation_data/kn.py index cb0ba866d..d575334e8 100644 --- a/dateparser/data/date_translation_data/kn.py +++ b/dateparser/data/date_translation_data/kn.py @@ -150,61 +150,61 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ದಿನಗಳ ಹಿಂದೆ", - "(\\d+) ದಿನದ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ದಿನಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ದಿನದ ಹಿಂದೆ" ], "\\1 hour ago": [ - "(\\d+) ಗಂಟೆ ಹಿಂದೆ", - "(\\d+) ಗಂಟೆಗಳ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ಗಂಟೆ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ಗಂಟೆಗಳ ಹಿಂದೆ" ], "\\1 minute ago": [ - "(\\d+) ನಿಮಿಷಗಳ ಹಿಂದೆ", - "(\\d+) ನಿಮಿಷದ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ನಿಮಿಷಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ನಿಮಿಷದ ಹಿಂದೆ" ], "\\1 month ago": [ - "(\\d+) ತಿಂಗಳ ಹಿಂದೆ", - "(\\d+) ತಿಂಗಳು ಹಿಂದೆ", - "(\\d+) ತಿಂಗಳುಗಳ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ತಿಂಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ತಿಂಗಳು ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ತಿಂಗಳುಗಳ ಹಿಂದೆ" ], "\\1 second ago": [ - "(\\d+) ಸೆಕೆಂಡುಗಳ ಹಿಂದೆ", - "(\\d+) ಸೆಕೆಂಡ್ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ಸೆಕೆಂಡುಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ಸೆಕೆಂಡ್ ಹಿಂದೆ" ], "\\1 week ago": [ - "(\\d+) ವಾರಗಳ ಹಿಂದೆ", - "(\\d+) ವಾರದ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ವಾರಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ವಾರದ ಹಿಂದೆ" ], "\\1 year ago": [ - "(\\d+) ವರ್ಷಗಳ ಹಿಂದೆ", - "(\\d+) ವರ್ಷದ ಹಿಂದೆ" + "(\\d+[.,]?\\d*) ವರ್ಷಗಳ ಹಿಂದೆ", + "(\\d+[.,]?\\d*) ವರ್ಷದ ಹಿಂದೆ" ], "in \\1 day": [ - "(\\d+) ದಿನಗಳಲ್ಲಿ", - "(\\d+) ದಿನದಲ್ಲಿ" + "(\\d+[.,]?\\d*) ದಿನಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ದಿನದಲ್ಲಿ" ], "in \\1 hour": [ - "(\\d+) ಗಂಟೆಗಳಲ್ಲಿ", - "(\\d+) ಗಂಟೆಯಲ್ಲಿ" + "(\\d+[.,]?\\d*) ಗಂಟೆಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ಗಂಟೆಯಲ್ಲಿ" ], "in \\1 minute": [ - "(\\d+) ನಿಮಿಷಗಳಲ್ಲಿ", - "(\\d+) ನಿಮಿಷದಲ್ಲಿ" + "(\\d+[.,]?\\d*) ನಿಮಿಷಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ನಿಮಿಷದಲ್ಲಿ" ], "in \\1 month": [ - "(\\d+) ತಿಂಗಳಲ್ಲಿ", - "(\\d+) ತಿಂಗಳುಗಳಲ್ಲಿ" + "(\\d+[.,]?\\d*) ತಿಂಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ತಿಂಗಳುಗಳಲ್ಲಿ" ], "in \\1 second": [ - "(\\d+) ಸೆಕೆಂಡ್‌ಗಳಲ್ಲಿ", - "(\\d+) ಸೆಕೆಂಡ್‌ನಲ್ಲಿ" + "(\\d+[.,]?\\d*) ಸೆಕೆಂಡ್‌ಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ಸೆಕೆಂಡ್‌ನಲ್ಲಿ" ], "in \\1 week": [ - "(\\d+) ವಾರಗಳಲ್ಲಿ", - "(\\d+) ವಾರದಲ್ಲಿ" + "(\\d+[.,]?\\d*) ವಾರಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ವಾರದಲ್ಲಿ" ], "in \\1 year": [ - "(\\d+) ವರ್ಷಗಳಲ್ಲಿ", - "(\\d+) ವರ್ಷದಲ್ಲಿ" + "(\\d+[.,]?\\d*) ವರ್ಷಗಳಲ್ಲಿ", + "(\\d+[.,]?\\d*) ವರ್ಷದಲ್ಲಿ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ko.py b/dateparser/data/date_translation_data/ko.py index aa49d7a1d..6b361e07a 100644 --- a/dateparser/data/date_translation_data/ko.py +++ b/dateparser/data/date_translation_data/ko.py @@ -143,46 +143,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+)일 전" + "(\\d+[.,]?\\d*)일 전" ], "\\1 hour ago": [ - "(\\d+)시간 전" + "(\\d+[.,]?\\d*)시간 전" ], "\\1 minute ago": [ - "(\\d+)분 전" + "(\\d+[.,]?\\d*)분 전" ], "\\1 month ago": [ - "(\\d+)개월 전" + "(\\d+[.,]?\\d*)개월 전" ], "\\1 second ago": [ - "(\\d+)초 전" + "(\\d+[.,]?\\d*)초 전" ], "\\1 week ago": [ - "(\\d+)주 전" + "(\\d+[.,]?\\d*)주 전" ], "\\1 year ago": [ - "(\\d+)년 전" + "(\\d+[.,]?\\d*)년 전" ], "in \\1 day": [ - "(\\d+)일 후" + "(\\d+[.,]?\\d*)일 후" ], "in \\1 hour": [ - "(\\d+)시간 후" + "(\\d+[.,]?\\d*)시간 후" ], "in \\1 minute": [ - "(\\d+)분 후" + "(\\d+[.,]?\\d*)분 후" ], "in \\1 month": [ - "(\\d+)개월 후" + "(\\d+[.,]?\\d*)개월 후" ], "in \\1 second": [ - "(\\d+)초 후" + "(\\d+[.,]?\\d*)초 후" ], "in \\1 week": [ - "(\\d+)주 후" + "(\\d+[.,]?\\d*)주 후" ], "in \\1 year": [ - "(\\d+)년 후" + "(\\d+[.,]?\\d*)년 후" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ksh.py b/dateparser/data/date_translation_data/ksh.py index 42f871792..123828698 100644 --- a/dateparser/data/date_translation_data/ksh.py +++ b/dateparser/data/date_translation_data/ksh.py @@ -166,12 +166,12 @@ }, "relative-type-regex": { "\\1 year ago": [ - "vör (\\d+) johr", - "vör (\\d+) johre" + "vör (\\d+[.,]?\\d*) johr", + "vör (\\d+[.,]?\\d*) johre" ], "in \\1 year": [ - "en (\\d+) johr", - "en (\\d+) johre" + "en (\\d+[.,]?\\d*) johr", + "en (\\d+[.,]?\\d*) johre" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ky.py b/dateparser/data/date_translation_data/ky.py index 5c5b2e062..847110dab 100644 --- a/dateparser/data/date_translation_data/ky.py +++ b/dateparser/data/date_translation_data/ky.py @@ -162,64 +162,64 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) күн мурун" + "(\\d+[.,]?\\d*) күн мурун" ], "\\1 hour ago": [ - "(\\d+) с мурн", - "(\\d+) саат мурун" + "(\\d+[.,]?\\d*) с мурн", + "(\\d+[.,]?\\d*) саат мурун" ], "\\1 minute ago": [ - "(\\d+) мүн мурн", - "(\\d+) мүн мурун", - "(\\d+) мүнөт мурун" + "(\\d+[.,]?\\d*) мүн мурн", + "(\\d+[.,]?\\d*) мүн мурун", + "(\\d+[.,]?\\d*) мүнөт мурун" ], "\\1 month ago": [ - "(\\d+) ай мурн", - "(\\d+) ай мурун" + "(\\d+[.,]?\\d*) ай мурн", + "(\\d+[.,]?\\d*) ай мурун" ], "\\1 second ago": [ - "(\\d+) сек мурн", - "(\\d+) сек мурун", - "(\\d+) секунд мурун" + "(\\d+[.,]?\\d*) сек мурн", + "(\\d+[.,]?\\d*) сек мурун", + "(\\d+[.,]?\\d*) секунд мурун" ], "\\1 week ago": [ - "(\\d+) апт мурун", - "(\\d+) апта мурун" + "(\\d+[.,]?\\d*) апт мурун", + "(\\d+[.,]?\\d*) апта мурун" ], "\\1 year ago": [ - "(\\d+) жыл мурун" + "(\\d+[.,]?\\d*) жыл мурун" ], "in \\1 day": [ - "(\\d+) күн кийин", - "(\\d+) күндөн кийин" + "(\\d+[.,]?\\d*) күн кийин", + "(\\d+[.,]?\\d*) күндөн кийин" ], "in \\1 hour": [ - "(\\d+) с кийн", - "(\\d+) саат кийин", - "(\\d+) сааттан кийин" + "(\\d+[.,]?\\d*) с кийн", + "(\\d+[.,]?\\d*) саат кийин", + "(\\d+[.,]?\\d*) сааттан кийин" ], "in \\1 minute": [ - "(\\d+) мүн кийин", - "(\\d+) мүн кийн", - "(\\d+) мүнөттөн кийин" + "(\\d+[.,]?\\d*) мүн кийин", + "(\\d+[.,]?\\d*) мүн кийн", + "(\\d+[.,]?\\d*) мүнөттөн кийин" ], "in \\1 month": [ - "(\\d+) айд кийин", - "(\\d+) айд кийн", - "(\\d+) айдан кийин" + "(\\d+[.,]?\\d*) айд кийин", + "(\\d+[.,]?\\d*) айд кийн", + "(\\d+[.,]?\\d*) айдан кийин" ], "in \\1 second": [ - "(\\d+) сек кийин", - "(\\d+) сек кийн", - "(\\d+) секунддан кийин" + "(\\d+[.,]?\\d*) сек кийин", + "(\\d+[.,]?\\d*) сек кийн", + "(\\d+[.,]?\\d*) секунддан кийин" ], "in \\1 week": [ - "(\\d+) апт кийин", - "(\\d+) аптадан кийин" + "(\\d+[.,]?\\d*) апт кийин", + "(\\d+[.,]?\\d*) аптадан кийин" ], "in \\1 year": [ - "(\\d+) жыл кийин", - "(\\d+) жылдан кийин" + "(\\d+[.,]?\\d*) жыл кийин", + "(\\d+[.,]?\\d*) жылдан кийин" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/lb.py b/dateparser/data/date_translation_data/lb.py index 181e73f14..18afe1be4 100644 --- a/dateparser/data/date_translation_data/lb.py +++ b/dateparser/data/date_translation_data/lb.py @@ -159,60 +159,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "virun (\\d+) d", - "virun (\\d+) dag" + "virun (\\d+[.,]?\\d*) d", + "virun (\\d+[.,]?\\d*) dag" ], "\\1 hour ago": [ - "virun (\\d+) st", - "virun (\\d+) stonn" + "virun (\\d+[.,]?\\d*) st", + "virun (\\d+[.,]?\\d*) stonn" ], "\\1 minute ago": [ - "virun (\\d+) min", - "virun (\\d+) minutt" + "virun (\\d+[.,]?\\d*) min", + "virun (\\d+[.,]?\\d*) minutt" ], "\\1 month ago": [ - "virun (\\d+) m", - "virun (\\d+) mount" + "virun (\\d+[.,]?\\d*) m", + "virun (\\d+[.,]?\\d*) mount" ], "\\1 second ago": [ - "virun (\\d+) sek", - "virun (\\d+) sekonn" + "virun (\\d+[.,]?\\d*) sek", + "virun (\\d+[.,]?\\d*) sekonn" ], "\\1 week ago": [ - "virun (\\d+) w", - "virun (\\d+) woch" + "virun (\\d+[.,]?\\d*) w", + "virun (\\d+[.,]?\\d*) woch" ], "\\1 year ago": [ - "virun (\\d+) j", - "virun (\\d+) joer" + "virun (\\d+[.,]?\\d*) j", + "virun (\\d+[.,]?\\d*) joer" ], "in \\1 day": [ - "an (\\d+) d", - "an (\\d+) dag" + "an (\\d+[.,]?\\d*) d", + "an (\\d+[.,]?\\d*) dag" ], "in \\1 hour": [ - "an (\\d+) st", - "an (\\d+) stonn" + "an (\\d+[.,]?\\d*) st", + "an (\\d+[.,]?\\d*) stonn" ], "in \\1 minute": [ - "an (\\d+) min", - "an (\\d+) minutt" + "an (\\d+[.,]?\\d*) min", + "an (\\d+[.,]?\\d*) minutt" ], "in \\1 month": [ - "an (\\d+) m", - "an (\\d+) mount" + "an (\\d+[.,]?\\d*) m", + "an (\\d+[.,]?\\d*) mount" ], "in \\1 second": [ - "an (\\d+) sek", - "an (\\d+) sekonn" + "an (\\d+[.,]?\\d*) sek", + "an (\\d+[.,]?\\d*) sekonn" ], "in \\1 week": [ - "an (\\d+) w", - "an (\\d+) woch" + "an (\\d+[.,]?\\d*) w", + "an (\\d+[.,]?\\d*) woch" ], "in \\1 year": [ - "an (\\d+) j", - "an (\\d+) joer" + "an (\\d+[.,]?\\d*) j", + "an (\\d+[.,]?\\d*) joer" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/lkt.py b/dateparser/data/date_translation_data/lkt.py index 476cb3493..71e9586b6 100644 --- a/dateparser/data/date_translation_data/lkt.py +++ b/dateparser/data/date_translation_data/lkt.py @@ -134,46 +134,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "hékta (\\d+)-čháŋ k'uŋ héhaŋ" + "hékta (\\d+[.,]?\\d*)-čháŋ k'uŋ héhaŋ" ], "\\1 hour ago": [ - "hékta owápȟe (\\d+) k'uŋ héhaŋ" + "hékta owápȟe (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "\\1 minute ago": [ - "hékta oȟ'áŋkȟo (\\d+) k'uŋ héhaŋ" + "hékta oȟ'áŋkȟo (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "\\1 month ago": [ - "hékta wíyawapi (\\d+) k'uŋ héhaŋ" + "hékta wíyawapi (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "\\1 second ago": [ - "hékta okpí (\\d+) k'uŋ héhaŋ" + "hékta okpí (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "\\1 week ago": [ - "hékta okó (\\d+) k'uŋ héhaŋ" + "hékta okó (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "\\1 year ago": [ - "hékta ómakȟa (\\d+) k'uŋ héhaŋ" + "hékta ómakȟa (\\d+[.,]?\\d*) k'uŋ héhaŋ" ], "in \\1 day": [ - "letáŋhaŋ (\\d+)-čháŋ kiŋháŋ" + "letáŋhaŋ (\\d+[.,]?\\d*)-čháŋ kiŋháŋ" ], "in \\1 hour": [ - "letáŋhaŋ owápȟe (\\d+) kiŋháŋ" + "letáŋhaŋ owápȟe (\\d+[.,]?\\d*) kiŋháŋ" ], "in \\1 minute": [ - "letáŋhaŋ oȟ'áŋkȟo (\\d+) kiŋháŋ" + "letáŋhaŋ oȟ'áŋkȟo (\\d+[.,]?\\d*) kiŋháŋ" ], "in \\1 month": [ - "letáŋhaŋ wíyawapi (\\d+) kiŋháŋ" + "letáŋhaŋ wíyawapi (\\d+[.,]?\\d*) kiŋháŋ" ], "in \\1 second": [ - "letáŋhaŋ okpí (\\d+) kiŋháŋ" + "letáŋhaŋ okpí (\\d+[.,]?\\d*) kiŋháŋ" ], "in \\1 week": [ - "letáŋhaŋ okó (\\d+) kiŋháŋ" + "letáŋhaŋ okó (\\d+[.,]?\\d*) kiŋháŋ" ], "in \\1 year": [ - "letáŋhaŋ ómakȟa (\\d+) kiŋháŋ" + "letáŋhaŋ ómakȟa (\\d+[.,]?\\d*) kiŋháŋ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/lo.py b/dateparser/data/date_translation_data/lo.py index d1b273bbd..ba6cfc897 100644 --- a/dateparser/data/date_translation_data/lo.py +++ b/dateparser/data/date_translation_data/lo.py @@ -158,56 +158,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ມື້ກ່ອນ" + "(\\d+[.,]?\\d*) ມື້ກ່ອນ" ], "\\1 hour ago": [ - "(\\d+) ຊມ ກ່ອນ", - "(\\d+) ຊົ່ວໂມງກ່ອນ" + "(\\d+[.,]?\\d*) ຊມ ກ່ອນ", + "(\\d+[.,]?\\d*) ຊົ່ວໂມງກ່ອນ" ], "\\1 minute ago": [ - "(\\d+) ນທ ກ່ອນ", - "(\\d+) ນາທີກ່ອນ" + "(\\d+[.,]?\\d*) ນທ ກ່ອນ", + "(\\d+[.,]?\\d*) ນາທີກ່ອນ" ], "\\1 month ago": [ - "(\\d+) ດ ກ່ອນ", - "(\\d+) ເດືອນກ່ອນ" + "(\\d+[.,]?\\d*) ດ ກ່ອນ", + "(\\d+[.,]?\\d*) ເດືອນກ່ອນ" ], "\\1 second ago": [ - "(\\d+) ວິ ກ່ອນ", - "(\\d+) ວິນາທີກ່ອນ" + "(\\d+[.,]?\\d*) ວິ ກ່ອນ", + "(\\d+[.,]?\\d*) ວິນາທີກ່ອນ" ], "\\1 week ago": [ - "(\\d+) ອທ ກ່ອນ", - "(\\d+) ອາທິດກ່ອນ" + "(\\d+[.,]?\\d*) ອທ ກ່ອນ", + "(\\d+[.,]?\\d*) ອາທິດກ່ອນ" ], "\\1 year ago": [ - "(\\d+) ປີກ່ອນ" + "(\\d+[.,]?\\d*) ປີກ່ອນ" ], "in \\1 day": [ - "ໃນອີກ (\\d+) ມື້" + "ໃນອີກ (\\d+[.,]?\\d*) ມື້" ], "in \\1 hour": [ - "ໃນອີກ (\\d+) ຊມ", - "ໃນອີກ (\\d+) ຊົ່ວໂມງ" + "ໃນອີກ (\\d+[.,]?\\d*) ຊມ", + "ໃນອີກ (\\d+[.,]?\\d*) ຊົ່ວໂມງ" ], "in \\1 minute": [ - "(\\d+) ໃນອີກ 0 ນາທີ", - "ໃນ (\\d+) ນທ" + "(\\d+[.,]?\\d*) ໃນອີກ 0 ນາທີ", + "ໃນ (\\d+[.,]?\\d*) ນທ" ], "in \\1 month": [ - "ໃນອີກ (\\d+) ດ", - "ໃນອີກ (\\d+) ເດືອນ" + "ໃນອີກ (\\d+[.,]?\\d*) ດ", + "ໃນອີກ (\\d+[.,]?\\d*) ເດືອນ" ], "in \\1 second": [ - "ໃນ (\\d+) ວິ", - "ໃນອີກ (\\d+) ວິນາທີ" + "ໃນ (\\d+[.,]?\\d*) ວິ", + "ໃນອີກ (\\d+[.,]?\\d*) ວິນາທີ" ], "in \\1 week": [ - "ໃນອີກ (\\d+) ອທ", - "ໃນອີກ (\\d+) ອາທິດ" + "ໃນອີກ (\\d+[.,]?\\d*) ອທ", + "ໃນອີກ (\\d+[.,]?\\d*) ອາທິດ" ], "in \\1 year": [ - "ໃນອີກ (\\d+) ປີ" + "ໃນອີກ (\\d+[.,]?\\d*) ປີ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/lt.py b/dateparser/data/date_translation_data/lt.py index 294510145..529a2dca3 100644 --- a/dateparser/data/date_translation_data/lt.py +++ b/dateparser/data/date_translation_data/lt.py @@ -174,75 +174,75 @@ }, "relative-type-regex": { "\\1 day ago": [ - "prieš (\\d+) d", - "prieš (\\d+) dieną", - "prieš (\\d+) dienų" + "prieš (\\d+[.,]?\\d*) d", + "prieš (\\d+[.,]?\\d*) dieną", + "prieš (\\d+[.,]?\\d*) dienų" ], "\\1 hour ago": [ - "prieš (\\d+) val", - "prieš (\\d+) valandą", - "prieš (\\d+) valandų" + "prieš (\\d+[.,]?\\d*) val", + "prieš (\\d+[.,]?\\d*) valandą", + "prieš (\\d+[.,]?\\d*) valandų" ], "\\1 minute ago": [ - "prieš (\\d+) min", - "prieš (\\d+) minutę", - "prieš (\\d+) minučių" + "prieš (\\d+[.,]?\\d*) min", + "prieš (\\d+[.,]?\\d*) minutę", + "prieš (\\d+[.,]?\\d*) minučių" ], "\\1 month ago": [ - "prieš (\\d+) mėn", - "prieš (\\d+) mėnesių", - "prieš (\\d+) mėnesį" + "prieš (\\d+[.,]?\\d*) mėn", + "prieš (\\d+[.,]?\\d*) mėnesių", + "prieš (\\d+[.,]?\\d*) mėnesį" ], "\\1 second ago": [ - "prieš (\\d+) s", - "prieš (\\d+) sek", - "prieš (\\d+) sekundę", - "prieš (\\d+) sekundžių" + "prieš (\\d+[.,]?\\d*) s", + "prieš (\\d+[.,]?\\d*) sek", + "prieš (\\d+[.,]?\\d*) sekundę", + "prieš (\\d+[.,]?\\d*) sekundžių" ], "\\1 week ago": [ - "prieš (\\d+) sav", - "prieš (\\d+) savaitę", - "prieš (\\d+) savaičių" + "prieš (\\d+[.,]?\\d*) sav", + "prieš (\\d+[.,]?\\d*) savaitę", + "prieš (\\d+[.,]?\\d*) savaičių" ], "\\1 year ago": [ - "prieš (\\d+) m", - "prieš (\\d+) metus", - "prieš (\\d+) metų" + "prieš (\\d+[.,]?\\d*) m", + "prieš (\\d+[.,]?\\d*) metus", + "prieš (\\d+[.,]?\\d*) metų" ], "in \\1 day": [ - "po (\\d+) d", - "po (\\d+) dienos", - "po (\\d+) dienų" + "po (\\d+[.,]?\\d*) d", + "po (\\d+[.,]?\\d*) dienos", + "po (\\d+[.,]?\\d*) dienų" ], "in \\1 hour": [ - "po (\\d+) val", - "po (\\d+) valandos", - "po (\\d+) valandų" + "po (\\d+[.,]?\\d*) val", + "po (\\d+[.,]?\\d*) valandos", + "po (\\d+[.,]?\\d*) valandų" ], "in \\1 minute": [ - "po (\\d+) min", - "po (\\d+) minutės", - "po (\\d+) minučių" + "po (\\d+[.,]?\\d*) min", + "po (\\d+[.,]?\\d*) minutės", + "po (\\d+[.,]?\\d*) minučių" ], "in \\1 month": [ - "po (\\d+) mėn", - "po (\\d+) mėnesio", - "po (\\d+) mėnesių" + "po (\\d+[.,]?\\d*) mėn", + "po (\\d+[.,]?\\d*) mėnesio", + "po (\\d+[.,]?\\d*) mėnesių" ], "in \\1 second": [ - "po (\\d+) s", - "po (\\d+) sek", - "po (\\d+) sekundės", - "po (\\d+) sekundžių" + "po (\\d+[.,]?\\d*) s", + "po (\\d+[.,]?\\d*) sek", + "po (\\d+[.,]?\\d*) sekundės", + "po (\\d+[.,]?\\d*) sekundžių" ], "in \\1 week": [ - "po (\\d+) sav", - "po (\\d+) savaitės", - "po (\\d+) savaičių" + "po (\\d+[.,]?\\d*) sav", + "po (\\d+[.,]?\\d*) savaitės", + "po (\\d+[.,]?\\d*) savaičių" ], "in \\1 year": [ - "po (\\d+) m", - "po (\\d+) metų" + "po (\\d+[.,]?\\d*) m", + "po (\\d+[.,]?\\d*) metų" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/lv.py b/dateparser/data/date_translation_data/lv.py index b65522904..20a6fbe5e 100644 --- a/dateparser/data/date_translation_data/lv.py +++ b/dateparser/data/date_translation_data/lv.py @@ -165,78 +165,78 @@ }, "relative-type-regex": { "\\1 day ago": [ - "pirms (\\d+) d", - "pirms (\\d+) dienas", - "pirms (\\d+) dienām" + "pirms (\\d+[.,]?\\d*) d", + "pirms (\\d+[.,]?\\d*) dienas", + "pirms (\\d+[.,]?\\d*) dienām" ], "\\1 hour ago": [ - "pirms (\\d+) h", - "pirms (\\d+) st", - "pirms (\\d+) stundas", - "pirms (\\d+) stundām" + "pirms (\\d+[.,]?\\d*) h", + "pirms (\\d+[.,]?\\d*) st", + "pirms (\\d+[.,]?\\d*) stundas", + "pirms (\\d+[.,]?\\d*) stundām" ], "\\1 minute ago": [ - "pirms (\\d+) min", - "pirms (\\d+) minūtes", - "pirms (\\d+) minūtēm" + "pirms (\\d+[.,]?\\d*) min", + "pirms (\\d+[.,]?\\d*) minūtes", + "pirms (\\d+[.,]?\\d*) minūtēm" ], "\\1 month ago": [ - "pirms (\\d+) mēn", - "pirms (\\d+) mēneša", - "pirms (\\d+) mēnešiem" + "pirms (\\d+[.,]?\\d*) mēn", + "pirms (\\d+[.,]?\\d*) mēneša", + "pirms (\\d+[.,]?\\d*) mēnešiem" ], "\\1 second ago": [ - "pirms (\\d+) s", - "pirms (\\d+) sek", - "pirms (\\d+) sekundes", - "pirms (\\d+) sekundēm" + "pirms (\\d+[.,]?\\d*) s", + "pirms (\\d+[.,]?\\d*) sek", + "pirms (\\d+[.,]?\\d*) sekundes", + "pirms (\\d+[.,]?\\d*) sekundēm" ], "\\1 week ago": [ - "pirms (\\d+) ned", - "pirms (\\d+) nedēļas", - "pirms (\\d+) nedēļām" + "pirms (\\d+[.,]?\\d*) ned", + "pirms (\\d+[.,]?\\d*) nedēļas", + "pirms (\\d+[.,]?\\d*) nedēļām" ], "\\1 year ago": [ - "pirms (\\d+) g", - "pirms (\\d+) gada", - "pirms (\\d+) gadiem" + "pirms (\\d+[.,]?\\d*) g", + "pirms (\\d+[.,]?\\d*) gada", + "pirms (\\d+[.,]?\\d*) gadiem" ], "in \\1 day": [ - "pēc (\\d+) d", - "pēc (\\d+) dienas", - "pēc (\\d+) dienām" + "pēc (\\d+[.,]?\\d*) d", + "pēc (\\d+[.,]?\\d*) dienas", + "pēc (\\d+[.,]?\\d*) dienām" ], "in \\1 hour": [ - "pēc (\\d+) h", - "pēc (\\d+) st", - "pēc (\\d+) stundas", - "pēc (\\d+) stundām" + "pēc (\\d+[.,]?\\d*) h", + "pēc (\\d+[.,]?\\d*) st", + "pēc (\\d+[.,]?\\d*) stundas", + "pēc (\\d+[.,]?\\d*) stundām" ], "in \\1 minute": [ - "pēc (\\d+) min", - "pēc (\\d+) minūtes", - "pēc (\\d+) minūtēm" + "pēc (\\d+[.,]?\\d*) min", + "pēc (\\d+[.,]?\\d*) minūtes", + "pēc (\\d+[.,]?\\d*) minūtēm" ], "in \\1 month": [ - "pēc (\\d+) mēn", - "pēc (\\d+) mēneša", - "pēc (\\d+) mēnešiem" + "pēc (\\d+[.,]?\\d*) mēn", + "pēc (\\d+[.,]?\\d*) mēneša", + "pēc (\\d+[.,]?\\d*) mēnešiem" ], "in \\1 second": [ - "pēc (\\d+) s", - "pēc (\\d+) sek", - "pēc (\\d+) sekundes", - "pēc (\\d+) sekundēm" + "pēc (\\d+[.,]?\\d*) s", + "pēc (\\d+[.,]?\\d*) sek", + "pēc (\\d+[.,]?\\d*) sekundes", + "pēc (\\d+[.,]?\\d*) sekundēm" ], "in \\1 week": [ - "pēc (\\d+) ned", - "pēc (\\d+) nedēļas", - "pēc (\\d+) nedēļām" + "pēc (\\d+[.,]?\\d*) ned", + "pēc (\\d+[.,]?\\d*) nedēļas", + "pēc (\\d+[.,]?\\d*) nedēļām" ], "in \\1 year": [ - "pēc (\\d+) g", - "pēc (\\d+) gada", - "pēc (\\d+) gadiem" + "pēc (\\d+[.,]?\\d*) g", + "pēc (\\d+[.,]?\\d*) gada", + "pēc (\\d+[.,]?\\d*) gadiem" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/mk.py b/dateparser/data/date_translation_data/mk.py index 4117f62a3..01762fa10 100644 --- a/dateparser/data/date_translation_data/mk.py +++ b/dateparser/data/date_translation_data/mk.py @@ -160,60 +160,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "пред (\\d+) ден", - "пред (\\d+) дена" + "пред (\\d+[.,]?\\d*) ден", + "пред (\\d+[.,]?\\d*) дена" ], "\\1 hour ago": [ - "пред (\\d+) час", - "пред (\\d+) часа" + "пред (\\d+[.,]?\\d*) час", + "пред (\\d+[.,]?\\d*) часа" ], "\\1 minute ago": [ - "пред (\\d+) минута", - "пред (\\d+) минути" + "пред (\\d+[.,]?\\d*) минута", + "пред (\\d+[.,]?\\d*) минути" ], "\\1 month ago": [ - "пред (\\d+) месец", - "пред (\\d+) месеци" + "пред (\\d+[.,]?\\d*) месец", + "пред (\\d+[.,]?\\d*) месеци" ], "\\1 second ago": [ - "пред (\\d+) секунда", - "пред (\\d+) секунди" + "пред (\\d+[.,]?\\d*) секунда", + "пред (\\d+[.,]?\\d*) секунди" ], "\\1 week ago": [ - "пред (\\d+) седмица", - "пред (\\d+) седмици" + "пред (\\d+[.,]?\\d*) седмица", + "пред (\\d+[.,]?\\d*) седмици" ], "\\1 year ago": [ - "пред (\\d+) година", - "пред (\\d+) години" + "пред (\\d+[.,]?\\d*) година", + "пред (\\d+[.,]?\\d*) години" ], "in \\1 day": [ - "за (\\d+) ден", - "за (\\d+) дена" + "за (\\d+[.,]?\\d*) ден", + "за (\\d+[.,]?\\d*) дена" ], "in \\1 hour": [ - "за (\\d+) час", - "за (\\d+) часа" + "за (\\d+[.,]?\\d*) час", + "за (\\d+[.,]?\\d*) часа" ], "in \\1 minute": [ - "за (\\d+) минута", - "за (\\d+) минути" + "за (\\d+[.,]?\\d*) минута", + "за (\\d+[.,]?\\d*) минути" ], "in \\1 month": [ - "за (\\d+) месец", - "за (\\d+) месеци" + "за (\\d+[.,]?\\d*) месец", + "за (\\d+[.,]?\\d*) месеци" ], "in \\1 second": [ - "за (\\d+) секунда", - "за (\\d+) секунди" + "за (\\d+[.,]?\\d*) секунда", + "за (\\d+[.,]?\\d*) секунди" ], "in \\1 week": [ - "за (\\d+) седмица", - "за (\\d+) седмици" + "за (\\d+[.,]?\\d*) седмица", + "за (\\d+[.,]?\\d*) седмици" ], "in \\1 year": [ - "за (\\d+) година", - "за (\\d+) години" + "за (\\d+[.,]?\\d*) година", + "за (\\d+[.,]?\\d*) години" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ml.py b/dateparser/data/date_translation_data/ml.py index 3310e17bd..1b95fa1e3 100644 --- a/dateparser/data/date_translation_data/ml.py +++ b/dateparser/data/date_translation_data/ml.py @@ -157,46 +157,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ദിവസം മുമ്പ്" + "(\\d+[.,]?\\d*) ദിവസം മുമ്പ്" ], "\\1 hour ago": [ - "(\\d+) മണിക്കൂർ മുമ്പ്" + "(\\d+[.,]?\\d*) മണിക്കൂർ മുമ്പ്" ], "\\1 minute ago": [ - "(\\d+) മിനിറ്റ് മുമ്പ്" + "(\\d+[.,]?\\d*) മിനിറ്റ് മുമ്പ്" ], "\\1 month ago": [ - "(\\d+) മാസം മുമ്പ്" + "(\\d+[.,]?\\d*) മാസം മുമ്പ്" ], "\\1 second ago": [ - "(\\d+) സെക്കൻഡ് മുമ്പ്" + "(\\d+[.,]?\\d*) സെക്കൻഡ് മുമ്പ്" ], "\\1 week ago": [ - "(\\d+) ആഴ്ച മുമ്പ്" + "(\\d+[.,]?\\d*) ആഴ്ച മുമ്പ്" ], "\\1 year ago": [ - "(\\d+) വർഷം മുമ്പ്" + "(\\d+[.,]?\\d*) വർഷം മുമ്പ്" ], "in \\1 day": [ - "(\\d+) ദിവസത്തിൽ" + "(\\d+[.,]?\\d*) ദിവസത്തിൽ" ], "in \\1 hour": [ - "(\\d+) മണിക്കൂറിൽ" + "(\\d+[.,]?\\d*) മണിക്കൂറിൽ" ], "in \\1 minute": [ - "(\\d+) മിനിറ്റിൽ" + "(\\d+[.,]?\\d*) മിനിറ്റിൽ" ], "in \\1 month": [ - "(\\d+) മാസത്തിൽ" + "(\\d+[.,]?\\d*) മാസത്തിൽ" ], "in \\1 second": [ - "(\\d+) സെക്കൻഡിൽ" + "(\\d+[.,]?\\d*) സെക്കൻഡിൽ" ], "in \\1 week": [ - "(\\d+) ആഴ്ചയിൽ" + "(\\d+[.,]?\\d*) ആഴ്ചയിൽ" ], "in \\1 year": [ - "(\\d+) വർഷത്തിൽ" + "(\\d+[.,]?\\d*) വർഷത്തിൽ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/mn.py b/dateparser/data/date_translation_data/mn.py index 01ab46c5d..32fc895d8 100644 --- a/dateparser/data/date_translation_data/mn.py +++ b/dateparser/data/date_translation_data/mn.py @@ -157,53 +157,53 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) өдрийн өмнө" + "(\\d+[.,]?\\d*) өдрийн өмнө" ], "\\1 hour ago": [ - "(\\d+) ц өмнө", - "(\\d+) цагийн өмнө" + "(\\d+[.,]?\\d*) ц өмнө", + "(\\d+[.,]?\\d*) цагийн өмнө" ], "\\1 minute ago": [ - "(\\d+) мин өмнө", - "(\\d+) минутын өмнө" + "(\\d+[.,]?\\d*) мин өмнө", + "(\\d+[.,]?\\d*) минутын өмнө" ], "\\1 month ago": [ - "(\\d+) сарын өмнө" + "(\\d+[.,]?\\d*) сарын өмнө" ], "\\1 second ago": [ - "(\\d+) сек өмнө", - "(\\d+) секундын өмнө" + "(\\d+[.,]?\\d*) сек өмнө", + "(\\d+[.,]?\\d*) секундын өмнө" ], "\\1 week ago": [ - "(\\d+) 7х-ийн өмнө" + "(\\d+[.,]?\\d*) 7х-ийн өмнө" ], "\\1 year ago": [ - "(\\d+) жилийн өмнө" + "(\\d+[.,]?\\d*) жилийн өмнө" ], "in \\1 day": [ - "(\\d+) өдрийн дараа", - "(\\d+) өдөрт" + "(\\d+[.,]?\\d*) өдрийн дараа", + "(\\d+[.,]?\\d*) өдөрт" ], "in \\1 hour": [ - "(\\d+) ц дараа", - "(\\d+) цагийн дараа" + "(\\d+[.,]?\\d*) ц дараа", + "(\\d+[.,]?\\d*) цагийн дараа" ], "in \\1 minute": [ - "(\\d+) мин дараа", - "(\\d+) минутын дараа" + "(\\d+[.,]?\\d*) мин дараа", + "(\\d+[.,]?\\d*) минутын дараа" ], "in \\1 month": [ - "(\\d+) сарын дараа" + "(\\d+[.,]?\\d*) сарын дараа" ], "in \\1 second": [ - "(\\d+) сек дараа", - "(\\d+) секундын дараа" + "(\\d+[.,]?\\d*) сек дараа", + "(\\d+[.,]?\\d*) секундын дараа" ], "in \\1 week": [ - "(\\d+) 7х-ийн дараа" + "(\\d+[.,]?\\d*) 7х-ийн дараа" ], "in \\1 year": [ - "(\\d+) жилийн дараа" + "(\\d+[.,]?\\d*) жилийн дараа" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/mr.py b/dateparser/data/date_translation_data/mr.py index 7c2086739..1fecbd7c3 100644 --- a/dateparser/data/date_translation_data/mr.py +++ b/dateparser/data/date_translation_data/mr.py @@ -151,64 +151,64 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) दिवसांपूर्वी", - "(\\d+) दिवसापूर्वी" + "(\\d+[.,]?\\d*) दिवसांपूर्वी", + "(\\d+[.,]?\\d*) दिवसापूर्वी" ], "\\1 hour ago": [ - "(\\d+) तासांपूर्वी", - "(\\d+) तासापूर्वी" + "(\\d+[.,]?\\d*) तासांपूर्वी", + "(\\d+[.,]?\\d*) तासापूर्वी" ], "\\1 minute ago": [ - "(\\d+) मिनि पूर्वी", - "(\\d+) मिनिटांपूर्वी", - "(\\d+) मिनिटापूर्वी" + "(\\d+[.,]?\\d*) मिनि पूर्वी", + "(\\d+[.,]?\\d*) मिनिटांपूर्वी", + "(\\d+[.,]?\\d*) मिनिटापूर्वी" ], "\\1 month ago": [ - "(\\d+) महिन्यांपूर्वी", - "(\\d+) महिन्यापूर्वी" + "(\\d+[.,]?\\d*) महिन्यांपूर्वी", + "(\\d+[.,]?\\d*) महिन्यापूर्वी" ], "\\1 second ago": [ - "(\\d+) से पूर्वी", - "(\\d+) सेकंदांपूर्वी", - "(\\d+) सेकंदापूर्वी" + "(\\d+[.,]?\\d*) से पूर्वी", + "(\\d+[.,]?\\d*) सेकंदांपूर्वी", + "(\\d+[.,]?\\d*) सेकंदापूर्वी" ], "\\1 week ago": [ - "(\\d+) आठवड्यांपूर्वी", - "(\\d+) आठवड्यापूर्वी" + "(\\d+[.,]?\\d*) आठवड्यांपूर्वी", + "(\\d+[.,]?\\d*) आठवड्यापूर्वी" ], "\\1 year ago": [ - "(\\d+) वर्षांपूर्वी", - "(\\d+) वर्षापूर्वी" + "(\\d+[.,]?\\d*) वर्षांपूर्वी", + "(\\d+[.,]?\\d*) वर्षापूर्वी" ], "in \\1 day": [ - "(\\d+) दिवसांमध्ये", - "(\\d+) दिवसामध्ये" + "(\\d+[.,]?\\d*) दिवसांमध्ये", + "(\\d+[.,]?\\d*) दिवसामध्ये" ], "in \\1 hour": [ - "(\\d+) तासांमध्ये", - "(\\d+) तासामध्ये" + "(\\d+[.,]?\\d*) तासांमध्ये", + "(\\d+[.,]?\\d*) तासामध्ये" ], "in \\1 minute": [ - "(\\d+) मिनि मध्ये", - "(\\d+) मिनिटांमध्ये", - "(\\d+) मिनिटामध्ये" + "(\\d+[.,]?\\d*) मिनि मध्ये", + "(\\d+[.,]?\\d*) मिनिटांमध्ये", + "(\\d+[.,]?\\d*) मिनिटामध्ये" ], "in \\1 month": [ - "(\\d+) महिन्यांमध्ये", - "(\\d+) महिन्यामध्ये" + "(\\d+[.,]?\\d*) महिन्यांमध्ये", + "(\\d+[.,]?\\d*) महिन्यामध्ये" ], "in \\1 second": [ - "(\\d+) से मध्ये", - "(\\d+) सेकंदांमध्ये", - "(\\d+) सेकंदामध्ये" + "(\\d+[.,]?\\d*) से मध्ये", + "(\\d+[.,]?\\d*) सेकंदांमध्ये", + "(\\d+[.,]?\\d*) सेकंदामध्ये" ], "in \\1 week": [ - "(\\d+) आठवड्यांमध्ये", - "(\\d+) आठवड्यामध्ये" + "(\\d+[.,]?\\d*) आठवड्यांमध्ये", + "(\\d+[.,]?\\d*) आठवड्यामध्ये" ], "in \\1 year": [ - "(\\d+) वर्षांमध्ये", - "(\\d+) वर्षामध्ये" + "(\\d+[.,]?\\d*) वर्षांमध्ये", + "(\\d+[.,]?\\d*) वर्षामध्ये" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ms.py b/dateparser/data/date_translation_data/ms.py index 7642eefdf..b685742bc 100644 --- a/dateparser/data/date_translation_data/ms.py +++ b/dateparser/data/date_translation_data/ms.py @@ -164,57 +164,57 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) hari lalu" + "(\\d+[.,]?\\d*) hari lalu" ], "\\1 hour ago": [ - "(\\d+) jam lalu" + "(\\d+[.,]?\\d*) jam lalu" ], "\\1 minute ago": [ - "(\\d+) min lalu", - "(\\d+) minit lalu" + "(\\d+[.,]?\\d*) min lalu", + "(\\d+[.,]?\\d*) minit lalu" ], "\\1 month ago": [ - "(\\d+) bln lalu", - "(\\d+) bulan lalu" + "(\\d+[.,]?\\d*) bln lalu", + "(\\d+[.,]?\\d*) bulan lalu" ], "\\1 second ago": [ - "(\\d+) saat lalu" + "(\\d+[.,]?\\d*) saat lalu" ], "\\1 week ago": [ - "(\\d+) mgu lalu", - "(\\d+) minggu lalu" + "(\\d+[.,]?\\d*) mgu lalu", + "(\\d+[.,]?\\d*) minggu lalu" ], "\\1 year ago": [ - "(\\d+) tahun lalu", - "(\\d+) thn lalu" + "(\\d+[.,]?\\d*) tahun lalu", + "(\\d+[.,]?\\d*) thn lalu" ], "in \\1 day": [ - "dalam (\\d+) hari", - "dlm (\\d+) hari" + "dalam (\\d+[.,]?\\d*) hari", + "dlm (\\d+[.,]?\\d*) hari" ], "in \\1 hour": [ - "dalam (\\d+) jam", - "dlm (\\d+) jam" + "dalam (\\d+[.,]?\\d*) jam", + "dlm (\\d+[.,]?\\d*) jam" ], "in \\1 minute": [ - "dalam (\\d+) minit", - "dlm (\\d+) min" + "dalam (\\d+[.,]?\\d*) minit", + "dlm (\\d+[.,]?\\d*) min" ], "in \\1 month": [ - "dalam (\\d+) bulan", - "dlm (\\d+) bln" + "dalam (\\d+[.,]?\\d*) bulan", + "dlm (\\d+[.,]?\\d*) bln" ], "in \\1 second": [ - "dalam (\\d+) saat", - "dlm (\\d+) saat" + "dalam (\\d+[.,]?\\d*) saat", + "dlm (\\d+[.,]?\\d*) saat" ], "in \\1 week": [ - "dalam (\\d+) minggu", - "dlm (\\d+) mgu" + "dalam (\\d+[.,]?\\d*) minggu", + "dlm (\\d+[.,]?\\d*) mgu" ], "in \\1 year": [ - "dalam (\\d+) saat", - "dalam (\\d+) thn" + "dalam (\\d+[.,]?\\d*) saat", + "dalam (\\d+[.,]?\\d*) thn" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/mt.py b/dateparser/data/date_translation_data/mt.py index e399ffc3b..d11cb0580 100644 --- a/dateparser/data/date_translation_data/mt.py +++ b/dateparser/data/date_translation_data/mt.py @@ -153,8 +153,8 @@ }, "relative-type-regex": { "\\1 year ago": [ - "(\\d+) sena ilu", - "(\\d+) snin ilu" + "(\\d+[.,]?\\d*) sena ilu", + "(\\d+[.,]?\\d*) snin ilu" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/my.py b/dateparser/data/date_translation_data/my.py index de41f7d1a..9564fa91d 100644 --- a/dateparser/data/date_translation_data/my.py +++ b/dateparser/data/date_translation_data/my.py @@ -143,46 +143,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "ပြီးခဲ့သည့် (\\d+) ရက်" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) ရက်" ], "\\1 hour ago": [ - "ပြီးခဲ့သည့် (\\d+) နာရီ" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) နာရီ" ], "\\1 minute ago": [ - "ပြီးခဲ့သည့် (\\d+) မိနစ်" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) မိနစ်" ], "\\1 month ago": [ - "ပြီးခဲ့သည့် (\\d+) လ" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) လ" ], "\\1 second ago": [ - "ပြီးခဲ့သည့် (\\d+) စက္ကန့်" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) စက္ကန့်" ], "\\1 week ago": [ - "ပြီးခဲ့သည့် (\\d+) ပတ်" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) ပတ်" ], "\\1 year ago": [ - "ပြီးခဲ့သည့် (\\d+) နှစ်" + "ပြီးခဲ့သည့် (\\d+[.,]?\\d*) နှစ်" ], "in \\1 day": [ - "(\\d+) ရက်အတွင်း" + "(\\d+[.,]?\\d*) ရက်အတွင်း" ], "in \\1 hour": [ - "(\\d+) နာရီအတွင်း" + "(\\d+[.,]?\\d*) နာရီအတွင်း" ], "in \\1 minute": [ - "(\\d+) မိနစ်အတွင်း" + "(\\d+[.,]?\\d*) မိနစ်အတွင်း" ], "in \\1 month": [ - "(\\d+) လအတွင်း" + "(\\d+[.,]?\\d*) လအတွင်း" ], "in \\1 second": [ - "(\\d+) စက္ကန့်အတွင်း" + "(\\d+[.,]?\\d*) စက္ကန့်အတွင်း" ], "in \\1 week": [ - "(\\d+) ပတ်အတွင်း" + "(\\d+[.,]?\\d*) ပတ်အတွင်း" ], "in \\1 year": [ - "(\\d+) နှစ်အတွင်း" + "(\\d+[.,]?\\d*) နှစ်အတွင်း" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/mzn.py b/dateparser/data/date_translation_data/mzn.py index b78d7ac76..8a9fc6e15 100644 --- a/dateparser/data/date_translation_data/mzn.py +++ b/dateparser/data/date_translation_data/mzn.py @@ -136,49 +136,49 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) روز پیش" + "(\\d+[.,]?\\d*) روز پیش" ], "\\1 hour ago": [ - "(\\d+) ساعت پیش", - "(\\d+) ساعِت پیش" + "(\\d+[.,]?\\d*) ساعت پیش", + "(\\d+[.,]?\\d*) ساعِت پیش" ], "\\1 minute ago": [ - "(\\d+) دَقه پیش" + "(\\d+[.,]?\\d*) دَقه پیش" ], "\\1 month ago": [ - "(\\d+) ماه پیش" + "(\\d+[.,]?\\d*) ماه پیش" ], "\\1 second ago": [ - "(\\d+) ثانیه پیش" + "(\\d+[.,]?\\d*) ثانیه پیش" ], "\\1 week ago": [ - "(\\d+) هفته پیش" + "(\\d+[.,]?\\d*) هفته پیش" ], "\\1 year ago": [ - "(\\d+) سال پیش" + "(\\d+[.,]?\\d*) سال پیش" ], "in \\1 day": [ - "(\\d+) روز دله" + "(\\d+[.,]?\\d*) روز دله" ], "in \\1 hour": [ - "(\\d+) ساعت دله", - "(\\d+) ساعِت دله" + "(\\d+[.,]?\\d*) ساعت دله", + "(\\d+[.,]?\\d*) ساعِت دله" ], "in \\1 minute": [ - "(\\d+) دقیقه دله", - "(\\d+) دَقه دله" + "(\\d+[.,]?\\d*) دقیقه دله", + "(\\d+[.,]?\\d*) دَقه دله" ], "in \\1 month": [ - "(\\d+) ماه دله" + "(\\d+[.,]?\\d*) ماه دله" ], "in \\1 second": [ - "(\\d+) ثانیه دله" + "(\\d+[.,]?\\d*) ثانیه دله" ], "in \\1 week": [ - "(\\d+) هفته دله" + "(\\d+[.,]?\\d*) هفته دله" ], "in \\1 year": [ - "(\\d+) سال دله" + "(\\d+[.,]?\\d*) سال دله" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/nb.py b/dateparser/data/date_translation_data/nb.py index 8f5d92a31..921cfb084 100644 --- a/dateparser/data/date_translation_data/nb.py +++ b/dateparser/data/date_translation_data/nb.py @@ -167,70 +167,70 @@ }, "relative-type-regex": { "\\1 day ago": [ - "for (\\d+) d siden", - "for (\\d+) døgn siden", - "for (\\d+) dager siden" + "for (\\d+[.,]?\\d*) d siden", + "for (\\d+[.,]?\\d*) døgn siden", + "for (\\d+[.,]?\\d*) dager siden" ], "\\1 hour ago": [ - "for (\\d+) t siden", - "for (\\d+) time siden", - "for (\\d+) timer siden" + "for (\\d+[.,]?\\d*) t siden", + "for (\\d+[.,]?\\d*) time siden", + "for (\\d+[.,]?\\d*) timer siden" ], "\\1 minute ago": [ - "for (\\d+) min siden", - "for (\\d+) minutt siden", - "for (\\d+) minutter siden" + "for (\\d+[.,]?\\d*) min siden", + "for (\\d+[.,]?\\d*) minutt siden", + "for (\\d+[.,]?\\d*) minutter siden" ], "\\1 month ago": [ - "for (\\d+) md siden", - "for (\\d+) måned siden", - "for (\\d+) måneder siden" + "for (\\d+[.,]?\\d*) md siden", + "for (\\d+[.,]?\\d*) måned siden", + "for (\\d+[.,]?\\d*) måneder siden" ], "\\1 second ago": [ - "for (\\d+) sek siden", - "for (\\d+) sekund siden", - "for (\\d+) sekunder siden" + "for (\\d+[.,]?\\d*) sek siden", + "for (\\d+[.,]?\\d*) sekund siden", + "for (\\d+[.,]?\\d*) sekunder siden" ], "\\1 week ago": [ - "for (\\d+) u siden", - "for (\\d+) uke siden", - "for (\\d+) uker siden" + "for (\\d+[.,]?\\d*) u siden", + "for (\\d+[.,]?\\d*) uke siden", + "for (\\d+[.,]?\\d*) uker siden" ], "\\1 year ago": [ - "for (\\d+) år siden", - "–(\\d+) år" + "for (\\d+[.,]?\\d*) år siden", + "–(\\d+[.,]?\\d*) år" ], "in \\1 day": [ - "om (\\d+) d", - "om (\\d+) døgn" + "om (\\d+[.,]?\\d*) d", + "om (\\d+[.,]?\\d*) døgn" ], "in \\1 hour": [ - "om (\\d+) t", - "om (\\d+) time", - "om (\\d+) timer" + "om (\\d+[.,]?\\d*) t", + "om (\\d+[.,]?\\d*) time", + "om (\\d+[.,]?\\d*) timer" ], "in \\1 minute": [ - "om (\\d+) min", - "om (\\d+) minutt", - "om (\\d+) minutter" + "om (\\d+[.,]?\\d*) min", + "om (\\d+[.,]?\\d*) minutt", + "om (\\d+[.,]?\\d*) minutter" ], "in \\1 month": [ - "om (\\d+) md", - "om (\\d+) måned", - "om (\\d+) måneder" + "om (\\d+[.,]?\\d*) md", + "om (\\d+[.,]?\\d*) måned", + "om (\\d+[.,]?\\d*) måneder" ], "in \\1 second": [ - "om (\\d+) sek", - "om (\\d+) sekund", - "om (\\d+) sekunder" + "om (\\d+[.,]?\\d*) sek", + "om (\\d+[.,]?\\d*) sekund", + "om (\\d+[.,]?\\d*) sekunder" ], "in \\1 week": [ - "om (\\d+) u", - "om (\\d+) uke", - "om (\\d+) uker" + "om (\\d+[.,]?\\d*) u", + "om (\\d+[.,]?\\d*) uke", + "om (\\d+[.,]?\\d*) uker" ], "in \\1 year": [ - "om (\\d+) år" + "om (\\d+[.,]?\\d*) år" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ne.py b/dateparser/data/date_translation_data/ne.py index 960690b84..1bc4fb6e5 100644 --- a/dateparser/data/date_translation_data/ne.py +++ b/dateparser/data/date_translation_data/ne.py @@ -143,46 +143,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) दिन पहिले" + "(\\d+[.,]?\\d*) दिन पहिले" ], "\\1 hour ago": [ - "(\\d+) घण्टा पहिले" + "(\\d+[.,]?\\d*) घण्टा पहिले" ], "\\1 minute ago": [ - "(\\d+) मिनेट पहिले" + "(\\d+[.,]?\\d*) मिनेट पहिले" ], "\\1 month ago": [ - "(\\d+) महिना पहिले" + "(\\d+[.,]?\\d*) महिना पहिले" ], "\\1 second ago": [ - "(\\d+) सेकेण्ड पहिले" + "(\\d+[.,]?\\d*) सेकेण्ड पहिले" ], "\\1 week ago": [ - "(\\d+) हप्ता पहिले" + "(\\d+[.,]?\\d*) हप्ता पहिले" ], "\\1 year ago": [ - "(\\d+) वर्ष अघि" + "(\\d+[.,]?\\d*) वर्ष अघि" ], "in \\1 day": [ - "(\\d+) दिनमा" + "(\\d+[.,]?\\d*) दिनमा" ], "in \\1 hour": [ - "(\\d+) घण्टामा" + "(\\d+[.,]?\\d*) घण्टामा" ], "in \\1 minute": [ - "(\\d+) मिनेटमा" + "(\\d+[.,]?\\d*) मिनेटमा" ], "in \\1 month": [ - "(\\d+) महिनामा" + "(\\d+[.,]?\\d*) महिनामा" ], "in \\1 second": [ - "(\\d+) सेकेण्डमा" + "(\\d+[.,]?\\d*) सेकेण्डमा" ], "in \\1 week": [ - "(\\d+) हप्तामा" + "(\\d+[.,]?\\d*) हप्तामा" ], "in \\1 year": [ - "(\\d+) वर्षमा" + "(\\d+[.,]?\\d*) वर्षमा" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/nl.py b/dateparser/data/date_translation_data/nl.py index f3bcd252d..4acb1f060 100644 --- a/dateparser/data/date_translation_data/nl.py +++ b/dateparser/data/date_translation_data/nl.py @@ -170,62 +170,62 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) dag geleden", - "(\\d+) dagen geleden", - "(\\d+) dgn geleden" + "(\\d+[.,]?\\d*) dag geleden", + "(\\d+[.,]?\\d*) dagen geleden", + "(\\d+[.,]?\\d*) dgn geleden" ], "\\1 hour ago": [ - "(\\d+) uur geleden" + "(\\d+[.,]?\\d*) uur geleden" ], "\\1 minute ago": [ - "(\\d+) min geleden", - "(\\d+) minuten geleden", - "(\\d+) minuut geleden" + "(\\d+[.,]?\\d*) min geleden", + "(\\d+[.,]?\\d*) minuten geleden", + "(\\d+[.,]?\\d*) minuut geleden" ], "\\1 month ago": [ - "(\\d+) maand geleden", - "(\\d+) maanden geleden" + "(\\d+[.,]?\\d*) maand geleden", + "(\\d+[.,]?\\d*) maanden geleden" ], "\\1 second ago": [ - "(\\d+) sec geleden", - "(\\d+) seconde geleden", - "(\\d+) seconden geleden" + "(\\d+[.,]?\\d*) sec geleden", + "(\\d+[.,]?\\d*) seconde geleden", + "(\\d+[.,]?\\d*) seconden geleden" ], "\\1 week ago": [ - "(\\d+) week geleden", - "(\\d+) weken geleden" + "(\\d+[.,]?\\d*) week geleden", + "(\\d+[.,]?\\d*) weken geleden" ], "\\1 year ago": [ - "(\\d+) jaar geleden" + "(\\d+[.,]?\\d*) jaar geleden" ], "in \\1 day": [ - "over (\\d+) dag", - "over (\\d+) dagen", - "over (\\d+) dgn" + "over (\\d+[.,]?\\d*) dag", + "over (\\d+[.,]?\\d*) dagen", + "over (\\d+[.,]?\\d*) dgn" ], "in \\1 hour": [ - "over (\\d+) uur" + "over (\\d+[.,]?\\d*) uur" ], "in \\1 minute": [ - "over (\\d+) min", - "over (\\d+) minuten", - "over (\\d+) minuut" + "over (\\d+[.,]?\\d*) min", + "over (\\d+[.,]?\\d*) minuten", + "over (\\d+[.,]?\\d*) minuut" ], "in \\1 month": [ - "over (\\d+) maand", - "over (\\d+) maanden" + "over (\\d+[.,]?\\d*) maand", + "over (\\d+[.,]?\\d*) maanden" ], "in \\1 second": [ - "over (\\d+) sec", - "over (\\d+) seconde", - "over (\\d+) seconden" + "over (\\d+[.,]?\\d*) sec", + "over (\\d+[.,]?\\d*) seconde", + "over (\\d+[.,]?\\d*) seconden" ], "in \\1 week": [ - "over (\\d+) week", - "over (\\d+) weken" + "over (\\d+[.,]?\\d*) week", + "over (\\d+[.,]?\\d*) weken" ], "in \\1 year": [ - "over (\\d+) jaar" + "over (\\d+[.,]?\\d*) jaar" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/nn.py b/dateparser/data/date_translation_data/nn.py index 1a3709da5..a0a4bb6b7 100644 --- a/dateparser/data/date_translation_data/nn.py +++ b/dateparser/data/date_translation_data/nn.py @@ -161,56 +161,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "for (\\d+) døgn siden" + "for (\\d+[.,]?\\d*) døgn siden" ], "\\1 hour ago": [ - "for (\\d+) time siden", - "for (\\d+) timer siden" + "for (\\d+[.,]?\\d*) time siden", + "for (\\d+[.,]?\\d*) timer siden" ], "\\1 minute ago": [ - "for (\\d+) minutt siden", - "for (\\d+) minutter siden" + "for (\\d+[.,]?\\d*) minutt siden", + "for (\\d+[.,]?\\d*) minutter siden" ], "\\1 month ago": [ - "for (\\d+) måned siden", - "for (\\d+) måneder siden" + "for (\\d+[.,]?\\d*) måned siden", + "for (\\d+[.,]?\\d*) måneder siden" ], "\\1 second ago": [ - "for (\\d+) sekund siden", - "for (\\d+) sekunder siden" + "for (\\d+[.,]?\\d*) sekund siden", + "for (\\d+[.,]?\\d*) sekunder siden" ], "\\1 week ago": [ - "for (\\d+) uke siden", - "for (\\d+) uker siden" + "for (\\d+[.,]?\\d*) uke siden", + "for (\\d+[.,]?\\d*) uker siden" ], "\\1 year ago": [ - "for (\\d+) år siden" + "for (\\d+[.,]?\\d*) år siden" ], "in \\1 day": [ - "om (\\d+) døgn" + "om (\\d+[.,]?\\d*) døgn" ], "in \\1 hour": [ - "om (\\d+) time", - "om (\\d+) timer" + "om (\\d+[.,]?\\d*) time", + "om (\\d+[.,]?\\d*) timer" ], "in \\1 minute": [ - "om (\\d+) minutt", - "om (\\d+) minutter" + "om (\\d+[.,]?\\d*) minutt", + "om (\\d+[.,]?\\d*) minutter" ], "in \\1 month": [ - "om (\\d+) måned", - "om (\\d+) måneder" + "om (\\d+[.,]?\\d*) måned", + "om (\\d+[.,]?\\d*) måneder" ], "in \\1 second": [ - "om (\\d+) sekund", - "om (\\d+) sekunder" + "om (\\d+[.,]?\\d*) sekund", + "om (\\d+[.,]?\\d*) sekunder" ], "in \\1 week": [ - "om (\\d+) uke", - "om (\\d+) uker" + "om (\\d+[.,]?\\d*) uke", + "om (\\d+[.,]?\\d*) uker" ], "in \\1 year": [ - "om (\\d+) år" + "om (\\d+[.,]?\\d*) år" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/os.py b/dateparser/data/date_translation_data/os.py index 10fb320b7..62ff4867e 100644 --- a/dateparser/data/date_translation_data/os.py +++ b/dateparser/data/date_translation_data/os.py @@ -168,17 +168,17 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) бон раздӕр", - "(\\d+) боны размӕ" + "(\\d+[.,]?\\d*) бон раздӕр", + "(\\d+[.,]?\\d*) боны размӕ" ], "\\1 hour ago": [ - "(\\d+) сахаты размӕ" + "(\\d+[.,]?\\d*) сахаты размӕ" ], "in \\1 day": [ - "(\\d+) боны фӕстӕ" + "(\\d+[.,]?\\d*) боны фӕстӕ" ], "in \\1 hour": [ - "(\\d+) сахаты фӕстӕ" + "(\\d+[.,]?\\d*) сахаты фӕстӕ" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/pa-Guru.py b/dateparser/data/date_translation_data/pa-Guru.py index 27de7b419..4b8d6ccc8 100644 --- a/dateparser/data/date_translation_data/pa-Guru.py +++ b/dateparser/data/date_translation_data/pa-Guru.py @@ -151,56 +151,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ਦਿਨ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਦਿਨ ਪਹਿਲਾਂ" ], "\\1 hour ago": [ - "(\\d+) ਘੰਟਾ ਪਹਿਲਾਂ", - "(\\d+) ਘੰਟੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਘੰਟਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਘੰਟੇ ਪਹਿਲਾਂ" ], "\\1 minute ago": [ - "(\\d+) ਮਿੰਟ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਮਿੰਟ ਪਹਿਲਾਂ" ], "\\1 month ago": [ - "(\\d+) ਮਹੀਨਾ ਪਹਿਲਾਂ", - "(\\d+) ਮਹੀਨੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਮਹੀਨਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਮਹੀਨੇ ਪਹਿਲਾਂ" ], "\\1 second ago": [ - "(\\d+) ਸਕਿੰਟ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਸਕਿੰਟ ਪਹਿਲਾਂ" ], "\\1 week ago": [ - "(\\d+) ਹਫ਼ਤਾ ਪਹਿਲਾਂ", - "(\\d+) ਹਫ਼ਤੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਹਫ਼ਤਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਹਫ਼ਤੇ ਪਹਿਲਾਂ" ], "\\1 year ago": [ - "(\\d+) ਸਾਲ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਸਾਲ ਪਹਿਲਾਂ" ], "in \\1 day": [ - "(\\d+) ਦਿਨ ਵਿੱਚ", - "(\\d+) ਦਿਨਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਦਿਨ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਦਿਨਾਂ ਵਿੱਚ" ], "in \\1 hour": [ - "(\\d+) ਘੰਟਿਆਂ ਵਿੱਚ", - "(\\d+) ਘੰਟੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਘੰਟਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਘੰਟੇ ਵਿੱਚ" ], "in \\1 minute": [ - "(\\d+) ਮਿੰਟ ਵਿੱਚ", - "(\\d+) ਮਿੰਟਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਮਿੰਟ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਮਿੰਟਾਂ ਵਿੱਚ" ], "in \\1 month": [ - "(\\d+) ਮਹੀਨਿਆਂ ਵਿੱਚ", - "(\\d+) ਮਹੀਨੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਮਹੀਨਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਮਹੀਨੇ ਵਿੱਚ" ], "in \\1 second": [ - "(\\d+) ਸਕਿੰਟ ਵਿੱਚ", - "(\\d+) ਸਕਿੰਟਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਸਕਿੰਟ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਸਕਿੰਟਾਂ ਵਿੱਚ" ], "in \\1 week": [ - "(\\d+) ਹਫ਼ਤਿਆਂ ਵਿੱਚ", - "(\\d+) ਹਫ਼ਤੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਹਫ਼ਤਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਹਫ਼ਤੇ ਵਿੱਚ" ], "in \\1 year": [ - "(\\d+) ਸਾਲ ਵਿੱਚ", - "(\\d+) ਸਾਲਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਸਾਲ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਸਾਲਾਂ ਵਿੱਚ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/pa.py b/dateparser/data/date_translation_data/pa.py index d1e0aa929..60a6425b2 100644 --- a/dateparser/data/date_translation_data/pa.py +++ b/dateparser/data/date_translation_data/pa.py @@ -151,56 +151,56 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ਦਿਨ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਦਿਨ ਪਹਿਲਾਂ" ], "\\1 hour ago": [ - "(\\d+) ਘੰਟਾ ਪਹਿਲਾਂ", - "(\\d+) ਘੰਟੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਘੰਟਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਘੰਟੇ ਪਹਿਲਾਂ" ], "\\1 minute ago": [ - "(\\d+) ਮਿੰਟ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਮਿੰਟ ਪਹਿਲਾਂ" ], "\\1 month ago": [ - "(\\d+) ਮਹੀਨਾ ਪਹਿਲਾਂ", - "(\\d+) ਮਹੀਨੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਮਹੀਨਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਮਹੀਨੇ ਪਹਿਲਾਂ" ], "\\1 second ago": [ - "(\\d+) ਸਕਿੰਟ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਸਕਿੰਟ ਪਹਿਲਾਂ" ], "\\1 week ago": [ - "(\\d+) ਹਫ਼ਤਾ ਪਹਿਲਾਂ", - "(\\d+) ਹਫ਼ਤੇ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਹਫ਼ਤਾ ਪਹਿਲਾਂ", + "(\\d+[.,]?\\d*) ਹਫ਼ਤੇ ਪਹਿਲਾਂ" ], "\\1 year ago": [ - "(\\d+) ਸਾਲ ਪਹਿਲਾਂ" + "(\\d+[.,]?\\d*) ਸਾਲ ਪਹਿਲਾਂ" ], "in \\1 day": [ - "(\\d+) ਦਿਨ ਵਿੱਚ", - "(\\d+) ਦਿਨਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਦਿਨ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਦਿਨਾਂ ਵਿੱਚ" ], "in \\1 hour": [ - "(\\d+) ਘੰਟਿਆਂ ਵਿੱਚ", - "(\\d+) ਘੰਟੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਘੰਟਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਘੰਟੇ ਵਿੱਚ" ], "in \\1 minute": [ - "(\\d+) ਮਿੰਟ ਵਿੱਚ", - "(\\d+) ਮਿੰਟਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਮਿੰਟ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਮਿੰਟਾਂ ਵਿੱਚ" ], "in \\1 month": [ - "(\\d+) ਮਹੀਨਿਆਂ ਵਿੱਚ", - "(\\d+) ਮਹੀਨੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਮਹੀਨਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਮਹੀਨੇ ਵਿੱਚ" ], "in \\1 second": [ - "(\\d+) ਸਕਿੰਟ ਵਿੱਚ", - "(\\d+) ਸਕਿੰਟਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਸਕਿੰਟ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਸਕਿੰਟਾਂ ਵਿੱਚ" ], "in \\1 week": [ - "(\\d+) ਹਫ਼ਤਿਆਂ ਵਿੱਚ", - "(\\d+) ਹਫ਼ਤੇ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਹਫ਼ਤਿਆਂ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਹਫ਼ਤੇ ਵਿੱਚ" ], "in \\1 year": [ - "(\\d+) ਸਾਲ ਵਿੱਚ", - "(\\d+) ਸਾਲਾਂ ਵਿੱਚ" + "(\\d+[.,]?\\d*) ਸਾਲ ਵਿੱਚ", + "(\\d+[.,]?\\d*) ਸਾਲਾਂ ਵਿੱਚ" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/pl.py b/dateparser/data/date_translation_data/pl.py index 94c339690..95525291c 100644 --- a/dateparser/data/date_translation_data/pl.py +++ b/dateparser/data/date_translation_data/pl.py @@ -293,77 +293,77 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) dnia temu", - "(\\d+) dzień temu" + "(\\d+[.,]?\\d*) dnia temu", + "(\\d+[.,]?\\d*) dzień temu" ], "\\1 hour ago": [ - "(\\d+) g temu", - "(\\d+) godz temu", - "(\\d+) godziny temu", - "(\\d+) godzinę temu" + "(\\d+[.,]?\\d*) g temu", + "(\\d+[.,]?\\d*) godz temu", + "(\\d+[.,]?\\d*) godziny temu", + "(\\d+[.,]?\\d*) godzinę temu" ], "\\1 minute ago": [ - "(\\d+) min temu", - "(\\d+) minuty temu", - "(\\d+) minutę temu" + "(\\d+[.,]?\\d*) min temu", + "(\\d+[.,]?\\d*) minuty temu", + "(\\d+[.,]?\\d*) minutę temu" ], "\\1 month ago": [ - "(\\d+) mies temu", - "(\\d+) miesiąc temu", - "(\\d+) miesiąca temu", - "–(\\d+) mies" + "(\\d+[.,]?\\d*) mies temu", + "(\\d+[.,]?\\d*) miesiąc temu", + "(\\d+[.,]?\\d*) miesiąca temu", + "–(\\d+[.,]?\\d*) mies" ], "\\1 second ago": [ - "(\\d+) s temu", - "(\\d+) sek temu", - "(\\d+) sekundy temu", - "(\\d+) sekundę temu" + "(\\d+[.,]?\\d*) s temu", + "(\\d+[.,]?\\d*) sek temu", + "(\\d+[.,]?\\d*) sekundy temu", + "(\\d+[.,]?\\d*) sekundę temu" ], "\\1 week ago": [ - "(\\d+) tydz temu", - "(\\d+) tydzień temu", - "(\\d+) tyg temu", - "(\\d+) tygodnia temu" + "(\\d+[.,]?\\d*) tydz temu", + "(\\d+[.,]?\\d*) tydzień temu", + "(\\d+[.,]?\\d*) tyg temu", + "(\\d+[.,]?\\d*) tygodnia temu" ], "\\1 year ago": [ - "(\\d+) rok temu", - "(\\d+) roku temu" + "(\\d+[.,]?\\d*) rok temu", + "(\\d+[.,]?\\d*) roku temu" ], "in \\1 day": [ - "za (\\d+) dnia", - "za (\\d+) dzień" + "za (\\d+[.,]?\\d*) dnia", + "za (\\d+[.,]?\\d*) dzień" ], "in \\1 hour": [ - "za (\\d+) g", - "za (\\d+) godz", - "za (\\d+) godziny", - "za (\\d+) godzinę" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) godz", + "za (\\d+[.,]?\\d*) godziny", + "za (\\d+[.,]?\\d*) godzinę" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minuty", - "za (\\d+) minutę" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minuty", + "za (\\d+[.,]?\\d*) minutę" ], "in \\1 month": [ - "za (\\d+) mies", - "za (\\d+) miesiąc", - "za (\\d+) miesiąca" + "za (\\d+[.,]?\\d*) mies", + "za (\\d+[.,]?\\d*) miesiąc", + "za (\\d+[.,]?\\d*) miesiąca" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sek", - "za (\\d+) sekundy", - "za (\\d+) sekundę" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundy", + "za (\\d+[.,]?\\d*) sekundę" ], "in \\1 week": [ - "za (\\d+) tydz", - "za (\\d+) tydzień", - "za (\\d+) tyg", - "za (\\d+) tygodnia" + "za (\\d+[.,]?\\d*) tydz", + "za (\\d+[.,]?\\d*) tydzień", + "za (\\d+[.,]?\\d*) tyg", + "za (\\d+[.,]?\\d*) tygodnia" ], "in \\1 year": [ - "za (\\d+) rok", - "za (\\d+) roku" + "za (\\d+[.,]?\\d*) rok", + "za (\\d+[.,]?\\d*) roku" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/pt.py b/dateparser/data/date_translation_data/pt.py index 1e6d79c13..db908355b 100644 --- a/dateparser/data/date_translation_data/pt.py +++ b/dateparser/data/date_translation_data/pt.py @@ -176,71 +176,71 @@ }, "relative-type-regex": { "\\1 day ago": [ - "há (\\d+) dia", - "há (\\d+) dias" + "há (\\d+[.,]?\\d*) dia", + "há (\\d+[.,]?\\d*) dias" ], "\\1 hour ago": [ - "há (\\d+) h", - "há (\\d+) hora", - "há (\\d+) horas" + "há (\\d+[.,]?\\d*) h", + "há (\\d+[.,]?\\d*) hora", + "há (\\d+[.,]?\\d*) horas" ], "\\1 minute ago": [ - "há (\\d+) min", - "há (\\d+) mins", - "há (\\d+) minuto", - "há (\\d+) minutos" + "há (\\d+[.,]?\\d*) min", + "há (\\d+[.,]?\\d*) mins", + "há (\\d+[.,]?\\d*) minuto", + "há (\\d+[.,]?\\d*) minutos" ], "\\1 month ago": [ - "há (\\d+) meses", - "há (\\d+) mês" + "há (\\d+[.,]?\\d*) meses", + "há (\\d+[.,]?\\d*) mês" ], "\\1 second ago": [ - "há (\\d+) seg", - "há (\\d+) segundo", - "há (\\d+) segundos" + "há (\\d+[.,]?\\d*) seg", + "há (\\d+[.,]?\\d*) segundo", + "há (\\d+[.,]?\\d*) segundos" ], "\\1 week ago": [ - "há (\\d+) sem", - "há (\\d+) semana", - "há (\\d+) semanas" + "há (\\d+[.,]?\\d*) sem", + "há (\\d+[.,]?\\d*) semana", + "há (\\d+[.,]?\\d*) semanas" ], "\\1 year ago": [ - "há (\\d+) ano", - "há (\\d+) anos" + "há (\\d+[.,]?\\d*) ano", + "há (\\d+[.,]?\\d*) anos" ], "in \\1 day": [ - "em (\\d+) dia", - "em (\\d+) dias" + "em (\\d+[.,]?\\d*) dia", + "em (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "em (\\d+) h", - "em (\\d+) hora", - "em (\\d+) horas" + "em (\\d+[.,]?\\d*) h", + "em (\\d+[.,]?\\d*) hora", + "em (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "em (\\d+) min", - "em (\\d+) mins", - "em (\\d+) minuto", - "em (\\d+) minutos" + "em (\\d+[.,]?\\d*) min", + "em (\\d+[.,]?\\d*) mins", + "em (\\d+[.,]?\\d*) minuto", + "em (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "em (\\d+) meses", - "em (\\d+) mês" + "em (\\d+[.,]?\\d*) meses", + "em (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "em (\\d+) seg", - "em (\\d+) segs", - "em (\\d+) segundo", - "em (\\d+) segundos" + "em (\\d+[.,]?\\d*) seg", + "em (\\d+[.,]?\\d*) segs", + "em (\\d+[.,]?\\d*) segundo", + "em (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "em (\\d+) sem", - "em (\\d+) semana", - "em (\\d+) semanas" + "em (\\d+[.,]?\\d*) sem", + "em (\\d+[.,]?\\d*) semana", + "em (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "em (\\d+) ano", - "em (\\d+) anos" + "em (\\d+[.,]?\\d*) ano", + "em (\\d+[.,]?\\d*) anos" ] }, "locale_specific": { @@ -271,39 +271,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -334,39 +334,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -397,39 +397,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -460,39 +460,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -523,39 +523,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -586,39 +586,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -649,39 +649,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -712,39 +712,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -775,39 +775,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -838,39 +838,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } }, @@ -901,39 +901,39 @@ ], "relative-type-regex": { "\\1 second ago": [ - "há (\\d+) s" + "há (\\d+[.,]?\\d*) s" ], "in \\1 day": [ - "dentro de (\\d+) dia", - "dentro de (\\d+) dias" + "dentro de (\\d+[.,]?\\d*) dia", + "dentro de (\\d+[.,]?\\d*) dias" ], "in \\1 hour": [ - "dentro de (\\d+) h", - "dentro de (\\d+) hora", - "dentro de (\\d+) horas" + "dentro de (\\d+[.,]?\\d*) h", + "dentro de (\\d+[.,]?\\d*) hora", + "dentro de (\\d+[.,]?\\d*) horas" ], "in \\1 minute": [ - "dentro de (\\d+) min", - "dentro de (\\d+) minuto", - "dentro de (\\d+) minutos" + "dentro de (\\d+[.,]?\\d*) min", + "dentro de (\\d+[.,]?\\d*) minuto", + "dentro de (\\d+[.,]?\\d*) minutos" ], "in \\1 month": [ - "dentro de (\\d+) meses", - "dentro de (\\d+) mês" + "dentro de (\\d+[.,]?\\d*) meses", + "dentro de (\\d+[.,]?\\d*) mês" ], "in \\1 second": [ - "dentro de (\\d+) s", - "dentro de (\\d+) segundo", - "dentro de (\\d+) segundos" + "dentro de (\\d+[.,]?\\d*) s", + "dentro de (\\d+[.,]?\\d*) segundo", + "dentro de (\\d+[.,]?\\d*) segundos" ], "in \\1 week": [ - "dentro de (\\d+) sem", - "dentro de (\\d+) semana", - "dentro de (\\d+) semanas" + "dentro de (\\d+[.,]?\\d*) sem", + "dentro de (\\d+[.,]?\\d*) semana", + "dentro de (\\d+[.,]?\\d*) semanas" ], "in \\1 year": [ - "dentro de (\\d+) ano", - "dentro de (\\d+) anos" + "dentro de (\\d+[.,]?\\d*) ano", + "dentro de (\\d+[.,]?\\d*) anos" ] } } diff --git a/dateparser/data/date_translation_data/ro.py b/dateparser/data/date_translation_data/ro.py index a5c30278d..6dcfb16e8 100644 --- a/dateparser/data/date_translation_data/ro.py +++ b/dateparser/data/date_translation_data/ro.py @@ -170,73 +170,73 @@ }, "relative-type-regex": { "\\1 day ago": [ - "acum (\\d+) de zile", - "acum (\\d+) zi", - "acum (\\d+) zile" + "acum (\\d+[.,]?\\d*) de zile", + "acum (\\d+[.,]?\\d*) zi", + "acum (\\d+[.,]?\\d*) zile" ], "\\1 hour ago": [ - "acum (\\d+) de ore", - "acum (\\d+) h", - "acum (\\d+) oră" + "acum (\\d+[.,]?\\d*) de ore", + "acum (\\d+[.,]?\\d*) h", + "acum (\\d+[.,]?\\d*) oră" ], "\\1 minute ago": [ - "acum (\\d+) de minute", - "acum (\\d+) min", - "acum (\\d+) minut" + "acum (\\d+[.,]?\\d*) de minute", + "acum (\\d+[.,]?\\d*) min", + "acum (\\d+[.,]?\\d*) minut" ], "\\1 month ago": [ - "acum (\\d+) de luni", - "acum (\\d+) luni", - "acum (\\d+) lună" + "acum (\\d+[.,]?\\d*) de luni", + "acum (\\d+[.,]?\\d*) luni", + "acum (\\d+[.,]?\\d*) lună" ], "\\1 second ago": [ - "acum (\\d+) de secunde", - "acum (\\d+) sec", - "acum (\\d+) secundă" + "acum (\\d+[.,]?\\d*) de secunde", + "acum (\\d+[.,]?\\d*) sec", + "acum (\\d+[.,]?\\d*) secundă" ], "\\1 week ago": [ - "acum (\\d+) de săptămâni", - "acum (\\d+) săpt", - "acum (\\d+) săptămână" + "acum (\\d+[.,]?\\d*) de săptămâni", + "acum (\\d+[.,]?\\d*) săpt", + "acum (\\d+[.,]?\\d*) săptămână" ], "\\1 year ago": [ - "acum (\\d+) an", - "acum (\\d+) de ani" + "acum (\\d+[.,]?\\d*) an", + "acum (\\d+[.,]?\\d*) de ani" ], "in \\1 day": [ - "peste (\\d+) de zile", - "peste (\\d+) zi", - "peste (\\d+) zile" + "peste (\\d+[.,]?\\d*) de zile", + "peste (\\d+[.,]?\\d*) zi", + "peste (\\d+[.,]?\\d*) zile" ], "in \\1 hour": [ - "peste (\\d+) de ore", - "peste (\\d+) h", - "peste (\\d+) oră" + "peste (\\d+[.,]?\\d*) de ore", + "peste (\\d+[.,]?\\d*) h", + "peste (\\d+[.,]?\\d*) oră" ], "in \\1 minute": [ - "peste (\\d+) de minute", - "peste (\\d+) min", - "peste (\\d+) minut" + "peste (\\d+[.,]?\\d*) de minute", + "peste (\\d+[.,]?\\d*) min", + "peste (\\d+[.,]?\\d*) minut" ], "in \\1 month": [ - "peste (\\d+) de luni", - "peste (\\d+) luni", - "peste (\\d+) lună" + "peste (\\d+[.,]?\\d*) de luni", + "peste (\\d+[.,]?\\d*) luni", + "peste (\\d+[.,]?\\d*) lună" ], "in \\1 second": [ - "peste (\\d+) de secunde", - "peste (\\d+) sec", - "peste (\\d+) secundă" + "peste (\\d+[.,]?\\d*) de secunde", + "peste (\\d+[.,]?\\d*) sec", + "peste (\\d+[.,]?\\d*) secundă" ], "in \\1 week": [ - "peste (\\d+) de săptămâni", - "peste (\\d+) săpt", - "peste (\\d+) săptămână" + "peste (\\d+[.,]?\\d*) de săptămâni", + "peste (\\d+[.,]?\\d*) săpt", + "peste (\\d+[.,]?\\d*) săptămână" ], "in \\1 year": [ - "peste (\\d+) an", - "peste (\\d+) ani", - "peste (\\d+) de ani" + "peste (\\d+[.,]?\\d*) an", + "peste (\\d+[.,]?\\d*) ani", + "peste (\\d+[.,]?\\d*) de ani" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ru.py b/dateparser/data/date_translation_data/ru.py index f05dea175..eade5dc92 100644 --- a/dateparser/data/date_translation_data/ru.py +++ b/dateparser/data/date_translation_data/ru.py @@ -215,76 +215,76 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) д назад", - "(\\d+) день назад", - "(\\d+) дн назад", - "(\\d+) дня назад" + "(\\d+[.,]?\\d*) д назад", + "(\\d+[.,]?\\d*) день назад", + "(\\d+[.,]?\\d*) дн назад", + "(\\d+[.,]?\\d*) дня назад" ], "\\1 hour ago": [ - "(\\d+) ч назад", - "(\\d+) час назад", - "(\\d+) часа назад" + "(\\d+[.,]?\\d*) ч назад", + "(\\d+[.,]?\\d*) час назад", + "(\\d+[.,]?\\d*) часа назад" ], "\\1 minute ago": [ - "(\\d+) мин назад", - "(\\d+) минуту назад", - "(\\d+) минуты назад" + "(\\d+[.,]?\\d*) мин назад", + "(\\d+[.,]?\\d*) минуту назад", + "(\\d+[.,]?\\d*) минуты назад" ], "\\1 month ago": [ - "(\\d+) мес назад", - "(\\d+) месяц назад", - "(\\d+) месяца назад" + "(\\d+[.,]?\\d*) мес назад", + "(\\d+[.,]?\\d*) месяц назад", + "(\\d+[.,]?\\d*) месяца назад" ], "\\1 second ago": [ - "(\\d+) сек назад", - "(\\d+) секунду назад", - "(\\d+) секунды назад" + "(\\d+[.,]?\\d*) сек назад", + "(\\d+[.,]?\\d*) секунду назад", + "(\\d+[.,]?\\d*) секунды назад" ], "\\1 week ago": [ - "(\\d+) нед назад", - "(\\d+) недели назад", - "(\\d+) неделю назад" + "(\\d+[.,]?\\d*) нед назад", + "(\\d+[.,]?\\d*) недели назад", + "(\\d+[.,]?\\d*) неделю назад" ], "\\1 year ago": [ - "(\\d+) г назад", - "(\\d+) год назад", - "(\\d+) года назад" + "(\\d+[.,]?\\d*) г назад", + "(\\d+[.,]?\\d*) год назад", + "(\\d+[.,]?\\d*) года назад" ], "in \\1 day": [ - "через (\\d+) д", - "через (\\d+) день", - "через (\\d+) дн", - "через (\\d+) дня" + "через (\\d+[.,]?\\d*) д", + "через (\\d+[.,]?\\d*) день", + "через (\\d+[.,]?\\d*) дн", + "через (\\d+[.,]?\\d*) дня" ], "in \\1 hour": [ - "через (\\d+) ч", - "через (\\d+) час", - "через (\\d+) часа" + "через (\\d+[.,]?\\d*) ч", + "через (\\d+[.,]?\\d*) час", + "через (\\d+[.,]?\\d*) часа" ], "in \\1 minute": [ - "через (\\d+) мин", - "через (\\d+) минуту", - "через (\\d+) минуты" + "через (\\d+[.,]?\\d*) мин", + "через (\\d+[.,]?\\d*) минуту", + "через (\\d+[.,]?\\d*) минуты" ], "in \\1 month": [ - "через (\\d+) мес", - "через (\\d+) месяц", - "через (\\d+) месяца" + "через (\\d+[.,]?\\d*) мес", + "через (\\d+[.,]?\\d*) месяц", + "через (\\d+[.,]?\\d*) месяца" ], "in \\1 second": [ - "через (\\d+) сек", - "через (\\d+) секунду", - "через (\\d+) секунды" + "через (\\d+[.,]?\\d*) сек", + "через (\\d+[.,]?\\d*) секунду", + "через (\\d+[.,]?\\d*) секунды" ], "in \\1 week": [ - "через (\\d+) нед", - "через (\\d+) недели", - "через (\\d+) неделю" + "через (\\d+[.,]?\\d*) нед", + "через (\\d+[.,]?\\d*) недели", + "через (\\d+[.,]?\\d*) неделю" ], "in \\1 year": [ - "через (\\d+) г", - "через (\\d+) год", - "через (\\d+) года" + "через (\\d+[.,]?\\d*) г", + "через (\\d+[.,]?\\d*) год", + "через (\\d+[.,]?\\d*) года" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/sah.py b/dateparser/data/date_translation_data/sah.py index 247d954e7..da5a7d0be 100644 --- a/dateparser/data/date_translation_data/sah.py +++ b/dateparser/data/date_translation_data/sah.py @@ -158,47 +158,47 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) күн ынараа өттүгэр" + "(\\d+[.,]?\\d*) күн ынараа өттүгэр" ], "\\1 hour ago": [ - "(\\d+) чаас ынараа өттүгэр" + "(\\d+[.,]?\\d*) чаас ынараа өттүгэр" ], "\\1 minute ago": [ - "(\\d+) мүнүүтэ ынараа өттүгэр" + "(\\d+[.,]?\\d*) мүнүүтэ ынараа өттүгэр" ], "\\1 month ago": [ - "(\\d+) ый ынараа өттүгэр" + "(\\d+[.,]?\\d*) ый ынараа өттүгэр" ], "\\1 second ago": [ - "(\\d+) сөк анараа өттүгэр", - "(\\d+) сөкүүндэ ынараа өттүгэр" + "(\\d+[.,]?\\d*) сөк анараа өттүгэр", + "(\\d+[.,]?\\d*) сөкүүндэ ынараа өттүгэр" ], "\\1 week ago": [ - "(\\d+) нэдиэлэ анараа өттүгэр" + "(\\d+[.,]?\\d*) нэдиэлэ анараа өттүгэр" ], "\\1 year ago": [ - "(\\d+) сыл ынараа өттүгэр" + "(\\d+[.,]?\\d*) сыл ынараа өттүгэр" ], "in \\1 day": [ - "(\\d+) күнүнэн" + "(\\d+[.,]?\\d*) күнүнэн" ], "in \\1 hour": [ - "(\\d+) чааһынан" + "(\\d+[.,]?\\d*) чааһынан" ], "in \\1 minute": [ - "(\\d+) мүнүүтэннэн" + "(\\d+[.,]?\\d*) мүнүүтэннэн" ], "in \\1 month": [ - "(\\d+) ыйынан" + "(\\d+[.,]?\\d*) ыйынан" ], "in \\1 second": [ - "(\\d+) сөкүүндэннэн" + "(\\d+[.,]?\\d*) сөкүүндэннэн" ], "in \\1 week": [ - "(\\d+) нэдиэлэннэн" + "(\\d+[.,]?\\d*) нэдиэлэннэн" ], "in \\1 year": [ - "(\\d+) сылынан" + "(\\d+[.,]?\\d*) сылынан" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/se.py b/dateparser/data/date_translation_data/se.py index 8c46f4b9c..481d63a47 100644 --- a/dateparser/data/date_translation_data/se.py +++ b/dateparser/data/date_translation_data/se.py @@ -157,58 +157,58 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) jándor árat", - "(\\d+) jándora árat" + "(\\d+[.,]?\\d*) jándor árat", + "(\\d+[.,]?\\d*) jándora árat" ], "\\1 hour ago": [ - "(\\d+) diibmu árat", - "(\\d+) diibmur árat" + "(\\d+[.,]?\\d*) diibmu árat", + "(\\d+[.,]?\\d*) diibmur árat" ], "\\1 minute ago": [ - "(\\d+) minuhta árat", - "(\\d+) minuhtta árat" + "(\\d+[.,]?\\d*) minuhta árat", + "(\\d+[.,]?\\d*) minuhtta árat" ], "\\1 month ago": [ - "(\\d+) mánotbadji árat" + "(\\d+[.,]?\\d*) mánotbadji árat" ], "\\1 second ago": [ - "(\\d+) sekunda árat", - "(\\d+) sekundda árat" + "(\\d+[.,]?\\d*) sekunda árat", + "(\\d+[.,]?\\d*) sekundda árat" ], "\\1 week ago": [ - "(\\d+) vahkku árat", - "(\\d+) vahku árat" + "(\\d+[.,]?\\d*) vahkku árat", + "(\\d+[.,]?\\d*) vahku árat" ], "\\1 year ago": [ - "(\\d+) jahki árat", - "(\\d+) jahkki árat" + "(\\d+[.,]?\\d*) jahki árat", + "(\\d+[.,]?\\d*) jahkki árat" ], "in \\1 day": [ - "(\\d+) jándor maŋŋilit", - "(\\d+) jándora maŋŋilit" + "(\\d+[.,]?\\d*) jándor maŋŋilit", + "(\\d+[.,]?\\d*) jándora maŋŋilit" ], "in \\1 hour": [ - "(\\d+) diibmu maŋŋilit", - "(\\d+) diibmur maŋŋilit" + "(\\d+[.,]?\\d*) diibmu maŋŋilit", + "(\\d+[.,]?\\d*) diibmur maŋŋilit" ], "in \\1 minute": [ - "(\\d+) minuhta maŋŋilit", - "(\\d+) minuhtta maŋŋilit" + "(\\d+[.,]?\\d*) minuhta maŋŋilit", + "(\\d+[.,]?\\d*) minuhtta maŋŋilit" ], "in \\1 month": [ - "(\\d+) mánotbadji maŋŋilit" + "(\\d+[.,]?\\d*) mánotbadji maŋŋilit" ], "in \\1 second": [ - "(\\d+) sekunda maŋŋilit", - "(\\d+) sekundda maŋŋilit" + "(\\d+[.,]?\\d*) sekunda maŋŋilit", + "(\\d+[.,]?\\d*) sekundda maŋŋilit" ], "in \\1 week": [ - "(\\d+) vahkku maŋŋilit", - "(\\d+) vahku maŋŋilit" + "(\\d+[.,]?\\d*) vahkku maŋŋilit", + "(\\d+[.,]?\\d*) vahku maŋŋilit" ], "in \\1 year": [ - "(\\d+) jahki maŋŋilit", - "(\\d+) jahkki maŋŋilit" + "(\\d+[.,]?\\d*) jahki maŋŋilit", + "(\\d+[.,]?\\d*) jahkki maŋŋilit" ] }, "locale_specific": { @@ -252,10 +252,10 @@ }, "relative-type-regex": { "\\1 year ago": [ - "(\\d+) jagi árat" + "(\\d+[.,]?\\d*) jagi árat" ], "in \\1 year": [ - "(\\d+) jagi siste" + "(\\d+[.,]?\\d*) jagi siste" ] } }, diff --git a/dateparser/data/date_translation_data/si.py b/dateparser/data/date_translation_data/si.py index d78024238..d69a822b8 100644 --- a/dateparser/data/date_translation_data/si.py +++ b/dateparser/data/date_translation_data/si.py @@ -160,46 +160,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "දින (\\d+)කට පෙර" + "දින (\\d+[.,]?\\d*)කට පෙර" ], "\\1 hour ago": [ - "පැය (\\d+)කට පෙර" + "පැය (\\d+[.,]?\\d*)කට පෙර" ], "\\1 minute ago": [ - "මිනිත්තු (\\d+)කට පෙර" + "මිනිත්තු (\\d+[.,]?\\d*)කට පෙර" ], "\\1 month ago": [ - "මාස (\\d+)කට පෙර" + "මාස (\\d+[.,]?\\d*)කට පෙර" ], "\\1 second ago": [ - "තත්පර (\\d+)කට පෙර" + "තත්පර (\\d+[.,]?\\d*)කට පෙර" ], "\\1 week ago": [ - "සති (\\d+)කට පෙර" + "සති (\\d+[.,]?\\d*)කට පෙර" ], "\\1 year ago": [ - "වසර (\\d+)කට පෙර" + "වසර (\\d+[.,]?\\d*)කට පෙර" ], "in \\1 day": [ - "දින (\\d+)න්" + "දින (\\d+[.,]?\\d*)න්" ], "in \\1 hour": [ - "පැය (\\d+)කින්" + "පැය (\\d+[.,]?\\d*)කින්" ], "in \\1 minute": [ - "මිනිත්තු (\\d+)කින්" + "මිනිත්තු (\\d+[.,]?\\d*)කින්" ], "in \\1 month": [ - "මාස (\\d+)කින්" + "මාස (\\d+[.,]?\\d*)කින්" ], "in \\1 second": [ - "තත්පර (\\d+)කින්" + "තත්පර (\\d+[.,]?\\d*)කින්" ], "in \\1 week": [ - "සති (\\d+)කින්" + "සති (\\d+[.,]?\\d*)කින්" ], "in \\1 year": [ - "වසර (\\d+)කින්" + "වසර (\\d+[.,]?\\d*)කින්" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/sk.py b/dateparser/data/date_translation_data/sk.py index 1a787ad42..81ad72203 100644 --- a/dateparser/data/date_translation_data/sk.py +++ b/dateparser/data/date_translation_data/sk.py @@ -169,74 +169,74 @@ }, "relative-type-regex": { "\\1 day ago": [ - "pred (\\d+) d", - "pred (\\d+) dňami", - "pred (\\d+) dňom" + "pred (\\d+[.,]?\\d*) d", + "pred (\\d+[.,]?\\d*) dňami", + "pred (\\d+[.,]?\\d*) dňom" ], "\\1 hour ago": [ - "pred (\\d+) h", - "pred (\\d+) hodinami", - "pred (\\d+) hodinou" + "pred (\\d+[.,]?\\d*) h", + "pred (\\d+[.,]?\\d*) hodinami", + "pred (\\d+[.,]?\\d*) hodinou" ], "\\1 minute ago": [ - "pred (\\d+) min", - "pred (\\d+) minútami", - "pred (\\d+) minútou" + "pred (\\d+[.,]?\\d*) min", + "pred (\\d+[.,]?\\d*) minútami", + "pred (\\d+[.,]?\\d*) minútou" ], "\\1 month ago": [ - "pred (\\d+) mes", - "pred (\\d+) mesiacmi", - "pred (\\d+) mesiacom" + "pred (\\d+[.,]?\\d*) mes", + "pred (\\d+[.,]?\\d*) mesiacmi", + "pred (\\d+[.,]?\\d*) mesiacom" ], "\\1 second ago": [ - "pred (\\d+) s", - "pred (\\d+) sekundami", - "pred (\\d+) sekundou" + "pred (\\d+[.,]?\\d*) s", + "pred (\\d+[.,]?\\d*) sekundami", + "pred (\\d+[.,]?\\d*) sekundou" ], "\\1 week ago": [ - "pred (\\d+) týž", - "pred (\\d+) týždňami", - "pred (\\d+) týždňom" + "pred (\\d+[.,]?\\d*) týž", + "pred (\\d+[.,]?\\d*) týždňami", + "pred (\\d+[.,]?\\d*) týždňom" ], "\\1 year ago": [ - "pred (\\d+) r", - "pred (\\d+) rokmi", - "pred (\\d+) rokom" + "pred (\\d+[.,]?\\d*) r", + "pred (\\d+[.,]?\\d*) rokmi", + "pred (\\d+[.,]?\\d*) rokom" ], "in \\1 day": [ - "o (\\d+) d", - "o (\\d+) deň", - "o (\\d+) dní" + "o (\\d+[.,]?\\d*) d", + "o (\\d+[.,]?\\d*) deň", + "o (\\d+[.,]?\\d*) dní" ], "in \\1 hour": [ - "o (\\d+) h", - "o (\\d+) hodinu", - "o (\\d+) hodín" + "o (\\d+[.,]?\\d*) h", + "o (\\d+[.,]?\\d*) hodinu", + "o (\\d+[.,]?\\d*) hodín" ], "in \\1 minute": [ - "o (\\d+) min", - "o (\\d+) minút", - "o (\\d+) minútu" + "o (\\d+[.,]?\\d*) min", + "o (\\d+[.,]?\\d*) minút", + "o (\\d+[.,]?\\d*) minútu" ], "in \\1 month": [ - "o (\\d+) mes", - "o (\\d+) mesiac", - "o (\\d+) mesiacov" + "o (\\d+[.,]?\\d*) mes", + "o (\\d+[.,]?\\d*) mesiac", + "o (\\d+[.,]?\\d*) mesiacov" ], "in \\1 second": [ - "o (\\d+) s", - "o (\\d+) sekundu", - "o (\\d+) sekúnd" + "o (\\d+[.,]?\\d*) s", + "o (\\d+[.,]?\\d*) sekundu", + "o (\\d+[.,]?\\d*) sekúnd" ], "in \\1 week": [ - "o (\\d+) týž", - "o (\\d+) týždeň", - "o (\\d+) týždňov" + "o (\\d+[.,]?\\d*) týž", + "o (\\d+[.,]?\\d*) týždeň", + "o (\\d+[.,]?\\d*) týždňov" ], "in \\1 year": [ - "o (\\d+) r", - "o (\\d+) rok", - "o (\\d+) rokov" + "o (\\d+[.,]?\\d*) r", + "o (\\d+[.,]?\\d*) rok", + "o (\\d+[.,]?\\d*) rokov" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/sl.py b/dateparser/data/date_translation_data/sl.py index 5ff283a77..4985c9b9e 100644 --- a/dateparser/data/date_translation_data/sl.py +++ b/dateparser/data/date_translation_data/sl.py @@ -160,70 +160,70 @@ }, "relative-type-regex": { "\\1 day ago": [ - "pred (\\d+) dnevi", - "pred (\\d+) dnevom" + "pred (\\d+[.,]?\\d*) dnevi", + "pred (\\d+[.,]?\\d*) dnevom" ], "\\1 hour ago": [ - "pred (\\d+) h", - "pred (\\d+) urami", - "pred (\\d+) uro" + "pred (\\d+[.,]?\\d*) h", + "pred (\\d+[.,]?\\d*) urami", + "pred (\\d+[.,]?\\d*) uro" ], "\\1 minute ago": [ - "pred (\\d+) min", - "pred (\\d+) minutami", - "pred (\\d+) minuto" + "pred (\\d+[.,]?\\d*) min", + "pred (\\d+[.,]?\\d*) minutami", + "pred (\\d+[.,]?\\d*) minuto" ], "\\1 month ago": [ - "pred (\\d+) mes", - "pred (\\d+) mesecem", - "pred (\\d+) meseci" + "pred (\\d+[.,]?\\d*) mes", + "pred (\\d+[.,]?\\d*) mesecem", + "pred (\\d+[.,]?\\d*) meseci" ], "\\1 second ago": [ - "pred (\\d+) s", - "pred (\\d+) sekundami", - "pred (\\d+) sekundo" + "pred (\\d+[.,]?\\d*) s", + "pred (\\d+[.,]?\\d*) sekundami", + "pred (\\d+[.,]?\\d*) sekundo" ], "\\1 week ago": [ - "pred (\\d+) ted", - "pred (\\d+) tedni", - "pred (\\d+) tednom" + "pred (\\d+[.,]?\\d*) ted", + "pred (\\d+[.,]?\\d*) tedni", + "pred (\\d+[.,]?\\d*) tednom" ], "\\1 year ago": [ - "pred (\\d+) leti", - "pred (\\d+) letom" + "pred (\\d+[.,]?\\d*) leti", + "pred (\\d+[.,]?\\d*) letom" ], "in \\1 day": [ - "čez (\\d+) dan", - "čez (\\d+) dni" + "čez (\\d+[.,]?\\d*) dan", + "čez (\\d+[.,]?\\d*) dni" ], "in \\1 hour": [ - "čez (\\d+) h", - "čez (\\d+) ur", - "čez (\\d+) uro" + "čez (\\d+[.,]?\\d*) h", + "čez (\\d+[.,]?\\d*) ur", + "čez (\\d+[.,]?\\d*) uro" ], "in \\1 minute": [ - "čez (\\d+) min", - "čez (\\d+) minut", - "čez (\\d+) minuto" + "čez (\\d+[.,]?\\d*) min", + "čez (\\d+[.,]?\\d*) minut", + "čez (\\d+[.,]?\\d*) minuto" ], "in \\1 month": [ - "čez (\\d+) mes", - "čez (\\d+) mesec", - "čez (\\d+) mesecev" + "čez (\\d+[.,]?\\d*) mes", + "čez (\\d+[.,]?\\d*) mesec", + "čez (\\d+[.,]?\\d*) mesecev" ], "in \\1 second": [ - "čez (\\d+) s", - "čez (\\d+) sekund", - "čez (\\d+) sekundo" + "čez (\\d+[.,]?\\d*) s", + "čez (\\d+[.,]?\\d*) sekund", + "čez (\\d+[.,]?\\d*) sekundo" ], "in \\1 week": [ - "čez (\\d+) ted", - "čez (\\d+) teden", - "čez (\\d+) tednov" + "čez (\\d+[.,]?\\d*) ted", + "čez (\\d+[.,]?\\d*) teden", + "čez (\\d+[.,]?\\d*) tednov" ], "in \\1 year": [ - "čez (\\d+) let", - "čez (\\d+) leto" + "čez (\\d+[.,]?\\d*) let", + "čez (\\d+[.,]?\\d*) leto" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/sq.py b/dateparser/data/date_translation_data/sq.py index f24529607..a43364af2 100644 --- a/dateparser/data/date_translation_data/sq.py +++ b/dateparser/data/date_translation_data/sq.py @@ -156,60 +156,60 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ditë më parë" + "(\\d+[.,]?\\d*) ditë më parë" ], "\\1 hour ago": [ - "(\\d+) orë më parë" + "(\\d+[.,]?\\d*) orë më parë" ], "\\1 minute ago": [ - "(\\d+) min më parë", - "(\\d+) minuta më parë", - "(\\d+) minutë më parë" + "(\\d+[.,]?\\d*) min më parë", + "(\\d+[.,]?\\d*) minuta më parë", + "(\\d+[.,]?\\d*) minutë më parë" ], "\\1 month ago": [ - "(\\d+) muaj më parë" + "(\\d+[.,]?\\d*) muaj më parë" ], "\\1 second ago": [ - "(\\d+) sek më parë", - "(\\d+) sekonda më parë", - "(\\d+) sekondë më parë" + "(\\d+[.,]?\\d*) sek më parë", + "(\\d+[.,]?\\d*) sekonda më parë", + "(\\d+[.,]?\\d*) sekondë më parë" ], "\\1 week ago": [ - "(\\d+) javë më parë" + "(\\d+[.,]?\\d*) javë më parë" ], "\\1 year ago": [ - "(\\d+) vit më parë", - "(\\d+) vjet më parë" + "(\\d+[.,]?\\d*) vit më parë", + "(\\d+[.,]?\\d*) vjet më parë" ], "in \\1 day": [ - "pas (\\d+) dite", - "pas (\\d+) ditësh" + "pas (\\d+[.,]?\\d*) dite", + "pas (\\d+[.,]?\\d*) ditësh" ], "in \\1 hour": [ - "pas (\\d+) ore", - "pas (\\d+) orësh" + "pas (\\d+[.,]?\\d*) ore", + "pas (\\d+[.,]?\\d*) orësh" ], "in \\1 minute": [ - "pas (\\d+) min", - "pas (\\d+) minutash", - "pas (\\d+) minute" + "pas (\\d+[.,]?\\d*) min", + "pas (\\d+[.,]?\\d*) minutash", + "pas (\\d+[.,]?\\d*) minute" ], "in \\1 month": [ - "pas (\\d+) muaji", - "pas (\\d+) muajsh" + "pas (\\d+[.,]?\\d*) muaji", + "pas (\\d+[.,]?\\d*) muajsh" ], "in \\1 second": [ - "pas (\\d+) sek", - "pas (\\d+) sekondash", - "pas (\\d+) sekonde" + "pas (\\d+[.,]?\\d*) sek", + "pas (\\d+[.,]?\\d*) sekondash", + "pas (\\d+[.,]?\\d*) sekonde" ], "in \\1 week": [ - "pas (\\d+) jave", - "pas (\\d+) javësh" + "pas (\\d+[.,]?\\d*) jave", + "pas (\\d+[.,]?\\d*) javësh" ], "in \\1 year": [ - "pas (\\d+) viti", - "pas (\\d+) vjetësh" + "pas (\\d+[.,]?\\d*) viti", + "pas (\\d+[.,]?\\d*) vjetësh" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/sr-Cyrl.py b/dateparser/data/date_translation_data/sr-Cyrl.py index 193428418..4e15696b9 100644 --- a/dateparser/data/date_translation_data/sr-Cyrl.py +++ b/dateparser/data/date_translation_data/sr-Cyrl.py @@ -161,80 +161,80 @@ }, "relative-type-regex": { "\\1 day ago": [ - "пре (\\d+) д", - "пре (\\d+) дана" + "пре (\\d+[.,]?\\d*) д", + "пре (\\d+[.,]?\\d*) дана" ], "\\1 hour ago": [ - "пре (\\d+) сата", - "пре (\\d+) сати", - "пре (\\d+) ч" + "пре (\\d+[.,]?\\d*) сата", + "пре (\\d+[.,]?\\d*) сати", + "пре (\\d+[.,]?\\d*) ч" ], "\\1 minute ago": [ - "пре (\\d+) мин", - "пре (\\d+) минута" + "пре (\\d+[.,]?\\d*) мин", + "пре (\\d+[.,]?\\d*) минута" ], "\\1 month ago": [ - "пре (\\d+) м", - "пре (\\d+) мес", - "пре (\\d+) месеца", - "пре (\\d+) месеци" + "пре (\\d+[.,]?\\d*) м", + "пре (\\d+[.,]?\\d*) мес", + "пре (\\d+[.,]?\\d*) месеца", + "пре (\\d+[.,]?\\d*) месеци" ], "\\1 second ago": [ - "пре (\\d+) с", - "пре (\\d+) сек", - "пре (\\d+) секунде", - "пре (\\d+) секунди" + "пре (\\d+[.,]?\\d*) с", + "пре (\\d+[.,]?\\d*) сек", + "пре (\\d+[.,]?\\d*) секунде", + "пре (\\d+[.,]?\\d*) секунди" ], "\\1 week ago": [ - "пре (\\d+) н", - "пре (\\d+) нед", - "пре (\\d+) недеља", - "пре (\\d+) недеље" + "пре (\\d+[.,]?\\d*) н", + "пре (\\d+[.,]?\\d*) нед", + "пре (\\d+[.,]?\\d*) недеља", + "пре (\\d+[.,]?\\d*) недеље" ], "\\1 year ago": [ - "пре (\\d+) г", - "пре (\\d+) год", - "пре (\\d+) година", - "пре (\\d+) године" + "пре (\\d+[.,]?\\d*) г", + "пре (\\d+[.,]?\\d*) год", + "пре (\\d+[.,]?\\d*) година", + "пре (\\d+[.,]?\\d*) године" ], "in \\1 day": [ - "за (\\d+) д", - "за (\\d+) дан", - "за (\\d+) дана" + "за (\\d+[.,]?\\d*) д", + "за (\\d+[.,]?\\d*) дан", + "за (\\d+[.,]?\\d*) дана" ], "in \\1 hour": [ - "за (\\d+) сат", - "за (\\d+) сати", - "за (\\d+) ч" + "за (\\d+[.,]?\\d*) сат", + "за (\\d+[.,]?\\d*) сати", + "за (\\d+[.,]?\\d*) ч" ], "in \\1 minute": [ - "за (\\d+) мин", - "за (\\d+) минут", - "за (\\d+) минута" + "за (\\d+[.,]?\\d*) мин", + "за (\\d+[.,]?\\d*) минут", + "за (\\d+[.,]?\\d*) минута" ], "in \\1 month": [ - "за (\\d+) м", - "за (\\d+) мес", - "за (\\d+) месец", - "за (\\d+) месеци" + "за (\\d+[.,]?\\d*) м", + "за (\\d+[.,]?\\d*) мес", + "за (\\d+[.,]?\\d*) месец", + "за (\\d+[.,]?\\d*) месеци" ], "in \\1 second": [ - "за (\\d+) с", - "за (\\d+) сек", - "за (\\d+) секунди", - "за (\\d+) секунду" + "за (\\d+[.,]?\\d*) с", + "за (\\d+[.,]?\\d*) сек", + "за (\\d+[.,]?\\d*) секунди", + "за (\\d+[.,]?\\d*) секунду" ], "in \\1 week": [ - "за (\\d+) н", - "за (\\d+) нед", - "за (\\d+) недеља", - "за (\\d+) недељу" + "за (\\d+[.,]?\\d*) н", + "за (\\d+[.,]?\\d*) нед", + "за (\\d+[.,]?\\d*) недеља", + "за (\\d+[.,]?\\d*) недељу" ], "in \\1 year": [ - "за (\\d+) г", - "за (\\d+) год", - "за (\\d+) година", - "за (\\d+) годину" + "за (\\d+[.,]?\\d*) г", + "за (\\d+[.,]?\\d*) год", + "за (\\d+[.,]?\\d*) година", + "за (\\d+[.,]?\\d*) годину" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/sr-Latn.py b/dateparser/data/date_translation_data/sr-Latn.py index 5fdbdeb01..a0daf4639 100644 --- a/dateparser/data/date_translation_data/sr-Latn.py +++ b/dateparser/data/date_translation_data/sr-Latn.py @@ -161,80 +161,80 @@ }, "relative-type-regex": { "\\1 day ago": [ - "pre (\\d+) d", - "pre (\\d+) dana" + "pre (\\d+[.,]?\\d*) d", + "pre (\\d+[.,]?\\d*) dana" ], "\\1 hour ago": [ - "pre (\\d+) sata", - "pre (\\d+) sati", - "pre (\\d+) č" + "pre (\\d+[.,]?\\d*) sata", + "pre (\\d+[.,]?\\d*) sati", + "pre (\\d+[.,]?\\d*) č" ], "\\1 minute ago": [ - "pre (\\d+) min", - "pre (\\d+) minuta" + "pre (\\d+[.,]?\\d*) min", + "pre (\\d+[.,]?\\d*) minuta" ], "\\1 month ago": [ - "pre (\\d+) m", - "pre (\\d+) mes", - "pre (\\d+) meseca", - "pre (\\d+) meseci" + "pre (\\d+[.,]?\\d*) m", + "pre (\\d+[.,]?\\d*) mes", + "pre (\\d+[.,]?\\d*) meseca", + "pre (\\d+[.,]?\\d*) meseci" ], "\\1 second ago": [ - "pre (\\d+) s", - "pre (\\d+) sek", - "pre (\\d+) sekunde", - "pre (\\d+) sekundi" + "pre (\\d+[.,]?\\d*) s", + "pre (\\d+[.,]?\\d*) sek", + "pre (\\d+[.,]?\\d*) sekunde", + "pre (\\d+[.,]?\\d*) sekundi" ], "\\1 week ago": [ - "pre (\\d+) n", - "pre (\\d+) ned", - "pre (\\d+) nedelja", - "pre (\\d+) nedelje" + "pre (\\d+[.,]?\\d*) n", + "pre (\\d+[.,]?\\d*) ned", + "pre (\\d+[.,]?\\d*) nedelja", + "pre (\\d+[.,]?\\d*) nedelje" ], "\\1 year ago": [ - "pre (\\d+) g", - "pre (\\d+) god", - "pre (\\d+) godina", - "pre (\\d+) godine" + "pre (\\d+[.,]?\\d*) g", + "pre (\\d+[.,]?\\d*) god", + "pre (\\d+[.,]?\\d*) godina", + "pre (\\d+[.,]?\\d*) godine" ], "in \\1 day": [ - "za (\\d+) d", - "za (\\d+) dan", - "za (\\d+) dana" + "za (\\d+[.,]?\\d*) d", + "za (\\d+[.,]?\\d*) dan", + "za (\\d+[.,]?\\d*) dana" ], "in \\1 hour": [ - "za (\\d+) sat", - "za (\\d+) sati", - "za (\\d+) č" + "za (\\d+[.,]?\\d*) sat", + "za (\\d+[.,]?\\d*) sati", + "za (\\d+[.,]?\\d*) č" ], "in \\1 minute": [ - "za (\\d+) min", - "za (\\d+) minut", - "za (\\d+) minuta" + "za (\\d+[.,]?\\d*) min", + "za (\\d+[.,]?\\d*) minut", + "za (\\d+[.,]?\\d*) minuta" ], "in \\1 month": [ - "za (\\d+) m", - "za (\\d+) mes", - "za (\\d+) mesec", - "za (\\d+) meseci" + "za (\\d+[.,]?\\d*) m", + "za (\\d+[.,]?\\d*) mes", + "za (\\d+[.,]?\\d*) mesec", + "za (\\d+[.,]?\\d*) meseci" ], "in \\1 second": [ - "za (\\d+) s", - "za (\\d+) sek", - "za (\\d+) sekundi", - "za (\\d+) sekundu" + "za (\\d+[.,]?\\d*) s", + "za (\\d+[.,]?\\d*) sek", + "za (\\d+[.,]?\\d*) sekundi", + "za (\\d+[.,]?\\d*) sekundu" ], "in \\1 week": [ - "za (\\d+) n", - "za (\\d+) ned", - "za (\\d+) nedelja", - "za (\\d+) nedelju" + "za (\\d+[.,]?\\d*) n", + "za (\\d+[.,]?\\d*) ned", + "za (\\d+[.,]?\\d*) nedelja", + "za (\\d+[.,]?\\d*) nedelju" ], "in \\1 year": [ - "za (\\d+) g", - "za (\\d+) god", - "za (\\d+) godina", - "za (\\d+) godinu" + "za (\\d+[.,]?\\d*) g", + "za (\\d+[.,]?\\d*) god", + "za (\\d+[.,]?\\d*) godina", + "za (\\d+[.,]?\\d*) godinu" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/sr.py b/dateparser/data/date_translation_data/sr.py index 7b1a261e0..42a967bc9 100644 --- a/dateparser/data/date_translation_data/sr.py +++ b/dateparser/data/date_translation_data/sr.py @@ -161,80 +161,80 @@ }, "relative-type-regex": { "\\1 day ago": [ - "пре (\\d+) д", - "пре (\\d+) дана" + "пре (\\d+[.,]?\\d*) д", + "пре (\\d+[.,]?\\d*) дана" ], "\\1 hour ago": [ - "пре (\\d+) сата", - "пре (\\d+) сати", - "пре (\\d+) ч" + "пре (\\d+[.,]?\\d*) сата", + "пре (\\d+[.,]?\\d*) сати", + "пре (\\d+[.,]?\\d*) ч" ], "\\1 minute ago": [ - "пре (\\d+) мин", - "пре (\\d+) минута" + "пре (\\d+[.,]?\\d*) мин", + "пре (\\d+[.,]?\\d*) минута" ], "\\1 month ago": [ - "пре (\\d+) м", - "пре (\\d+) мес", - "пре (\\d+) месеца", - "пре (\\d+) месеци" + "пре (\\d+[.,]?\\d*) м", + "пре (\\d+[.,]?\\d*) мес", + "пре (\\d+[.,]?\\d*) месеца", + "пре (\\d+[.,]?\\d*) месеци" ], "\\1 second ago": [ - "пре (\\d+) с", - "пре (\\d+) сек", - "пре (\\d+) секунде", - "пре (\\d+) секунди" + "пре (\\d+[.,]?\\d*) с", + "пре (\\d+[.,]?\\d*) сек", + "пре (\\d+[.,]?\\d*) секунде", + "пре (\\d+[.,]?\\d*) секунди" ], "\\1 week ago": [ - "пре (\\d+) н", - "пре (\\d+) нед", - "пре (\\d+) недеља", - "пре (\\d+) недеље" + "пре (\\d+[.,]?\\d*) н", + "пре (\\d+[.,]?\\d*) нед", + "пре (\\d+[.,]?\\d*) недеља", + "пре (\\d+[.,]?\\d*) недеље" ], "\\1 year ago": [ - "пре (\\d+) г", - "пре (\\d+) год", - "пре (\\d+) година", - "пре (\\d+) године" + "пре (\\d+[.,]?\\d*) г", + "пре (\\d+[.,]?\\d*) год", + "пре (\\d+[.,]?\\d*) година", + "пре (\\d+[.,]?\\d*) године" ], "in \\1 day": [ - "за (\\d+) д", - "за (\\d+) дан", - "за (\\d+) дана" + "за (\\d+[.,]?\\d*) д", + "за (\\d+[.,]?\\d*) дан", + "за (\\d+[.,]?\\d*) дана" ], "in \\1 hour": [ - "за (\\d+) сат", - "за (\\d+) сати", - "за (\\d+) ч" + "за (\\d+[.,]?\\d*) сат", + "за (\\d+[.,]?\\d*) сати", + "за (\\d+[.,]?\\d*) ч" ], "in \\1 minute": [ - "за (\\d+) мин", - "за (\\d+) минут", - "за (\\d+) минута" + "за (\\d+[.,]?\\d*) мин", + "за (\\d+[.,]?\\d*) минут", + "за (\\d+[.,]?\\d*) минута" ], "in \\1 month": [ - "за (\\d+) м", - "за (\\d+) мес", - "за (\\d+) месец", - "за (\\d+) месеци" + "за (\\d+[.,]?\\d*) м", + "за (\\d+[.,]?\\d*) мес", + "за (\\d+[.,]?\\d*) месец", + "за (\\d+[.,]?\\d*) месеци" ], "in \\1 second": [ - "за (\\d+) с", - "за (\\d+) сек", - "за (\\d+) секунди", - "за (\\d+) секунду" + "за (\\d+[.,]?\\d*) с", + "за (\\d+[.,]?\\d*) сек", + "за (\\d+[.,]?\\d*) секунди", + "за (\\d+[.,]?\\d*) секунду" ], "in \\1 week": [ - "за (\\d+) н", - "за (\\d+) нед", - "за (\\d+) недеља", - "за (\\d+) недељу" + "за (\\d+[.,]?\\d*) н", + "за (\\d+[.,]?\\d*) нед", + "за (\\d+[.,]?\\d*) недеља", + "за (\\d+[.,]?\\d*) недељу" ], "in \\1 year": [ - "за (\\d+) г", - "за (\\d+) год", - "за (\\d+) година", - "за (\\d+) годину" + "за (\\d+[.,]?\\d*) г", + "за (\\d+[.,]?\\d*) год", + "за (\\d+[.,]?\\d*) година", + "за (\\d+[.,]?\\d*) годину" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/sv.py b/dateparser/data/date_translation_data/sv.py index 6c89c6279..5f10e71e9 100644 --- a/dateparser/data/date_translation_data/sv.py +++ b/dateparser/data/date_translation_data/sv.py @@ -192,77 +192,77 @@ }, "relative-type-regex": { "\\1 day ago": [ - "för (\\d+) d sedan", - "för (\\d+) dag sedan", - "för (\\d+) dagar sedan", - "−(\\d+) d" + "för (\\d+[.,]?\\d*) d sedan", + "för (\\d+[.,]?\\d*) dag sedan", + "för (\\d+[.,]?\\d*) dagar sedan", + "−(\\d+[.,]?\\d*) d" ], "\\1 hour ago": [ - "för (\\d+) tim sedan", - "för (\\d+) timmar sedan", - "för (\\d+) timme sedan", - "−(\\d+) h" + "för (\\d+[.,]?\\d*) tim sedan", + "för (\\d+[.,]?\\d*) timmar sedan", + "för (\\d+[.,]?\\d*) timme sedan", + "−(\\d+[.,]?\\d*) h" ], "\\1 minute ago": [ - "för (\\d+) min sedan", - "för (\\d+) minut sedan", - "för (\\d+) minuter sedan", - "−(\\d+) min" + "för (\\d+[.,]?\\d*) min sedan", + "för (\\d+[.,]?\\d*) minut sedan", + "för (\\d+[.,]?\\d*) minuter sedan", + "−(\\d+[.,]?\\d*) min" ], "\\1 month ago": [ - "för (\\d+) mån sedan", - "för (\\d+) månad sedan", - "för (\\d+) månader sedan", - "−(\\d+) mån" + "för (\\d+[.,]?\\d*) mån sedan", + "för (\\d+[.,]?\\d*) månad sedan", + "för (\\d+[.,]?\\d*) månader sedan", + "−(\\d+[.,]?\\d*) mån" ], "\\1 second ago": [ - "för (\\d+) sek sedan", - "för (\\d+) sekund sedan", - "för (\\d+) sekunder sedan", - "−(\\d+) s" + "för (\\d+[.,]?\\d*) sek sedan", + "för (\\d+[.,]?\\d*) sekund sedan", + "för (\\d+[.,]?\\d*) sekunder sedan", + "−(\\d+[.,]?\\d*) s" ], "\\1 week ago": [ - "för (\\d+) v sedan", - "för (\\d+) vecka sedan", - "för (\\d+) veckor sedan", - "−(\\d+) v" + "för (\\d+[.,]?\\d*) v sedan", + "för (\\d+[.,]?\\d*) vecka sedan", + "för (\\d+[.,]?\\d*) veckor sedan", + "−(\\d+[.,]?\\d*) v" ], "\\1 year ago": [ - "för (\\d+) år sedan", - "−(\\d+) år" + "för (\\d+[.,]?\\d*) år sedan", + "−(\\d+[.,]?\\d*) år" ], "in \\1 day": [ - "om (\\d+) d", - "om (\\d+) dag", - "om (\\d+) dagar" + "om (\\d+[.,]?\\d*) d", + "om (\\d+[.,]?\\d*) dag", + "om (\\d+[.,]?\\d*) dagar" ], "in \\1 hour": [ - "om (\\d+) tim", - "om (\\d+) timmar", - "om (\\d+) timme" + "om (\\d+[.,]?\\d*) tim", + "om (\\d+[.,]?\\d*) timmar", + "om (\\d+[.,]?\\d*) timme" ], "in \\1 minute": [ - "om (\\d+) min", - "om (\\d+) minut", - "om (\\d+) minuter" + "om (\\d+[.,]?\\d*) min", + "om (\\d+[.,]?\\d*) minut", + "om (\\d+[.,]?\\d*) minuter" ], "in \\1 month": [ - "om (\\d+) mån", - "om (\\d+) månad", - "om (\\d+) månader" + "om (\\d+[.,]?\\d*) mån", + "om (\\d+[.,]?\\d*) månad", + "om (\\d+[.,]?\\d*) månader" ], "in \\1 second": [ - "om (\\d+) sek", - "om (\\d+) sekund", - "om (\\d+) sekunder" + "om (\\d+[.,]?\\d*) sek", + "om (\\d+[.,]?\\d*) sekund", + "om (\\d+[.,]?\\d*) sekunder" ], "in \\1 week": [ - "om (\\d+) v", - "om (\\d+) vecka", - "om (\\d+) veckor" + "om (\\d+[.,]?\\d*) v", + "om (\\d+[.,]?\\d*) vecka", + "om (\\d+[.,]?\\d*) veckor" ], "in \\1 year": [ - "om (\\d+) år" + "om (\\d+[.,]?\\d*) år" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/sw.py b/dateparser/data/date_translation_data/sw.py index 1a67e8c34..eee516e31 100644 --- a/dateparser/data/date_translation_data/sw.py +++ b/dateparser/data/date_translation_data/sw.py @@ -149,55 +149,55 @@ }, "relative-type-regex": { "\\1 day ago": [ - "siku (\\d+) iliyopita", - "siku (\\d+) zilizopita" + "siku (\\d+[.,]?\\d*) iliyopita", + "siku (\\d+[.,]?\\d*) zilizopita" ], "\\1 hour ago": [ - "saa (\\d+) iliyopita", - "saa (\\d+) zilizopita" + "saa (\\d+[.,]?\\d*) iliyopita", + "saa (\\d+[.,]?\\d*) zilizopita" ], "\\1 minute ago": [ - "dakika (\\d+) iliyopita", - "dakika (\\d+) zilizopita" + "dakika (\\d+[.,]?\\d*) iliyopita", + "dakika (\\d+[.,]?\\d*) zilizopita" ], "\\1 month ago": [ - "miezi (\\d+) iliyopita", - "mwezi (\\d+) uliopita" + "miezi (\\d+[.,]?\\d*) iliyopita", + "mwezi (\\d+[.,]?\\d*) uliopita" ], "\\1 second ago": [ - "sekunde (\\d+) iliyopita", - "sekunde (\\d+) zilizopita" + "sekunde (\\d+[.,]?\\d*) iliyopita", + "sekunde (\\d+[.,]?\\d*) zilizopita" ], "\\1 week ago": [ - "wiki (\\d+) iliyopita", - "wiki (\\d+) zilizopita" + "wiki (\\d+[.,]?\\d*) iliyopita", + "wiki (\\d+[.,]?\\d*) zilizopita" ], "\\1 year ago": [ - "miaka (\\d+) iliyopita", - "mwaka (\\d+) uliopita" + "miaka (\\d+[.,]?\\d*) iliyopita", + "mwaka (\\d+[.,]?\\d*) uliopita" ], "in \\1 day": [ - "baada ya siku (\\d+)" + "baada ya siku (\\d+[.,]?\\d*)" ], "in \\1 hour": [ - "baada ya saa (\\d+)" + "baada ya saa (\\d+[.,]?\\d*)" ], "in \\1 minute": [ - "baada ya dakika (\\d+)" + "baada ya dakika (\\d+[.,]?\\d*)" ], "in \\1 month": [ - "baada ya miezi (\\d+)", - "baada ya mwezi (\\d+)" + "baada ya miezi (\\d+[.,]?\\d*)", + "baada ya mwezi (\\d+[.,]?\\d*)" ], "in \\1 second": [ - "baada ya sekunde (\\d+)" + "baada ya sekunde (\\d+[.,]?\\d*)" ], "in \\1 week": [ - "baada ya wiki (\\d+)" + "baada ya wiki (\\d+[.,]?\\d*)" ], "in \\1 year": [ - "baada ya miaka (\\d+)", - "baada ya mwaka (\\d+)" + "baada ya miaka (\\d+[.,]?\\d*)", + "baada ya mwaka (\\d+[.,]?\\d*)" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ta.py b/dateparser/data/date_translation_data/ta.py index b90c62b43..43c53f1b6 100644 --- a/dateparser/data/date_translation_data/ta.py +++ b/dateparser/data/date_translation_data/ta.py @@ -158,82 +158,82 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) நா முன்", - "(\\d+) நாட்களுக்கு முன்", - "(\\d+) நாளுக்கு முன்" + "(\\d+[.,]?\\d*) நா முன்", + "(\\d+[.,]?\\d*) நாட்களுக்கு முன்", + "(\\d+[.,]?\\d*) நாளுக்கு முன்" ], "\\1 hour ago": [ - "(\\d+) ம முன்", - "(\\d+) மணி முன்", - "(\\d+) மணிநேரம் முன்" + "(\\d+[.,]?\\d*) ம முன்", + "(\\d+[.,]?\\d*) மணி முன்", + "(\\d+[.,]?\\d*) மணிநேரம் முன்" ], "\\1 minute ago": [ - "(\\d+) நி முன்", - "(\\d+) நிமி முன்", - "(\\d+) நிமிடங்களுக்கு முன்", - "(\\d+) நிமிடத்திற்கு முன்" + "(\\d+[.,]?\\d*) நி முன்", + "(\\d+[.,]?\\d*) நிமி முன்", + "(\\d+[.,]?\\d*) நிமிடங்களுக்கு முன்", + "(\\d+[.,]?\\d*) நிமிடத்திற்கு முன்" ], "\\1 month ago": [ - "(\\d+) மா முன்", - "(\\d+) மாத முன்", - "(\\d+) மாதங்களுக்கு முன்", - "(\\d+) மாதத்துக்கு முன்" + "(\\d+[.,]?\\d*) மா முன்", + "(\\d+[.,]?\\d*) மாத முன்", + "(\\d+[.,]?\\d*) மாதங்களுக்கு முன்", + "(\\d+[.,]?\\d*) மாதத்துக்கு முன்" ], "\\1 second ago": [ - "(\\d+) வி முன்", - "(\\d+) விநா முன்", - "(\\d+) விநாடிகளுக்கு முன்", - "(\\d+) விநாடிக்கு முன்" + "(\\d+[.,]?\\d*) வி முன்", + "(\\d+[.,]?\\d*) விநா முன்", + "(\\d+[.,]?\\d*) விநாடிகளுக்கு முன்", + "(\\d+[.,]?\\d*) விநாடிக்கு முன்" ], "\\1 week ago": [ - "(\\d+) வா முன்", - "(\\d+) வார முன்", - "(\\d+) வாரங்களுக்கு முன்", - "(\\d+) வாரத்திற்கு முன்பு" + "(\\d+[.,]?\\d*) வா முன்", + "(\\d+[.,]?\\d*) வார முன்", + "(\\d+[.,]?\\d*) வாரங்களுக்கு முன்", + "(\\d+[.,]?\\d*) வாரத்திற்கு முன்பு" ], "\\1 year ago": [ - "(\\d+) ஆ முன்", - "(\\d+) ஆண்டிற்கு முன்", - "(\\d+) ஆண்டுகளுக்கு முன்" + "(\\d+[.,]?\\d*) ஆ முன்", + "(\\d+[.,]?\\d*) ஆண்டிற்கு முன்", + "(\\d+[.,]?\\d*) ஆண்டுகளுக்கு முன்" ], "in \\1 day": [ - "(\\d+) நா", - "(\\d+) நாட்களில்", - "(\\d+) நாளில்" + "(\\d+[.,]?\\d*) நா", + "(\\d+[.,]?\\d*) நாட்களில்", + "(\\d+[.,]?\\d*) நாளில்" ], "in \\1 hour": [ - "(\\d+) ம", - "(\\d+) மணி", - "(\\d+) மணிநேரத்தில்" + "(\\d+[.,]?\\d*) ம", + "(\\d+[.,]?\\d*) மணி", + "(\\d+[.,]?\\d*) மணிநேரத்தில்" ], "in \\1 minute": [ - "(\\d+) நி", - "(\\d+) நிமி", - "(\\d+) நிமிடங்களில்", - "(\\d+) நிமிடத்தில்" + "(\\d+[.,]?\\d*) நி", + "(\\d+[.,]?\\d*) நிமி", + "(\\d+[.,]?\\d*) நிமிடங்களில்", + "(\\d+[.,]?\\d*) நிமிடத்தில்" ], "in \\1 month": [ - "(\\d+) மா", - "(\\d+) மாத", - "(\\d+) மாதங்களில்", - "(\\d+) மாதத்தில்" + "(\\d+[.,]?\\d*) மா", + "(\\d+[.,]?\\d*) மாத", + "(\\d+[.,]?\\d*) மாதங்களில்", + "(\\d+[.,]?\\d*) மாதத்தில்" ], "in \\1 second": [ - "(\\d+) வி", - "(\\d+) விநா", - "(\\d+) விநாடிகளில்", - "(\\d+) விநாடியில்" + "(\\d+[.,]?\\d*) வி", + "(\\d+[.,]?\\d*) விநா", + "(\\d+[.,]?\\d*) விநாடிகளில்", + "(\\d+[.,]?\\d*) விநாடியில்" ], "in \\1 week": [ - "(\\d+) வா", - "(\\d+) வார", - "(\\d+) வாரங்களில்", - "(\\d+) வாரத்தில்" + "(\\d+[.,]?\\d*) வா", + "(\\d+[.,]?\\d*) வார", + "(\\d+[.,]?\\d*) வாரங்களில்", + "(\\d+[.,]?\\d*) வாரத்தில்" ], "in \\1 year": [ - "(\\d+) ஆ", - "(\\d+) ஆண்டில்", - "(\\d+) ஆண்டுகளில்" + "(\\d+[.,]?\\d*) ஆ", + "(\\d+[.,]?\\d*) ஆண்டில்", + "(\\d+[.,]?\\d*) ஆண்டுகளில்" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/te.py b/dateparser/data/date_translation_data/te.py index a4838faeb..c488d68fa 100644 --- a/dateparser/data/date_translation_data/te.py +++ b/dateparser/data/date_translation_data/te.py @@ -157,68 +157,68 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) రోజు క్రితం", - "(\\d+) రోజుల క్రితం" + "(\\d+[.,]?\\d*) రోజు క్రితం", + "(\\d+[.,]?\\d*) రోజుల క్రితం" ], "\\1 hour ago": [ - "(\\d+) గం క్రితం", - "(\\d+) గంట క్రితం", - "(\\d+) గంటల క్రితం" + "(\\d+[.,]?\\d*) గం క్రితం", + "(\\d+[.,]?\\d*) గంట క్రితం", + "(\\d+[.,]?\\d*) గంటల క్రితం" ], "\\1 minute ago": [ - "(\\d+) నిమి క్రితం", - "(\\d+) నిమిషం క్రితం", - "(\\d+) నిమిషాల క్రితం" + "(\\d+[.,]?\\d*) నిమి క్రితం", + "(\\d+[.,]?\\d*) నిమిషం క్రితం", + "(\\d+[.,]?\\d*) నిమిషాల క్రితం" ], "\\1 month ago": [ - "(\\d+) నెల క్రితం", - "(\\d+) నెలల క్రితం" + "(\\d+[.,]?\\d*) నెల క్రితం", + "(\\d+[.,]?\\d*) నెలల క్రితం" ], "\\1 second ago": [ - "(\\d+) సెక క్రితం", - "(\\d+) సెకను క్రితం", - "(\\d+) సెకన్ల క్రితం" + "(\\d+[.,]?\\d*) సెక క్రితం", + "(\\d+[.,]?\\d*) సెకను క్రితం", + "(\\d+[.,]?\\d*) సెకన్ల క్రితం" ], "\\1 week ago": [ - "(\\d+) వారం క్రితం", - "(\\d+) వారాల క్రితం" + "(\\d+[.,]?\\d*) వారం క్రితం", + "(\\d+[.,]?\\d*) వారాల క్రితం" ], "\\1 year ago": [ - "(\\d+) సం క్రితం", - "(\\d+) సంవత్సరం క్రితం", - "(\\d+) సంవత్సరాల క్రితం" + "(\\d+[.,]?\\d*) సం క్రితం", + "(\\d+[.,]?\\d*) సంవత్సరం క్రితం", + "(\\d+[.,]?\\d*) సంవత్సరాల క్రితం" ], "in \\1 day": [ - "(\\d+) రోజులో", - "(\\d+) రోజుల్లో" + "(\\d+[.,]?\\d*) రోజులో", + "(\\d+[.,]?\\d*) రోజుల్లో" ], "in \\1 hour": [ - "(\\d+) గంటలో", - "(\\d+) గంటల్లో", - "(\\d+) గంలో" + "(\\d+[.,]?\\d*) గంటలో", + "(\\d+[.,]?\\d*) గంటల్లో", + "(\\d+[.,]?\\d*) గంలో" ], "in \\1 minute": [ - "(\\d+) నిమిలో", - "(\\d+) నిమిషంలో", - "(\\d+) నిమిషాల్లో" + "(\\d+[.,]?\\d*) నిమిలో", + "(\\d+[.,]?\\d*) నిమిషంలో", + "(\\d+[.,]?\\d*) నిమిషాల్లో" ], "in \\1 month": [ - "(\\d+) నెలలో", - "(\\d+) నెలల్లో" + "(\\d+[.,]?\\d*) నెలలో", + "(\\d+[.,]?\\d*) నెలల్లో" ], "in \\1 second": [ - "(\\d+) సెక లో", - "(\\d+) సెకనులో", - "(\\d+) సెకన్లలో" + "(\\d+[.,]?\\d*) సెక లో", + "(\\d+[.,]?\\d*) సెకనులో", + "(\\d+[.,]?\\d*) సెకన్లలో" ], "in \\1 week": [ - "(\\d+) వారంలో", - "(\\d+) వారాల్లో" + "(\\d+[.,]?\\d*) వారంలో", + "(\\d+[.,]?\\d*) వారాల్లో" ], "in \\1 year": [ - "(\\d+) సంలో", - "(\\d+) సంవత్సరంలో", - "(\\d+) సంవత్సరాల్లో" + "(\\d+[.,]?\\d*) సంలో", + "(\\d+[.,]?\\d*) సంవత్సరంలో", + "(\\d+[.,]?\\d*) సంవత్సరాల్లో" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/th.py b/dateparser/data/date_translation_data/th.py index e9bdf456c..031920ced 100644 --- a/dateparser/data/date_translation_data/th.py +++ b/dateparser/data/date_translation_data/th.py @@ -195,59 +195,59 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) วันที่ผ่านมา", - "(\\d+) วันที่แล้ว" + "(\\d+[.,]?\\d*) วันที่ผ่านมา", + "(\\d+[.,]?\\d*) วันที่แล้ว" ], "\\1 hour ago": [ - "(\\d+) ชม ที่แล้ว", - "(\\d+) ชั่วโมงที่ผ่านมา" + "(\\d+[.,]?\\d*) ชม ที่แล้ว", + "(\\d+[.,]?\\d*) ชั่วโมงที่ผ่านมา" ], "\\1 minute ago": [ - "(\\d+) นาทีที่ผ่านมา", - "(\\d+) นาทีที่แล้ว" + "(\\d+[.,]?\\d*) นาทีที่ผ่านมา", + "(\\d+[.,]?\\d*) นาทีที่แล้ว" ], "\\1 month ago": [ - "(\\d+) เดือนที่ผ่านมา", - "(\\d+) เดือนที่แล้ว" + "(\\d+[.,]?\\d*) เดือนที่ผ่านมา", + "(\\d+[.,]?\\d*) เดือนที่แล้ว" ], "\\1 second ago": [ - "(\\d+) วินาทีที่ผ่านมา", - "(\\d+) วินาทีที่แล้ว" + "(\\d+[.,]?\\d*) วินาทีที่ผ่านมา", + "(\\d+[.,]?\\d*) วินาทีที่แล้ว" ], "\\1 week ago": [ - "(\\d+) สัปดาห์ที่ผ่านมา", - "(\\d+) สัปดาห์ที่แล้ว" + "(\\d+[.,]?\\d*) สัปดาห์ที่ผ่านมา", + "(\\d+[.,]?\\d*) สัปดาห์ที่แล้ว" ], "\\1 year ago": [ - "(\\d+) ปีที่แล้ว" + "(\\d+[.,]?\\d*) ปีที่แล้ว" ], "in \\1 day": [ - "ใน (\\d+) วัน", - "ในอีก (\\d+) วัน" + "ใน (\\d+[.,]?\\d*) วัน", + "ในอีก (\\d+[.,]?\\d*) วัน" ], "in \\1 hour": [ - "ใน (\\d+) ชม", - "ในอีก (\\d+) ชั่วโมง" + "ใน (\\d+[.,]?\\d*) ชม", + "ในอีก (\\d+[.,]?\\d*) ชั่วโมง" ], "in \\1 minute": [ - "ใน (\\d+) นาที", - "ในอีก (\\d+) นาที" + "ใน (\\d+[.,]?\\d*) นาที", + "ในอีก (\\d+[.,]?\\d*) นาที" ], "in \\1 month": [ - "ใน (\\d+) เดือน", - "ในอีก (\\d+) เดือน" + "ใน (\\d+[.,]?\\d*) เดือน", + "ในอีก (\\d+[.,]?\\d*) เดือน" ], "in \\1 second": [ - "ใน (\\d+) วินาที", - "ในอีก (\\d+) วินาที" + "ใน (\\d+[.,]?\\d*) วินาที", + "ในอีก (\\d+[.,]?\\d*) วินาที" ], "in \\1 week": [ - "ใน (\\d+) สัปดาห์", - "ในอีก (\\d+) สัปดาห์" + "ใน (\\d+[.,]?\\d*) สัปดาห์", + "ในอีก (\\d+[.,]?\\d*) สัปดาห์" ], "in \\1 year": [ - "ใน (\\d+) ปี", - "ในอีก (\\d+) ปี" + "ใน (\\d+[.,]?\\d*) ปี", + "ในอีก (\\d+[.,]?\\d*) ปี" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/to.py b/dateparser/data/date_translation_data/to.py index 7e66d35c7..ea4d3b411 100644 --- a/dateparser/data/date_translation_data/to.py +++ b/dateparser/data/date_translation_data/to.py @@ -156,46 +156,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "'aho 'e (\\d+) kuo'osi" + "'aho 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 hour ago": [ - "houa 'e (\\d+) kuo'osi" + "houa 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 minute ago": [ - "miniti 'e (\\d+) kuo'osi" + "miniti 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 month ago": [ - "māhina 'e (\\d+) kuo'osi" + "māhina 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 second ago": [ - "sekoni 'e (\\d+) kuo'osi" + "sekoni 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 week ago": [ - "uike 'e (\\d+) kuo'osi" + "uike 'e (\\d+[.,]?\\d*) kuo'osi" ], "\\1 year ago": [ - "ta'u 'e (\\d+) kuo'osi" + "ta'u 'e (\\d+[.,]?\\d*) kuo'osi" ], "in \\1 day": [ - "'i he 'aho 'e (\\d+)" + "'i he 'aho 'e (\\d+[.,]?\\d*)" ], "in \\1 hour": [ - "'i he houa 'e (\\d+)" + "'i he houa 'e (\\d+[.,]?\\d*)" ], "in \\1 minute": [ - "'i he miniti 'e (\\d+)" + "'i he miniti 'e (\\d+[.,]?\\d*)" ], "in \\1 month": [ - "'i he māhina 'e (\\d+)" + "'i he māhina 'e (\\d+[.,]?\\d*)" ], "in \\1 second": [ - "'i he sekoni 'e (\\d+)" + "'i he sekoni 'e (\\d+[.,]?\\d*)" ], "in \\1 week": [ - "'i he uike 'e (\\d+)" + "'i he uike 'e (\\d+[.,]?\\d*)" ], "in \\1 year": [ - "'i he ta'u 'e (\\d+)" + "'i he ta'u 'e (\\d+[.,]?\\d*)" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/tr.py b/dateparser/data/date_translation_data/tr.py index 059c15a07..8688a4438 100644 --- a/dateparser/data/date_translation_data/tr.py +++ b/dateparser/data/date_translation_data/tr.py @@ -176,54 +176,54 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) gün önce" + "(\\d+[.,]?\\d*) gün önce" ], "\\1 hour ago": [ - "(\\d+) sa önce", - "(\\d+) saat önce" + "(\\d+[.,]?\\d*) sa önce", + "(\\d+[.,]?\\d*) saat önce" ], "\\1 minute ago": [ - "(\\d+) dakika önce", - "(\\d+) dk önce" + "(\\d+[.,]?\\d*) dakika önce", + "(\\d+[.,]?\\d*) dk önce" ], "\\1 month ago": [ - "(\\d+) ay önce" + "(\\d+[.,]?\\d*) ay önce" ], "\\1 second ago": [ - "(\\d+) saniye önce", - "(\\d+) sn önce" + "(\\d+[.,]?\\d*) saniye önce", + "(\\d+[.,]?\\d*) sn önce" ], "\\1 week ago": [ - "(\\d+) hafta önce", - "(\\d+) hf önce" + "(\\d+[.,]?\\d*) hafta önce", + "(\\d+[.,]?\\d*) hf önce" ], "\\1 year ago": [ - "(\\d+) yıl önce" + "(\\d+[.,]?\\d*) yıl önce" ], "in \\1 day": [ - "(\\d+) gün sonra" + "(\\d+[.,]?\\d*) gün sonra" ], "in \\1 hour": [ - "(\\d+) sa sonra", - "(\\d+) saat sonra" + "(\\d+[.,]?\\d*) sa sonra", + "(\\d+[.,]?\\d*) saat sonra" ], "in \\1 minute": [ - "(\\d+) dakika sonra", - "(\\d+) dk sonra" + "(\\d+[.,]?\\d*) dakika sonra", + "(\\d+[.,]?\\d*) dk sonra" ], "in \\1 month": [ - "(\\d+) ay sonra" + "(\\d+[.,]?\\d*) ay sonra" ], "in \\1 second": [ - "(\\d+) saniye sonra", - "(\\d+) sn sonra" + "(\\d+[.,]?\\d*) saniye sonra", + "(\\d+[.,]?\\d*) sn sonra" ], "in \\1 week": [ - "(\\d+) hafta sonra", - "(\\d+) hf sonra" + "(\\d+[.,]?\\d*) hafta sonra", + "(\\d+[.,]?\\d*) hf sonra" ], "in \\1 year": [ - "(\\d+) yıl sonra" + "(\\d+[.,]?\\d*) yıl sonra" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/ug.py b/dateparser/data/date_translation_data/ug.py index 05732c3a3..b55b8419b 100644 --- a/dateparser/data/date_translation_data/ug.py +++ b/dateparser/data/date_translation_data/ug.py @@ -143,46 +143,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) كۈن ئىلگىرى" + "(\\d+[.,]?\\d*) كۈن ئىلگىرى" ], "\\1 hour ago": [ - "(\\d+) سائەت ئىلگىرى" + "(\\d+[.,]?\\d*) سائەت ئىلگىرى" ], "\\1 minute ago": [ - "(\\d+) مىنۇت ئىلگىرى" + "(\\d+[.,]?\\d*) مىنۇت ئىلگىرى" ], "\\1 month ago": [ - "(\\d+) ئاي ئىلگىرى" + "(\\d+[.,]?\\d*) ئاي ئىلگىرى" ], "\\1 second ago": [ - "(\\d+) سېكۇنت ئىلگىرى" + "(\\d+[.,]?\\d*) سېكۇنت ئىلگىرى" ], "\\1 week ago": [ - "(\\d+) ھەپتە ئىلگىرى" + "(\\d+[.,]?\\d*) ھەپتە ئىلگىرى" ], "\\1 year ago": [ - "(\\d+) يىل ئىلگىرى" + "(\\d+[.,]?\\d*) يىل ئىلگىرى" ], "in \\1 day": [ - "(\\d+) كۈندىن كېيىن" + "(\\d+[.,]?\\d*) كۈندىن كېيىن" ], "in \\1 hour": [ - "(\\d+) سائەتتىن كېيىن" + "(\\d+[.,]?\\d*) سائەتتىن كېيىن" ], "in \\1 minute": [ - "(\\d+) مىنۇتتىن كېيىن" + "(\\d+[.,]?\\d*) مىنۇتتىن كېيىن" ], "in \\1 month": [ - "(\\d+) ئايدىن كېيىن" + "(\\d+[.,]?\\d*) ئايدىن كېيىن" ], "in \\1 second": [ - "(\\d+) سېكۇنتتىن كېيىن" + "(\\d+[.,]?\\d*) سېكۇنتتىن كېيىن" ], "in \\1 week": [ - "(\\d+) ھەپتىدىن كېيىن" + "(\\d+[.,]?\\d*) ھەپتىدىن كېيىن" ], "in \\1 year": [ - "(\\d+) يىلدىن كېيىن" + "(\\d+[.,]?\\d*) يىلدىن كېيىن" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/uk.py b/dateparser/data/date_translation_data/uk.py index 7438d7748..4733942cf 100644 --- a/dateparser/data/date_translation_data/uk.py +++ b/dateparser/data/date_translation_data/uk.py @@ -290,85 +290,85 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) д тому", - "(\\d+) день тому", - "(\\d+) дн тому", - "(\\d+) дня тому" + "(\\d+[.,]?\\d*) д тому", + "(\\d+[.,]?\\d*) день тому", + "(\\d+[.,]?\\d*) дн тому", + "(\\d+[.,]?\\d*) дня тому" ], "\\1 hour ago": [ - "(\\d+) год тому", - "(\\d+) години тому", - "(\\d+) годину тому", - "(\\d+) година тому" + "(\\d+[.,]?\\d*) год тому", + "(\\d+[.,]?\\d*) години тому", + "(\\d+[.,]?\\d*) годину тому", + "(\\d+[.,]?\\d*) година тому" ], "\\1 minute ago": [ - "(\\d+) хв тому", - "(\\d+) хвилини тому", - "(\\d+) хвилину тому", - "(\\d+) хвилина тому" + "(\\d+[.,]?\\d*) хв тому", + "(\\d+[.,]?\\d*) хвилини тому", + "(\\d+[.,]?\\d*) хвилину тому", + "(\\d+[.,]?\\d*) хвилина тому" ], "\\1 month ago": [ - "(\\d+) міс тому", - "(\\d+) місяць тому", - "(\\d+) місяця тому" + "(\\d+[.,]?\\d*) міс тому", + "(\\d+[.,]?\\d*) місяць тому", + "(\\d+[.,]?\\d*) місяця тому" ], "\\1 second ago": [ - "(\\d+) с тому", - "(\\d+) секунди тому", - "(\\d+) секунду тому", - "(\\d+) секунда тому" + "(\\d+[.,]?\\d*) с тому", + "(\\d+[.,]?\\d*) секунди тому", + "(\\d+[.,]?\\d*) секунду тому", + "(\\d+[.,]?\\d*) секунда тому" ], "\\1 week ago": [ - "(\\d+) тиж тому", - "(\\d+) тиждень тому", - "(\\d+) тижня тому" + "(\\d+[.,]?\\d*) тиж тому", + "(\\d+[.,]?\\d*) тиждень тому", + "(\\d+[.,]?\\d*) тижня тому" ], "\\1 year ago": [ - "(\\d+) р тому", - "(\\d+) року тому", - "(\\d+) рік тому" + "(\\d+[.,]?\\d*) р тому", + "(\\d+[.,]?\\d*) року тому", + "(\\d+[.,]?\\d*) рік тому" ], "in \\1 day": [ - "за (\\d+) д", - "через (\\d+) день", - "через (\\d+) дн", - "через (\\d+) дня" + "за (\\d+[.,]?\\d*) д", + "через (\\d+[.,]?\\d*) день", + "через (\\d+[.,]?\\d*) дн", + "через (\\d+[.,]?\\d*) дня" ], "in \\1 hour": [ - "за (\\d+) год", - "через (\\d+) год", - "через (\\d+) години", - "через (\\d+) годину" + "за (\\d+[.,]?\\d*) год", + "через (\\d+[.,]?\\d*) год", + "через (\\d+[.,]?\\d*) години", + "через (\\d+[.,]?\\d*) годину" ], "in \\1 minute": [ - "за (\\d+) хв", - "через (\\d+) хв", - "через (\\d+) хвилини", - "через (\\d+) хвилину" + "за (\\d+[.,]?\\d*) хв", + "через (\\d+[.,]?\\d*) хв", + "через (\\d+[.,]?\\d*) хвилини", + "через (\\d+[.,]?\\d*) хвилину" ], "in \\1 month": [ - "за (\\d+) міс", - "через (\\d+) міс", - "через (\\d+) місяць", - "через (\\d+) місяця" + "за (\\d+[.,]?\\d*) міс", + "через (\\d+[.,]?\\d*) міс", + "через (\\d+[.,]?\\d*) місяць", + "через (\\d+[.,]?\\d*) місяця" ], "in \\1 second": [ - "за (\\d+) с", - "через (\\d+) с", - "через (\\d+) секунди", - "через (\\d+) секунду" + "за (\\d+[.,]?\\d*) с", + "через (\\d+[.,]?\\d*) с", + "через (\\d+[.,]?\\d*) секунди", + "через (\\d+[.,]?\\d*) секунду" ], "in \\1 week": [ - "за (\\d+) тиж", - "через (\\d+) тиж", - "через (\\d+) тиждень", - "через (\\d+) тижня" + "за (\\d+[.,]?\\d*) тиж", + "через (\\d+[.,]?\\d*) тиж", + "через (\\d+[.,]?\\d*) тиждень", + "через (\\d+[.,]?\\d*) тижня" ], "in \\1 year": [ - "за (\\d+) р", - "через (\\d+) р", - "через (\\d+) року", - "через (\\d+) рік" + "за (\\d+[.,]?\\d*) р", + "через (\\d+[.,]?\\d*) р", + "через (\\d+[.,]?\\d*) року", + "через (\\d+[.,]?\\d*) рік" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/ur.py b/dateparser/data/date_translation_data/ur.py index c8dea2912..c00110d60 100644 --- a/dateparser/data/date_translation_data/ur.py +++ b/dateparser/data/date_translation_data/ur.py @@ -135,58 +135,58 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) دن پہلے", - "(\\d+) دنوں پہلے" + "(\\d+[.,]?\\d*) دن پہلے", + "(\\d+[.,]?\\d*) دنوں پہلے" ], "\\1 hour ago": [ - "(\\d+) گھنٹہ پہلے", - "(\\d+) گھنٹے پہلے" + "(\\d+[.,]?\\d*) گھنٹہ پہلے", + "(\\d+[.,]?\\d*) گھنٹے پہلے" ], "\\1 minute ago": [ - "(\\d+) منٹ پہلے" + "(\\d+[.,]?\\d*) منٹ پہلے" ], "\\1 month ago": [ - "(\\d+) ماہ قبل", - "(\\d+) ماہ پہلے", - "(\\d+) مہینہ پہلے", - "(\\d+) مہینے پہلے" + "(\\d+[.,]?\\d*) ماہ قبل", + "(\\d+[.,]?\\d*) ماہ پہلے", + "(\\d+[.,]?\\d*) مہینہ پہلے", + "(\\d+[.,]?\\d*) مہینے پہلے" ], "\\1 second ago": [ - "(\\d+) سیکنڈ پہلے" + "(\\d+[.,]?\\d*) سیکنڈ پہلے" ], "\\1 week ago": [ - "(\\d+) ہفتہ پہلے", - "(\\d+) ہفتے پہلے" + "(\\d+[.,]?\\d*) ہفتہ پہلے", + "(\\d+[.,]?\\d*) ہفتے پہلے" ], "\\1 year ago": [ - "(\\d+) سال پہلے" + "(\\d+[.,]?\\d*) سال پہلے" ], "in \\1 day": [ - "(\\d+) دن میں", - "(\\d+) دنوں میں" + "(\\d+[.,]?\\d*) دن میں", + "(\\d+[.,]?\\d*) دنوں میں" ], "in \\1 hour": [ - "(\\d+) گھنٹوں میں", - "(\\d+) گھنٹہ میں", - "(\\d+) گھنٹے میں" + "(\\d+[.,]?\\d*) گھنٹوں میں", + "(\\d+[.,]?\\d*) گھنٹہ میں", + "(\\d+[.,]?\\d*) گھنٹے میں" ], "in \\1 minute": [ - "(\\d+) منٹ میں" + "(\\d+[.,]?\\d*) منٹ میں" ], "in \\1 month": [ - "(\\d+) ماہ میں", - "(\\d+) مہینہ میں", - "(\\d+) مہینے میں" + "(\\d+[.,]?\\d*) ماہ میں", + "(\\d+[.,]?\\d*) مہینہ میں", + "(\\d+[.,]?\\d*) مہینے میں" ], "in \\1 second": [ - "(\\d+) سیکنڈ میں" + "(\\d+[.,]?\\d*) سیکنڈ میں" ], "in \\1 week": [ - "(\\d+) ہفتہ میں", - "(\\d+) ہفتے میں" + "(\\d+[.,]?\\d*) ہفتہ میں", + "(\\d+[.,]?\\d*) ہفتے میں" ], "in \\1 year": [ - "(\\d+) سال میں" + "(\\d+[.,]?\\d*) سال میں" ] }, "locale_specific": { @@ -211,30 +211,30 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) دن قبل" + "(\\d+[.,]?\\d*) دن قبل" ], "\\1 hour ago": [ - "(\\d+) گھنٹہ قبل", - "(\\d+) گھنٹے قبل" + "(\\d+[.,]?\\d*) گھنٹہ قبل", + "(\\d+[.,]?\\d*) گھنٹے قبل" ], "\\1 minute ago": [ - "(\\d+) منٹ قبل" + "(\\d+[.,]?\\d*) منٹ قبل" ], "\\1 second ago": [ - "(\\d+) سیکنڈ قبل" + "(\\d+[.,]?\\d*) سیکنڈ قبل" ], "\\1 week ago": [ - "(\\d+) ہفتہ قبل", - "(\\d+) ہفتے قبل" + "(\\d+[.,]?\\d*) ہفتہ قبل", + "(\\d+[.,]?\\d*) ہفتے قبل" ], "\\1 year ago": [ - "(\\d+) سالوں پہلے" + "(\\d+[.,]?\\d*) سالوں پہلے" ], "in \\1 week": [ - "(\\d+) ہفتوں میں" + "(\\d+[.,]?\\d*) ہفتوں میں" ], "in \\1 year": [ - "(\\d+) سالوں میں" + "(\\d+[.,]?\\d*) سالوں میں" ] } } diff --git a/dateparser/data/date_translation_data/uz-Cyrl.py b/dateparser/data/date_translation_data/uz-Cyrl.py index d2fceeac3..44c3d0974 100644 --- a/dateparser/data/date_translation_data/uz-Cyrl.py +++ b/dateparser/data/date_translation_data/uz-Cyrl.py @@ -150,46 +150,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) кун олдин" + "(\\d+[.,]?\\d*) кун олдин" ], "\\1 hour ago": [ - "(\\d+) соат олдин" + "(\\d+[.,]?\\d*) соат олдин" ], "\\1 minute ago": [ - "(\\d+) дақиқа олдин" + "(\\d+[.,]?\\d*) дақиқа олдин" ], "\\1 month ago": [ - "(\\d+) ой аввал" + "(\\d+[.,]?\\d*) ой аввал" ], "\\1 second ago": [ - "(\\d+) сония олдин" + "(\\d+[.,]?\\d*) сония олдин" ], "\\1 week ago": [ - "(\\d+) ҳафта олдин" + "(\\d+[.,]?\\d*) ҳафта олдин" ], "\\1 year ago": [ - "(\\d+) йил аввал" + "(\\d+[.,]?\\d*) йил аввал" ], "in \\1 day": [ - "(\\d+) кундан сўнг" + "(\\d+[.,]?\\d*) кундан сўнг" ], "in \\1 hour": [ - "(\\d+) соатдан сўнг" + "(\\d+[.,]?\\d*) соатдан сўнг" ], "in \\1 minute": [ - "(\\d+) дақиқадан сўнг" + "(\\d+[.,]?\\d*) дақиқадан сўнг" ], "in \\1 month": [ - "(\\d+) ойдан сўнг" + "(\\d+[.,]?\\d*) ойдан сўнг" ], "in \\1 second": [ - "(\\d+) сониядан сўнг" + "(\\d+[.,]?\\d*) сониядан сўнг" ], "in \\1 week": [ - "(\\d+) ҳафтадан сўнг" + "(\\d+[.,]?\\d*) ҳафтадан сўнг" ], "in \\1 year": [ - "(\\d+) йилдан сўнг" + "(\\d+[.,]?\\d*) йилдан сўнг" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/uz-Latn.py b/dateparser/data/date_translation_data/uz-Latn.py index 002d36484..5435fafa0 100644 --- a/dateparser/data/date_translation_data/uz-Latn.py +++ b/dateparser/data/date_translation_data/uz-Latn.py @@ -156,46 +156,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) kun oldin" + "(\\d+[.,]?\\d*) kun oldin" ], "\\1 hour ago": [ - "(\\d+) soat oldin" + "(\\d+[.,]?\\d*) soat oldin" ], "\\1 minute ago": [ - "(\\d+) daqiqa oldin" + "(\\d+[.,]?\\d*) daqiqa oldin" ], "\\1 month ago": [ - "(\\d+) oy oldin" + "(\\d+[.,]?\\d*) oy oldin" ], "\\1 second ago": [ - "(\\d+) soniya oldin" + "(\\d+[.,]?\\d*) soniya oldin" ], "\\1 week ago": [ - "(\\d+) hafta oldin" + "(\\d+[.,]?\\d*) hafta oldin" ], "\\1 year ago": [ - "(\\d+) yil oldin" + "(\\d+[.,]?\\d*) yil oldin" ], "in \\1 day": [ - "(\\d+) kundan keyin" + "(\\d+[.,]?\\d*) kundan keyin" ], "in \\1 hour": [ - "(\\d+) soatdan keyin" + "(\\d+[.,]?\\d*) soatdan keyin" ], "in \\1 minute": [ - "(\\d+) daqiqadan keyin" + "(\\d+[.,]?\\d*) daqiqadan keyin" ], "in \\1 month": [ - "(\\d+) oydan keyin" + "(\\d+[.,]?\\d*) oydan keyin" ], "in \\1 second": [ - "(\\d+) soniyadan keyin" + "(\\d+[.,]?\\d*) soniyadan keyin" ], "in \\1 week": [ - "(\\d+) haftadan keyin" + "(\\d+[.,]?\\d*) haftadan keyin" ], "in \\1 year": [ - "(\\d+) yildan keyin" + "(\\d+[.,]?\\d*) yildan keyin" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/uz.py b/dateparser/data/date_translation_data/uz.py index 028a4fc82..488e9cbdf 100644 --- a/dateparser/data/date_translation_data/uz.py +++ b/dateparser/data/date_translation_data/uz.py @@ -156,46 +156,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) kun oldin" + "(\\d+[.,]?\\d*) kun oldin" ], "\\1 hour ago": [ - "(\\d+) soat oldin" + "(\\d+[.,]?\\d*) soat oldin" ], "\\1 minute ago": [ - "(\\d+) daqiqa oldin" + "(\\d+[.,]?\\d*) daqiqa oldin" ], "\\1 month ago": [ - "(\\d+) oy oldin" + "(\\d+[.,]?\\d*) oy oldin" ], "\\1 second ago": [ - "(\\d+) soniya oldin" + "(\\d+[.,]?\\d*) soniya oldin" ], "\\1 week ago": [ - "(\\d+) hafta oldin" + "(\\d+[.,]?\\d*) hafta oldin" ], "\\1 year ago": [ - "(\\d+) yil oldin" + "(\\d+[.,]?\\d*) yil oldin" ], "in \\1 day": [ - "(\\d+) kundan keyin" + "(\\d+[.,]?\\d*) kundan keyin" ], "in \\1 hour": [ - "(\\d+) soatdan keyin" + "(\\d+[.,]?\\d*) soatdan keyin" ], "in \\1 minute": [ - "(\\d+) daqiqadan keyin" + "(\\d+[.,]?\\d*) daqiqadan keyin" ], "in \\1 month": [ - "(\\d+) oydan keyin" + "(\\d+[.,]?\\d*) oydan keyin" ], "in \\1 second": [ - "(\\d+) soniyadan keyin" + "(\\d+[.,]?\\d*) soniyadan keyin" ], "in \\1 week": [ - "(\\d+) haftadan keyin" + "(\\d+[.,]?\\d*) haftadan keyin" ], "in \\1 year": [ - "(\\d+) yildan keyin" + "(\\d+[.,]?\\d*) yildan keyin" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/vi.py b/dateparser/data/date_translation_data/vi.py index 6c1dd4362..10cfd5b94 100644 --- a/dateparser/data/date_translation_data/vi.py +++ b/dateparser/data/date_translation_data/vi.py @@ -182,46 +182,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) ngày trước" + "(\\d+[.,]?\\d*) ngày trước" ], "\\1 hour ago": [ - "(\\d+) giờ trước" + "(\\d+[.,]?\\d*) giờ trước" ], "\\1 minute ago": [ - "(\\d+) phút trước" + "(\\d+[.,]?\\d*) phút trước" ], "\\1 month ago": [ - "(\\d+) tháng trước" + "(\\d+[.,]?\\d*) tháng trước" ], "\\1 second ago": [ - "(\\d+) giây trước" + "(\\d+[.,]?\\d*) giây trước" ], "\\1 week ago": [ - "(\\d+) tuần trước" + "(\\d+[.,]?\\d*) tuần trước" ], "\\1 year ago": [ - "(\\d+) năm trước" + "(\\d+[.,]?\\d*) năm trước" ], "in \\1 day": [ - "sau (\\d+) ngày nữa" + "sau (\\d+[.,]?\\d*) ngày nữa" ], "in \\1 hour": [ - "sau (\\d+) giờ nữa" + "sau (\\d+[.,]?\\d*) giờ nữa" ], "in \\1 minute": [ - "sau (\\d+) phút nữa" + "sau (\\d+[.,]?\\d*) phút nữa" ], "in \\1 month": [ - "sau (\\d+) tháng nữa" + "sau (\\d+[.,]?\\d*) tháng nữa" ], "in \\1 second": [ - "sau (\\d+) giây nữa" + "sau (\\d+[.,]?\\d*) giây nữa" ], "in \\1 week": [ - "sau (\\d+) tuần nữa" + "sau (\\d+[.,]?\\d*) tuần nữa" ], "in \\1 year": [ - "sau (\\d+) năm nữa" + "sau (\\d+[.,]?\\d*) năm nữa" ] }, "locale_specific": {}, @@ -240,7 +240,7 @@ ], "simplifications": [ { - "(?:ngày|năm)\\s(\\d+)": "\\1" + "(?:ngày|năm)\\s(\\d+[.,]?\\d*)": "\\1" } ], "skip": [ diff --git a/dateparser/data/date_translation_data/wae.py b/dateparser/data/date_translation_data/wae.py index 9b17a8dd7..e24dd1176 100644 --- a/dateparser/data/date_translation_data/wae.py +++ b/dateparser/data/date_translation_data/wae.py @@ -153,57 +153,57 @@ }, "relative-type-regex": { "\\1 day ago": [ - "vor (\\d+) tag", - "vor (\\d+) täg" + "vor (\\d+[.,]?\\d*) tag", + "vor (\\d+[.,]?\\d*) täg" ], "\\1 hour ago": [ - "vor (\\d+) stund", - "vor (\\d+) stunde" + "vor (\\d+[.,]?\\d*) stund", + "vor (\\d+[.,]?\\d*) stunde" ], "\\1 minute ago": [ - "vor (\\d+) minüta", - "vor (\\d+) minüte" + "vor (\\d+[.,]?\\d*) minüta", + "vor (\\d+[.,]?\\d*) minüte" ], "\\1 month ago": [ - "vor (\\d+) mánet" + "vor (\\d+[.,]?\\d*) mánet" ], "\\1 second ago": [ - "vor (\\d+) sekund", - "vor (\\d+) sekunde" + "vor (\\d+[.,]?\\d*) sekund", + "vor (\\d+[.,]?\\d*) sekunde" ], "\\1 week ago": [ - "cor (\\d+) wučä", - "vor (\\d+) wuča" + "cor (\\d+[.,]?\\d*) wučä", + "vor (\\d+[.,]?\\d*) wuča" ], "\\1 year ago": [ - "cor (\\d+) jár", - "vor (\\d+) jár" + "cor (\\d+[.,]?\\d*) jár", + "vor (\\d+[.,]?\\d*) jár" ], "in \\1 day": [ - "i (\\d+) tag", - "i (\\d+) täg" + "i (\\d+[.,]?\\d*) tag", + "i (\\d+[.,]?\\d*) täg" ], "in \\1 hour": [ - "i (\\d+) stund", - "i (\\d+) stunde" + "i (\\d+[.,]?\\d*) stund", + "i (\\d+[.,]?\\d*) stunde" ], "in \\1 minute": [ - "i (\\d+) minüta", - "i (\\d+) minüte" + "i (\\d+[.,]?\\d*) minüta", + "i (\\d+[.,]?\\d*) minüte" ], "in \\1 month": [ - "i (\\d+) mánet" + "i (\\d+[.,]?\\d*) mánet" ], "in \\1 second": [ - "i (\\d+) sekund", - "i (\\d+) sekunde" + "i (\\d+[.,]?\\d*) sekund", + "i (\\d+[.,]?\\d*) sekunde" ], "in \\1 week": [ - "i (\\d+) wuča", - "i (\\d+) wučä" + "i (\\d+[.,]?\\d*) wuča", + "i (\\d+[.,]?\\d*) wučä" ], "in \\1 year": [ - "i (\\d+) jár" + "i (\\d+[.,]?\\d*) jár" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/yi.py b/dateparser/data/date_translation_data/yi.py index 8e8a22084..6d10a8935 100644 --- a/dateparser/data/date_translation_data/yi.py +++ b/dateparser/data/date_translation_data/yi.py @@ -142,22 +142,22 @@ }, "relative-type-regex": { "\\1 month ago": [ - "פֿאַר (\\d+) חדשים", - "פֿאַר (\\d+) חודש" + "פֿאַר (\\d+[.,]?\\d*) חדשים", + "פֿאַר (\\d+[.,]?\\d*) חודש" ], "\\1 year ago": [ - "פֿאַר (\\d+) יאָר" + "פֿאַר (\\d+[.,]?\\d*) יאָר" ], "in \\1 day": [ - "אין (\\d+) טאָג אַרום", - "אין (\\d+) טעג אַרום" + "אין (\\d+[.,]?\\d*) טאָג אַרום", + "אין (\\d+[.,]?\\d*) טעג אַרום" ], "in \\1 month": [ - "איבער (\\d+) חדשים", - "איבער (\\d+) חודש" + "איבער (\\d+[.,]?\\d*) חדשים", + "איבער (\\d+[.,]?\\d*) חודש" ], "in \\1 year": [ - "איבער (\\d+) יאָר" + "איבער (\\d+[.,]?\\d*) יאָר" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/yue.py b/dateparser/data/date_translation_data/yue.py index 4446be78d..aabf0ec61 100644 --- a/dateparser/data/date_translation_data/yue.py +++ b/dateparser/data/date_translation_data/yue.py @@ -141,46 +141,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) 日前" + "(\\d+[.,]?\\d*) 日前" ], "\\1 hour ago": [ - "(\\d+) 小時前" + "(\\d+[.,]?\\d*) 小時前" ], "\\1 minute ago": [ - "(\\d+) 分鐘前" + "(\\d+[.,]?\\d*) 分鐘前" ], "\\1 month ago": [ - "(\\d+) 個月前" + "(\\d+[.,]?\\d*) 個月前" ], "\\1 second ago": [ - "(\\d+) 秒前" + "(\\d+[.,]?\\d*) 秒前" ], "\\1 week ago": [ - "(\\d+) 個星期前" + "(\\d+[.,]?\\d*) 個星期前" ], "\\1 year ago": [ - "(\\d+) 年前" + "(\\d+[.,]?\\d*) 年前" ], "in \\1 day": [ - "(\\d+) 日後" + "(\\d+[.,]?\\d*) 日後" ], "in \\1 hour": [ - "(\\d+) 小時後" + "(\\d+[.,]?\\d*) 小時後" ], "in \\1 minute": [ - "(\\d+) 分鐘後" + "(\\d+[.,]?\\d*) 分鐘後" ], "in \\1 month": [ - "(\\d+) 個月後" + "(\\d+[.,]?\\d*) 個月後" ], "in \\1 second": [ - "(\\d+) 秒後" + "(\\d+[.,]?\\d*) 秒後" ], "in \\1 week": [ - "(\\d+) 個星期後" + "(\\d+[.,]?\\d*) 個星期後" ], "in \\1 year": [ - "(\\d+) 年後" + "(\\d+[.,]?\\d*) 年後" ] }, "locale_specific": {}, diff --git a/dateparser/data/date_translation_data/zh-Hans.py b/dateparser/data/date_translation_data/zh-Hans.py index 08bb142a0..17470f288 100644 --- a/dateparser/data/date_translation_data/zh-Hans.py +++ b/dateparser/data/date_translation_data/zh-Hans.py @@ -154,48 +154,48 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+)天前" + "(\\d+[.,]?\\d*)天前" ], "\\1 hour ago": [ - "(\\d+)小时前" + "(\\d+[.,]?\\d*)小时前" ], "\\1 minute ago": [ - "(\\d+)分钟前" + "(\\d+[.,]?\\d*)分钟前" ], "\\1 month ago": [ - "(\\d+)个月前" + "(\\d+[.,]?\\d*)个月前" ], "\\1 second ago": [ - "(\\d+)秒前", - "(\\d+)秒钟前" + "(\\d+[.,]?\\d*)秒前", + "(\\d+[.,]?\\d*)秒钟前" ], "\\1 week ago": [ - "(\\d+)周前" + "(\\d+[.,]?\\d*)周前" ], "\\1 year ago": [ - "(\\d+)年前" + "(\\d+[.,]?\\d*)年前" ], "in \\1 day": [ - "(\\d+)天后" + "(\\d+[.,]?\\d*)天后" ], "in \\1 hour": [ - "(\\d+)小时后" + "(\\d+[.,]?\\d*)小时后" ], "in \\1 minute": [ - "(\\d+)分钟后" + "(\\d+[.,]?\\d*)分钟后" ], "in \\1 month": [ - "(\\d+)个月后" + "(\\d+[.,]?\\d*)个月后" ], "in \\1 second": [ - "(\\d+)秒后", - "(\\d+)秒钟后" + "(\\d+[.,]?\\d*)秒后", + "(\\d+[.,]?\\d*)秒钟后" ], "in \\1 week": [ - "(\\d+)周后" + "(\\d+[.,]?\\d*)周后" ], "in \\1 year": [ - "(\\d+)年后" + "(\\d+[.,]?\\d*)年后" ] }, "locale_specific": { diff --git a/dateparser/data/date_translation_data/zh-Hant.py b/dateparser/data/date_translation_data/zh-Hant.py index 12a0ff3d5..9a51ecd32 100644 --- a/dateparser/data/date_translation_data/zh-Hant.py +++ b/dateparser/data/date_translation_data/zh-Hant.py @@ -141,46 +141,46 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) 天前" + "(\\d+[.,]?\\d*) 天前" ], "\\1 hour ago": [ - "(\\d+) 小時前" + "(\\d+[.,]?\\d*) 小時前" ], "\\1 minute ago": [ - "(\\d+) 分鐘前" + "(\\d+[.,]?\\d*) 分鐘前" ], "\\1 month ago": [ - "(\\d+) 個月前" + "(\\d+[.,]?\\d*) 個月前" ], "\\1 second ago": [ - "(\\d+) 秒前" + "(\\d+[.,]?\\d*) 秒前" ], "\\1 week ago": [ - "(\\d+) 週前" + "(\\d+[.,]?\\d*) 週前" ], "\\1 year ago": [ - "(\\d+) 年前" + "(\\d+[.,]?\\d*) 年前" ], "in \\1 day": [ - "(\\d+) 天後" + "(\\d+[.,]?\\d*) 天後" ], "in \\1 hour": [ - "(\\d+) 小時後" + "(\\d+[.,]?\\d*) 小時後" ], "in \\1 minute": [ - "(\\d+) 分鐘後" + "(\\d+[.,]?\\d*) 分鐘後" ], "in \\1 month": [ - "(\\d+) 個月後" + "(\\d+[.,]?\\d*) 個月後" ], "in \\1 second": [ - "(\\d+) 秒後" + "(\\d+[.,]?\\d*) 秒後" ], "in \\1 week": [ - "(\\d+) 週後" + "(\\d+[.,]?\\d*) 週後" ], "in \\1 year": [ - "(\\d+) 年後" + "(\\d+[.,]?\\d*) 年後" ] }, "locale_specific": { @@ -236,50 +236,50 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) 日前", - "(\\d+)日前" + "(\\d+[.,]?\\d*) 日前", + "(\\d+[.,]?\\d*)日前" ], "\\1 hour ago": [ - "(\\d+)小時前" + "(\\d+[.,]?\\d*)小時前" ], "\\1 minute ago": [ - "(\\d+)分前" + "(\\d+[.,]?\\d*)分前" ], "\\1 month ago": [ - "(\\d+)個月前" + "(\\d+[.,]?\\d*)個月前" ], "\\1 second ago": [ - "(\\d+)秒前" + "(\\d+[.,]?\\d*)秒前" ], "\\1 week ago": [ - "(\\d+) 星期前", - "(\\d+)週前" + "(\\d+[.,]?\\d*) 星期前", + "(\\d+[.,]?\\d*)週前" ], "\\1 year ago": [ - "(\\d+)年前" + "(\\d+[.,]?\\d*)年前" ], "in \\1 day": [ - "(\\d+) 日後", - "(\\d+)日後" + "(\\d+[.,]?\\d*) 日後", + "(\\d+[.,]?\\d*)日後" ], "in \\1 hour": [ - "(\\d+)小時後" + "(\\d+[.,]?\\d*)小時後" ], "in \\1 minute": [ - "(\\d+)分後" + "(\\d+[.,]?\\d*)分後" ], "in \\1 month": [ - "(\\d+)個月後" + "(\\d+[.,]?\\d*)個月後" ], "in \\1 second": [ - "(\\d+)秒後" + "(\\d+[.,]?\\d*)秒後" ], "in \\1 week": [ - "(\\d+) 星期後", - "(\\d+)週後" + "(\\d+[.,]?\\d*) 星期後", + "(\\d+[.,]?\\d*)週後" ], "in \\1 year": [ - "(\\d+)年後" + "(\\d+[.,]?\\d*)年後" ] } }, @@ -335,50 +335,50 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) 日前", - "(\\d+)日前" + "(\\d+[.,]?\\d*) 日前", + "(\\d+[.,]?\\d*)日前" ], "\\1 hour ago": [ - "(\\d+)小時前" + "(\\d+[.,]?\\d*)小時前" ], "\\1 minute ago": [ - "(\\d+)分前" + "(\\d+[.,]?\\d*)分前" ], "\\1 month ago": [ - "(\\d+)個月前" + "(\\d+[.,]?\\d*)個月前" ], "\\1 second ago": [ - "(\\d+)秒前" + "(\\d+[.,]?\\d*)秒前" ], "\\1 week ago": [ - "(\\d+) 星期前", - "(\\d+)週前" + "(\\d+[.,]?\\d*) 星期前", + "(\\d+[.,]?\\d*)週前" ], "\\1 year ago": [ - "(\\d+)年前" + "(\\d+[.,]?\\d*)年前" ], "in \\1 day": [ - "(\\d+) 日後", - "(\\d+)日後" + "(\\d+[.,]?\\d*) 日後", + "(\\d+[.,]?\\d*)日後" ], "in \\1 hour": [ - "(\\d+)小時後" + "(\\d+[.,]?\\d*)小時後" ], "in \\1 minute": [ - "(\\d+)分後" + "(\\d+[.,]?\\d*)分後" ], "in \\1 month": [ - "(\\d+)個月後" + "(\\d+[.,]?\\d*)個月後" ], "in \\1 second": [ - "(\\d+)秒後" + "(\\d+[.,]?\\d*)秒後" ], "in \\1 week": [ - "(\\d+) 星期後", - "(\\d+)週後" + "(\\d+[.,]?\\d*) 星期後", + "(\\d+[.,]?\\d*)週後" ], "in \\1 year": [ - "(\\d+)年後" + "(\\d+[.,]?\\d*)年後" ] } } diff --git a/dateparser/data/date_translation_data/zh.py b/dateparser/data/date_translation_data/zh.py index 81f39dc50..f027f106f 100644 --- a/dateparser/data/date_translation_data/zh.py +++ b/dateparser/data/date_translation_data/zh.py @@ -171,48 +171,48 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+)天前" + "(\\d+[.,]?\\d*)天前" ], "\\1 hour ago": [ - "(\\d+)小时前" + "(\\d+[.,]?\\d*)小时前" ], "\\1 minute ago": [ - "(\\d+)分钟前" + "(\\d+[.,]?\\d*)分钟前" ], "\\1 month ago": [ - "(\\d+)个月前" + "(\\d+[.,]?\\d*)个月前" ], "\\1 second ago": [ - "(\\d+)秒前", - "(\\d+)秒钟前" + "(\\d+[.,]?\\d*)秒前", + "(\\d+[.,]?\\d*)秒钟前" ], "\\1 week ago": [ - "(\\d+)周前" + "(\\d+[.,]?\\d*)周前" ], "\\1 year ago": [ - "(\\d+)年前" + "(\\d+[.,]?\\d*)年前" ], "in \\1 day": [ - "(\\d+)天后" + "(\\d+[.,]?\\d*)天后" ], "in \\1 hour": [ - "(\\d+)小时后" + "(\\d+[.,]?\\d*)小时后" ], "in \\1 minute": [ - "(\\d+)分钟后" + "(\\d+[.,]?\\d*)分钟后" ], "in \\1 month": [ - "(\\d+)个月后" + "(\\d+[.,]?\\d*)个月后" ], "in \\1 second": [ - "(\\d+)秒后", - "(\\d+)秒钟后" + "(\\d+[.,]?\\d*)秒后", + "(\\d+[.,]?\\d*)秒钟后" ], "in \\1 week": [ - "(\\d+)周后" + "(\\d+[.,]?\\d*)周后" ], "in \\1 year": [ - "(\\d+)年后" + "(\\d+[.,]?\\d*)年后" ] }, "locale_specific": {}, @@ -244,25 +244,25 @@ "半小时前": "30分前" }, { - "(?:中午|下午|(?:晚上?))(?:\\s*)(\\d+)(?:\\s*):(?:\\s+|:)?(\\d+)": "\\1:\\2 pm" + "(?:中午|下午|(?:晚上?))(?:\\s*)(\\d+[.,]?\\d*)(?:\\s*):(?:\\s+|:)?(\\d+[.,]?\\d*)": "\\1:\\2 pm" }, { - "(?:上午|早上|凌晨)(?:\\s*)(\\d+)(?:\\s*):(?:\\s+|:)?(\\d+)": "\\1:\\2 am" + "(?:上午|早上|凌晨)(?:\\s*)(\\d+[.,]?\\d*)(?:\\s*):(?:\\s+|:)?(\\d+[.,]?\\d*)": "\\1:\\2 am" }, { "中午": "12:00" }, { - "(\\d+)年(?:\\s+)?(\\d+)月(?:\\s+)?(\\d+)日(?:\\s+)?(\\d+)时(?:\\s+)?(\\d+)分": "\\1-\\2-\\3 \\4:\\5" + "(\\d+[.,]?\\d*)年(?:\\s+)?(\\d+[.,]?\\d*)月(?:\\s+)?(\\d+[.,]?\\d*)日(?:\\s+)?(\\d+[.,]?\\d*)时(?:\\s+)?(\\d+[.,]?\\d*)分": "\\1-\\2-\\3 \\4:\\5" }, { - "(\\d+)年(?:\\s+)?(\\d+)月(?:\\s+)?(\\d{1,2})(?:日)?(?:\\s+)?(\\d{1,2})(?:点|:)(\\d{1,2})": "\\1-\\2-\\3 \\4:\\5" + "(\\d+[.,]?\\d*)年(?:\\s+)?(\\d+[.,]?\\d*)月(?:\\s+)?(\\d{1,2})(?:日)?(?:\\s+)?(\\d{1,2})(?:点|:)(\\d{1,2})": "\\1-\\2-\\3 \\4:\\5" }, { - "(\\d+)年(?:\\s+)?(\\d+)月(?:\\s+)?(\\d{1,2})(?:日)?": "\\1-\\2-\\3" + "(\\d+[.,]?\\d*)年(?:\\s+)?(\\d+[.,]?\\d*)月(?:\\s+)?(\\d{1,2})(?:日)?": "\\1-\\2-\\3" }, { - "(\\d+)月(?=.*[前后])": "\\1 月" + "(\\d+[.,]?\\d*)月(?=.*[前后])": "\\1 月" } ] } diff --git a/dateparser/data/date_translation_data/zu.py b/dateparser/data/date_translation_data/zu.py index 3df73fae8..5c6c8d931 100644 --- a/dateparser/data/date_translation_data/zu.py +++ b/dateparser/data/date_translation_data/zu.py @@ -154,28 +154,28 @@ }, "relative-type-regex": { "\\1 day ago": [ - "(\\d+) izinsuku ezedlule", - "(\\d+) usuku olwedlule" + "(\\d+[.,]?\\d*) izinsuku ezedlule", + "(\\d+[.,]?\\d*) usuku olwedlule" ], "\\1 hour ago": [ - "(\\d+) amahora edlule", - "(\\d+) ihora eledlule" + "(\\d+[.,]?\\d*) amahora edlule", + "(\\d+[.,]?\\d*) ihora eledlule" ], "\\1 minute ago": [ - "(\\d+) amaminithi edlule", - "(\\d+) iminithi eledlule" + "(\\d+[.,]?\\d*) amaminithi edlule", + "(\\d+[.,]?\\d*) iminithi eledlule" ], "\\1 month ago": [ - "(\\d+) inyanga edlule", - "(\\d+) izinyanga ezedlule" + "(\\d+[.,]?\\d*) inyanga edlule", + "(\\d+[.,]?\\d*) izinyanga ezedlule" ], "\\1 second ago": [ - "(\\d+) amasekhondi edlule", - "(\\d+) isekhondi eledlule" + "(\\d+[.,]?\\d*) amasekhondi edlule", + "(\\d+[.,]?\\d*) isekhondi eledlule" ], "\\1 year ago": [ - "(\\d+) iminyaka edlule", - "(\\d+) unyaka odlule" + "(\\d+[.,]?\\d*) iminyaka edlule", + "(\\d+[.,]?\\d*) unyaka odlule" ] }, "locale_specific": {}, diff --git a/dateparser/date.py b/dateparser/date.py index 1b68b4a6c..5bd269440 100644 --- a/dateparser/date.py +++ b/dateparser/date.py @@ -37,6 +37,7 @@ RE_SANITIZE_SKIP = re.compile(r'\t|\n|\r|\u00bb|,\s\u0432\b|\u200e|\xb7|\u200f|\u064e|\u064f', flags=re.M) RE_SANITIZE_RUSSIAN = re.compile(r'([\W\d])\u0433\.', flags=re.I | re.U) +RE_SANITIZE_CROATIAN = re.compile(r'(\d+)\.\s?(\d+)\.\s?(\d+)\.( u)?', flags=re.I | re.U) RE_SANITIZE_PERIOD = re.compile(r'(?<=[^0-9\s])\.', flags=re.U) RE_SANITIZE_ON = re.compile(r'^.*?on:\s+(.*)') RE_SANITIZE_APOSTROPHE = re.compile('|'.join(APOSTROPHE_LOOK_ALIKE_CHARS)) @@ -106,6 +107,7 @@ def get_intersecting_periods(low, high, period='day'): def sanitize_date(date_string): date_string = RE_SANITIZE_SKIP.sub(' ', date_string) date_string = RE_SANITIZE_RUSSIAN.sub(r'\1 ', date_string) # remove 'г.' (Russian for year) but not in words + date_string = RE_SANITIZE_CROATIAN.sub(r'\1.\2.\3 ', date_string) # extra '.' and 'u' interferes with parsing relative fractional dates date_string = sanitize_spaces(date_string) date_string = RE_SANITIZE_PERIOD.sub('', date_string) date_string = RE_SANITIZE_ON.sub(r'\1', date_string) diff --git a/dateparser/freshness_date_parser.py b/dateparser/freshness_date_parser.py index 4a64f4ce5..36ce40e50 100644 --- a/dateparser/freshness_date_parser.py +++ b/dateparser/freshness_date_parser.py @@ -11,7 +11,7 @@ _UNITS = r'decade|year|month|week|day|hour|minute|second' -PATTERN = re.compile(r'(\d+)\s*(%s)\b' % _UNITS, re.I | re.S | re.U) +PATTERN = re.compile(r'(\d+[.,]?\d*)\s*(%s)\b' % _UNITS, re.I | re.S | re.U) class FreshnessDateDataParser: @@ -144,7 +144,7 @@ def get_kwargs(self, date_string): kwargs = {} for num, unit in m: - kwargs[unit + 's'] = int(num) + kwargs[unit + 's'] = float(num.replace(",", ".")) if 'decades' in kwargs: kwargs['years'] = 10 * kwargs['decades'] + kwargs.get('years', 0) del kwargs['decades'] diff --git a/dateparser_data/supplementary_language_data/date_translation_data/be.yaml b/dateparser_data/supplementary_language_data/date_translation_data/be.yaml index b55fdab24..fba72dd8f 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/be.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/be.yaml @@ -89,4 +89,4 @@ simplifications: - ^секунду: 1 секунду - некалькі секунд: 44 секунды - некалькі хвілін: 2 хвіліны - - (\d+)\s*гадзін\s(\d+)\s*хвілін: \1:\2 + - (\d+[.,]?\d*)\s*гадзін\s(\d+[.,]?\d*)\s*хвілін: \1:\2 diff --git a/dateparser_data/supplementary_language_data/date_translation_data/da.yaml b/dateparser_data/supplementary_language_data/date_translation_data/da.yaml index fc75362ee..9d8dbcea4 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/da.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/da.yaml @@ -22,22 +22,22 @@ in: relative-type-regex: \1 hour ago: - - for (\d+)\s*h - - for (\d+) timer + - for (\d+[.,]?\d*)\s*h + - for (\d+[.,]?\d*) timer \1 minute ago: - - for (\d+)\s*m - - for (\d+) minutter + - for (\d+[.,]?\d*)\s*m + - for (\d+[.,]?\d*) minutter \1 second ago: - - for (\d+)\s*s - - for (\d+) sekunder + - for (\d+[.,]?\d*)\s*s + - for (\d+[.,]?\d*) sekunder simplifications: - en: '1' - et: '1' - - (\d+)\s*hr(s?): \1 time\2 - - (\d+)\s*min(s?): \1 minut\2 - - (\d+)\s*sec(s?): \1 sekund\2 + - (\d+[.,]?\d*)\s*hr(s?): \1 time\2 + - (\d+[.,]?\d*)\s*min(s?): \1 minut\2 + - (\d+[.,]?\d*)\s*sec(s?): \1 sekund\2 - middag: '12:00' - midnat: '00:00' - - (\d+)h(\d+)m?: \1:\2 + - (\d+[.,]?\d*)h(\d+[.,]?\d*)m?: \1:\2 - mindre end 1 minut siden: 45 seconds diff --git a/dateparser_data/supplementary_language_data/date_translation_data/de.yaml b/dateparser_data/supplementary_language_data/date_translation_data/de.yaml index bf9b8f185..945faca74 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/de.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/de.yaml @@ -56,11 +56,11 @@ relative-type: relative-type-regex: \1 hour ago: - - vor (\d+)\s*h + - vor (\d+[.,]?\d*)\s*h \1 minute ago: - - vor (\d+)\s*m + - vor (\d+[.,]?\d*)\s*m \1 second ago: - - vor (\d+)\s*s + - vor (\d+[.,]?\d*)\s*s simplifications: - einer: '1' diff --git a/dateparser_data/supplementary_language_data/date_translation_data/en.yaml b/dateparser_data/supplementary_language_data/date_translation_data/en.yaml index 600cf325c..c6e94d1a3 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/en.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/en.yaml @@ -50,16 +50,16 @@ relative-type: relative-type-regex: in \1 decade: - - in (\d+) decades? + - in (\d+[.,]?\d*) decades? \1 decade ago: - - (\d+) decades? ago + - (\d+[.,]?\d*) decades? ago simplifications: - an: '1' - a: '1' - (?:12\s+)?noon: '12:00' - (?:12\s+)?midnight: '00:00' - - (\d+)h(\d+)m?: \1:\2 + - (\d+[.,]?\d*)h(\d+[.,]?\d*)m?: \1:\2 - (?<=from\s+)now: in - less than 1 minute ago: 45 second ago - one: '1' diff --git a/dateparser_data/supplementary_language_data/date_translation_data/fi.yaml b/dateparser_data/supplementary_language_data/date_translation_data/fi.yaml index a71d00e38..71e5fd24f 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/fi.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/fi.yaml @@ -75,4 +75,4 @@ relative-type: - toissa päivänä simplifications: - - (\d+) (sekunnin|sekuntin|minuutin|tunnin|päivän|viikon|kuukauden|vuoden) (päästä|kuluttua): \3 \1 \2 + - (\d+[.,]?\d*) (sekunnin|sekuntin|minuutin|tunnin|päivän|viikon|kuukauden|vuoden) (päästä|kuluttua): \3 \1 \2 diff --git a/dateparser_data/supplementary_language_data/date_translation_data/fr.yaml b/dateparser_data/supplementary_language_data/date_translation_data/fr.yaml index 868c07a3e..6e469ee5c 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/fr.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/fr.yaml @@ -63,12 +63,12 @@ simplifications: - d'un: '1' - une: '1' - un: '1' - - (\d+)\s+h\s+(\d+)\s+min: \1h\2m - - (\d+)h(\d+)m?: \1:\2 - - moins\s(?:de\s)?(\d+)\s?(minute|seconde|heure): \1 \2 - - moins\s(?:de\s)?(\d+)\s?s: \1 seconde - - moins\s(?:de\s)?(\d+)\s?m: \1 minute - - moins\s(?:de\s)?(\d+)\s?h: \1 heure + - (\d+[.,]?\d*)\s+h\s+(\d+[.,]?\d*)\s+min: \1h\2m + - (\d+[.,]?\d*)h(\d+[.,]?\d*)m?: \1:\2 + - moins\s(?:de\s)?(\d+[.,]?\d*)\s?(minute|seconde|heure): \1 \2 + - moins\s(?:de\s)?(\d+[.,]?\d*)\s?s: \1 seconde + - moins\s(?:de\s)?(\d+[.,]?\d*)\s?m: \1 minute + - moins\s(?:de\s)?(\d+[.,]?\d*)\s?h: \1 heure - deux: '2' - trois: '3' - quatre: '4' diff --git a/dateparser_data/supplementary_language_data/date_translation_data/hr.yaml b/dateparser_data/supplementary_language_data/date_translation_data/hr.yaml index 750d63b6c..1749baffd 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/hr.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/hr.yaml @@ -113,32 +113,32 @@ relative-type: relative-type-regex: \1 year ago: - - prije (\d+) godine + - prije (\d+[.,]?\d*) godine \1 month ago: - - prije (\d+) mjeseca + - prije (\d+[.,]?\d*) mjeseca \1 week ago: - - prije (\d+) tjedna + - prije (\d+[.,]?\d*) tjedna \1 hour ago: - - prije (\d+) sata + - prije (\d+[.,]?\d*) sata \1 minute ago: - - prije (\d+) minute + - prije (\d+[.,]?\d*) minute \1 second ago: - - prije (\d+) sekunde - - prije (\d+) sekundu + - prije (\d+[.,]?\d*) sekunde + - prije (\d+[.,]?\d*) sekundu in \1 year: - - za (\d+) godine + - za (\d+[.,]?\d*) godine in \1 month: - - za (\d+) mjeseca + - za (\d+[.,]?\d*) mjeseca in \1 week: - - za (\d+) tjedna + - za (\d+[.,]?\d*) tjedna in \1 hour: - - za (\d+) sata + - za (\d+[.,]?\d*) sata in \1 minute: - - za (\d+) minute + - za (\d+[.,]?\d*) minute in \1 second: - - za (\d+) sekunde - - za (\d+) sekundu + - za (\d+[.,]?\d*) sekunde + - za (\d+[.,]?\d*) sekundu simplifications: - podne: '12:00' diff --git a/dateparser_data/supplementary_language_data/date_translation_data/it.yaml b/dateparser_data/supplementary_language_data/date_translation_data/it.yaml index 2babc01f2..100f41217 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/it.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/it.yaml @@ -27,4 +27,4 @@ relative-type: - altro ieri simplifications: - - (\d+)\s+ora: \1 ore + - (\d+[.,]?\d*)\s+ora: \1 ore diff --git a/dateparser_data/supplementary_language_data/date_translation_data/ja.yaml b/dateparser_data/supplementary_language_data/date_translation_data/ja.yaml index 820004d79..02b0a9415 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/ja.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/ja.yaml @@ -75,8 +75,8 @@ relative-type: - 去年 simplifications: - - (\d+)年(?:\s+)?(\d+)月(?:\s+)?(\d+)日: \1-\2-\3 - - (\d+)月(?:\s+)?(\d+)日: \1-\2 - - (\d+)時(?:\s+)?(\d+)分(?:\s+)?(\d+)秒: \1:\2:\3 - - (\d+)時(?:\s+)?(\d+)分: \1:\2 - - (\d+)時$: \1:00 + - (\d+[.,]?\d*)年(?:\s+)?(\d+[.,]?\d*)月(?:\s+)?(\d+[.,]?\d*)日: \1-\2-\3 + - (\d+[.,]?\d*)月(?:\s+)?(\d+[.,]?\d*)日: \1-\2 + - (\d+[.,]?\d*)時(?:\s+)?(\d+[.,]?\d*)分(?:\s+)?(\d+[.,]?\d*)秒: \1:\2:\3 + - (\d+[.,]?\d*)時(?:\s+)?(\d+[.,]?\d*)分: \1:\2 + - (\d+[.,]?\d*)時$: \1:00 diff --git a/dateparser_data/supplementary_language_data/date_translation_data/nb.yaml b/dateparser_data/supplementary_language_data/date_translation_data/nb.yaml index 821513193..70518b040 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/nb.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/nb.yaml @@ -12,4 +12,4 @@ in: relative-type-regex: \1 day ago: - - for (\d+) dager siden \ No newline at end of file + - for (\d+[.,]?\d*) dager siden \ No newline at end of file diff --git a/dateparser_data/supplementary_language_data/date_translation_data/uk.yaml b/dateparser_data/supplementary_language_data/date_translation_data/uk.yaml index 37ce27295..9bfae097f 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/uk.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/uk.yaml @@ -147,11 +147,11 @@ relative-type: relative-type-regex: \1 hour ago: - - (\d+) година тому + - (\d+[.,]?\d*) година тому \1 minute ago: - - (\d+) хвилина тому + - (\d+[.,]?\d*) хвилина тому \1 second ago: - - (\d+) секунда тому + - (\d+[.,]?\d*) секунда тому simplifications: - од(на|ну|ні|ної|нієї|ин|ній): '1' @@ -185,4 +185,4 @@ simplifications: - кілька секунд: 44 секунди - кілька хвилин: 2 хвилини - опів на: 30 хвилин - - за чверть: 15 хвилин + - за чверть: 15 хвилин \ No newline at end of file diff --git a/dateparser_data/supplementary_language_data/date_translation_data/vi.yaml b/dateparser_data/supplementary_language_data/date_translation_data/vi.yaml index 62ebfbf92..ee4552e69 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/vi.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/vi.yaml @@ -67,4 +67,4 @@ in: - trong simplifications: - - (?:ngày|năm)\s(\d+): \1 + - (?:ngày|năm)\s(\d+[.,]?\d*): \1 diff --git a/dateparser_data/supplementary_language_data/date_translation_data/zh.yaml b/dateparser_data/supplementary_language_data/date_translation_data/zh.yaml index b5c419237..1be0b79ba 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/zh.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/zh.yaml @@ -42,10 +42,10 @@ relative-type: simplifications: - 半小时前: 30分前 - - (?:中午|下午|(?:晚上?))(?:\s*)(\d+)(?:\s*):(?:\s+|:)?(\d+): \1:\2 pm - - (?:上午|早上|凌晨)(?:\s*)(\d+)(?:\s*):(?:\s+|:)?(\d+): \1:\2 am + - (?:中午|下午|(?:晚上?))(?:\s*)(\d+[.,]?\d*)(?:\s*):(?:\s+|:)?(\d+[.,]?\d*): \1:\2 pm + - (?:上午|早上|凌晨)(?:\s*)(\d+[.,]?\d*)(?:\s*):(?:\s+|:)?(\d+[.,]?\d*): \1:\2 am - 中午: '12:00' - - (\d+)年(?:\s+)?(\d+)月(?:\s+)?(\d+)日(?:\s+)?(\d+)时(?:\s+)?(\d+)分: \1-\2-\3 \4:\5 - - (\d+)年(?:\s+)?(\d+)月(?:\s+)?(\d{1,2})(?:日)?(?:\s+)?(\d{1,2})(?:点|:)(\d{1,2}): \1-\2-\3 \4:\5 - - (\d+)年(?:\s+)?(\d+)月(?:\s+)?(\d{1,2})(?:日)?: \1-\2-\3 - - (\d+)月(?=.*[前后]): \1 月 + - (\d+[.,]?\d*)年(?:\s+)?(\d+[.,]?\d*)月(?:\s+)?(\d+[.,]?\d*)日(?:\s+)?(\d+[.,]?\d*)时(?:\s+)?(\d+[.,]?\d*)分: \1-\2-\3 \4:\5 + - (\d+[.,]?\d*)年(?:\s+)?(\d+[.,]?\d*)月(?:\s+)?(\d{1,2})(?:日)?(?:\s+)?(\d{1,2})(?:点|:)(\d{1,2}): \1-\2-\3 \4:\5 + - (\d+[.,]?\d*)年(?:\s+)?(\d+[.,]?\d*)月(?:\s+)?(\d{1,2})(?:日)?: \1-\2-\3 + - (\d+[.,]?\d*)月(?=.*[前后]): \1 月 diff --git a/dateparser_scripts/write_complete_data.py b/dateparser_scripts/write_complete_data.py index dcb4aa520..16572164a 100644 --- a/dateparser_scripts/write_complete_data.py +++ b/dateparser_scripts/write_complete_data.py @@ -28,7 +28,7 @@ def _modify_relative_data(relative_data): modified_relative_data = OrderedDict() for key, value in relative_data.items(): for i, string in enumerate(value): - string = RELATIVE_PATTERN.sub(r'(\\d+)', string) + string = RELATIVE_PATTERN.sub(r'(\\d+[.,]?\\d*)', string) value[i] = string modified_relative_data[key] = value return modified_relative_data diff --git a/tests/test_data.py b/tests/test_data.py index 550e923b3..ad1f2cd1f 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -65,7 +65,7 @@ def is_invalid_relative_regex_mapping(relative_regex_mapping): if '\\1' not in key: return True return not (all([isinstance(x, str) for x in value]) - and all(['(\\d+)' in x for x in value])) + and all(['(\\d+[.,]?\\d*)' in x for x in value])) class TestLocaleInfo(BaseTestCase): diff --git a/tests/test_freshness_date_parser.py b/tests/test_freshness_date_parser.py index 51673485a..bb12303d7 100644 --- a/tests/test_freshness_date_parser.py +++ b/tests/test_freshness_date_parser.py @@ -96,6 +96,10 @@ def test_relative_past_dates_with_time_as_period(self, date_string, ago, period) param('eight months ago', ago={'months': 8}, period='month'), param('six days ago', ago={'days': 6}, period='day'), param('five years ago', ago={'years': 5}, period='year'), + # Fractional units + param('2.5 hours', ago={'hours': 2.5}, period='day'), + param('10.75 minutes', ago={'minutes': 10.75}, period='day'), + param('1.5 days', ago={'days': 1.5}, period='day'), # French dates param("Aujourd'hui", ago={'days': 0}, period='day'), @@ -610,6 +614,10 @@ def test_relative_past_dates(self, date_string, ago, period): ago={'years': 1, 'months': 1, 'weeks': 1, 'days': 1, 'hours': 1, 'minutes': 1}, period='day'), param('just now', ago={'seconds': 0}, period='day'), + # Fractional units + param('2.5 hours', ago={'hours': 2.5}, period='day'), + param('10.75 minutes', ago={'minutes': 10.75}, period='day'), + param('1.5 days', ago={'days': 1.5}, period='day'), # French dates param("Aujourd'hui", ago={'days': 0}, period='day'), @@ -1099,6 +1107,11 @@ def test_normalized_relative_dates(self, date_string, ago, period): in_future={'years': 1, 'months': 1, 'weeks': 1, 'days': 1, 'hours': 1, 'minutes': 1}, period='day'), param('just now', in_future={'seconds': 0}, period='day'), + # Fractional units + param('in 2.5 hours', in_future={'hours': 2.5}, period='day'), + param('in 10.75 minutes', in_future={'minutes': 10.75}, period='day'), + param('in 1.5 days', in_future={'days': 1.5}, period='day'), + param('in 0,5 hours', in_future={'hours': 0.5}, period='day'), # French dates param("Aujourd'hui", in_future={'days': 0}, period='day'), @@ -1620,7 +1633,12 @@ def test_freshness_date_with_timezone_utc_offset(self, date_string, timezone, da param('{} months ago'.format(2008 * 12 + 8), date(1, 10, 4), time(13, 15)), param('1 year, 1 month, 1 week, 1 day, 1 hour and 1 minute ago', date(2009, 4, 26), time(12, 14)), - param('just now', date(2010, 6, 4), time(13, 15)) + param('just now', date(2010, 6, 4), time(13, 15)), + # Fractional units + param('2.5 hours ago', date(2010, 6, 4), time(10, 45)), + param('in 10.75 minutes', date(2010, 6, 4), time(13, 25, 45)), + param('in 1.5 days', date(2010, 6, 6), time(1, 15)), + param('0,5 hours ago', date(2010, 6, 4), time(12, 45)), ]) def test_freshness_date_with_relative_base(self, date_string, date, time): self.given_parser(settings={'RELATIVE_BASE': datetime(2010, 6, 4, 13, 15)})