From bcd1a3ca83c4de71efc3f213226bdc4ff9549f3d Mon Sep 17 00:00:00 2001 From: Vishal Tanwar <30797354+vishaltanwar96@users.noreply.github.com> Date: Mon, 31 Oct 2022 22:06:50 +0530 Subject: [PATCH] add support for text "till date" for language english (#1005) Co-authored-by: Vishal Tanwar --- dateparser/data/date_translation_data/en.py | 3 ++- .../supplementary_language_data/date_translation_data/en.yaml | 2 ++ tests/test_freshness_date_parser.py | 3 +++ tests/test_search.py | 4 +++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dateparser/data/date_translation_data/en.py b/dateparser/data/date_translation_data/en.py index 4ba4a9e23..edbb4ca08 100644 --- a/dateparser/data/date_translation_data/en.py +++ b/dateparser/data/date_translation_data/en.py @@ -126,7 +126,8 @@ ], "relative-type": { "0 day ago": [ - "today" + "today", + "till date" ], "0 hour ago": [ "this hour" 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 c6e94d1a3..31e85333b 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/en.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/en.yaml @@ -47,6 +47,8 @@ relative-type: - this decade in 1 decade: - next decade + 0 day ago: + - till date relative-type-regex: in \1 decade: diff --git a/tests/test_freshness_date_parser.py b/tests/test_freshness_date_parser.py index bb12303d7..8211e22f5 100644 --- a/tests/test_freshness_date_parser.py +++ b/tests/test_freshness_date_parser.py @@ -67,6 +67,7 @@ def test_relative_past_dates_with_time_as_period(self, date_string, ago, period) param('yesterday', ago={'days': 1}, period='day'), param('the day before yesterday', ago={'days': 2}, period='day'), param('today', ago={'days': 0}, period='day'), + param('till date', ago={'days': 0}, period='day'), param('an hour ago', ago={'hours': 1}, period='day'), param('about an hour ago', ago={'hours': 1}, period='day'), param('a day ago', ago={'days': 1}, period='day'), @@ -591,6 +592,7 @@ def test_relative_past_dates(self, date_string, ago, period): param('yesterday', ago={'days': 1}, period='day'), param('the day before yesterday', ago={'days': 2}, period='day'), param('today', ago={'days': 0}, period='day'), + param('till date', ago={'days': 0}, period='day'), param('an hour ago', ago={'hours': 1}, period='day'), param('about an hour ago', ago={'hours': 1}, period='day'), param('a day ago', ago={'days': 1}, period='day'), @@ -1083,6 +1085,7 @@ def test_normalized_relative_dates(self, date_string, ago, period): param('in a decade', in_future={'years': 10}, period='year'), param('tomorrow', in_future={'days': 1}, period='day'), param('today', in_future={'days': 0}, period='day'), + param('till date', in_future={'days': 0}, period='day'), param('in an hour', in_future={'hours': 1}, period='day'), param('in about an hour', in_future={'hours': 1}, period='day'), param('in 1 day', in_future={'days': 1}, period='day'), diff --git a/tests/test_search.py b/tests/test_search.py index 1b0aeea9a..f48b2d6b6 100644 --- a/tests/test_search.py +++ b/tests/test_search.py @@ -302,7 +302,9 @@ def test_search_date_string(self, shortname, datetime_string): [('25th march 2015', datetime.datetime(2015, 3, 25)), ('today', datetime.datetime(2000, 1, 1))], settings={'RELATIVE_BASE': datetime.datetime(2000, 1, 1)}), - + param('en', 'The employee has not submitted their documents till date', + [('till date', datetime.datetime(2000, 1, 1))], + settings={'RELATIVE_BASE': datetime.datetime(2000, 1, 1)}), # Filipino / Tagalog param('tl', 'Maraming namatay sa mga Hapon hanggang sila\'y sumuko noong Agosto 15, 1945.', [('noong Agosto 15, 1945', datetime.datetime(1945, 8, 15, 0, 0))],