From 579406e94336242e5b29fe0f4fccd41d1d64480f Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 9 Jan 2019 18:40:22 -0500 Subject: [PATCH 1/6] Added russian abbreviation weekdays --- .../date_translation_data/ru.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml index b080a17ba..9ad1e90c9 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml @@ -2,13 +2,23 @@ skip: ["в", "во", "и", "около", "примерно"] sentence_splitter_group : 1 +monday: + - Пнд +tuesday: + - Втр wednesday: + - СрД - Среду +thursday: + - Чтв friday: + - Птн - Пятницу saturday: + - Сбт - Субботу sunday: + - Вск - Воскресение february: From 2e669f6d5e634bc5c5cdc296bd849b7fd7f7cfff Mon Sep 17 00:00:00 2001 From: Serhii Abarovskyi Date: Tue, 4 Oct 2022 11:36:45 +0300 Subject: [PATCH 2/6] Adding tests and two letters abbreviation --- dateparser/data/date_translation_data/ru.py | 20 ++++++++++++++++--- .../date_translation_data/ru.yaml | 9 ++++++++- tests/test_date_parser.py | 6 ++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dateparser/data/date_translation_data/ru.py b/dateparser/data/date_translation_data/ru.py index 3fadcd87a..0991ec029 100644 --- a/dateparser/data/date_translation_data/ru.py +++ b/dateparser/data/date_translation_data/ru.py @@ -65,34 +65,48 @@ ], "monday": [ "пн", - "понедельник" + "понедельник", + "Пн", + "Пнд" ], "tuesday": [ "вт", - "вторник" + "вторник", + "Вт", + "Втр" ], "wednesday": [ "ср", "среда", + "Cр", + "Срд", "Среду" ], "thursday": [ "четверг", - "чт" + "чт", + "Чт", + "Чтв" ], "friday": [ "пт", "пятница", + "Пт", + "Птн", "Пятницу" ], "saturday": [ "сб", "суббота", + "Сб", + "Сбт", "Субботу" ], "sunday": [ "воскресенье", "вс", + "Вс", + "Вск", "Воскресение" ], "am": [ diff --git a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml index 9ad1e90c9..e2f21d4c1 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml @@ -3,21 +3,28 @@ skip: ["в", "во", "и", "около", "примерно"] sentence_splitter_group : 1 monday: + - Пн - Пнд tuesday: + - Вт - Втр wednesday: - - СрД + - Cр + - Срд - Среду thursday: + - Чт - Чтв friday: + - Пт - Птн - Пятницу saturday: + - Сб - Сбт - Субботу sunday: + - Вс - Вск - Воскресение diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py index 53c805977..a89f3c48f 100644 --- a/tests/test_date_parser.py +++ b/tests/test_date_parser.py @@ -97,6 +97,12 @@ def setUp(self): param('13 авг. 2005г. 19:13', datetime(2005, 8, 13, 19, 13)), param('13 авг. 2005 г. 19:13', datetime(2005, 8, 13, 19, 13)), param('21 сентября 2021г., вторник', datetime(2021, 9, 21, 0, 0)), + param('Пнд, 07 янв. 2019 г. 12:15', datetime(2019, 1, 7, 12, 15)), + param('Вт, 08 янв. 2019 г. 12:15', datetime(2019, 1, 8, 12, 15)), + param('Срд, 09 янв. 2019 г. 12:15', datetime(2019, 1, 9, 12, 15)), + param('Чт, 10 янв. 2019 г. 12:15', datetime(2019, 1, 10, 12, 15)), + param('Птн, 11 янв. 2019 г. 12:15', datetime(2019, 1, 11, 12, 15)), + param('Сб, 12 янв. 2019 г. 12:15', datetime(2019, 1, 12, 12, 15)), # Turkish dates param('11 Ağustos, 2014', datetime(2014, 8, 11)), param('08.Haziran.2014, 11:07', datetime(2014, 6, 8, 11, 7)), # forum.andronova.net From 1242c18a68155a69a58d3a58b0adc1e6341c30d3 Mon Sep 17 00:00:00 2001 From: Serhii Abarovskyi Date: Tue, 4 Oct 2022 11:41:11 +0300 Subject: [PATCH 3/6] Adding Test --- dateparser/data/date_translation_data/ru.py | 7 ------- .../date_translation_data/ru.yaml | 7 ------- tests/test_date_parser.py | 3 --- 3 files changed, 17 deletions(-) diff --git a/dateparser/data/date_translation_data/ru.py b/dateparser/data/date_translation_data/ru.py index 0991ec029..4e2846217 100644 --- a/dateparser/data/date_translation_data/ru.py +++ b/dateparser/data/date_translation_data/ru.py @@ -66,46 +66,39 @@ "monday": [ "пн", "понедельник", - "Пн", "Пнд" ], "tuesday": [ "вт", "вторник", - "Вт", "Втр" ], "wednesday": [ "ср", "среда", - "Cр", "Срд", "Среду" ], "thursday": [ "четверг", "чт", - "Чт", "Чтв" ], "friday": [ "пт", "пятница", - "Пт", "Птн", "Пятницу" ], "saturday": [ "сб", "суббота", - "Сб", "Сбт", "Субботу" ], "sunday": [ "воскресенье", "вс", - "Вс", "Вск", "Воскресение" ], diff --git a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml index e2f21d4c1..c8f01284c 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml @@ -3,28 +3,21 @@ skip: ["в", "во", "и", "около", "примерно"] sentence_splitter_group : 1 monday: - - Пн - Пнд tuesday: - - Вт - Втр wednesday: - - Cр - Срд - Среду thursday: - - Чт - Чтв friday: - - Пт - Птн - Пятницу saturday: - - Сб - Сбт - Субботу sunday: - - Вс - Вск - Воскресение diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py index a89f3c48f..015d71171 100644 --- a/tests/test_date_parser.py +++ b/tests/test_date_parser.py @@ -98,11 +98,8 @@ def setUp(self): param('13 авг. 2005 г. 19:13', datetime(2005, 8, 13, 19, 13)), param('21 сентября 2021г., вторник', datetime(2021, 9, 21, 0, 0)), param('Пнд, 07 янв. 2019 г. 12:15', datetime(2019, 1, 7, 12, 15)), - param('Вт, 08 янв. 2019 г. 12:15', datetime(2019, 1, 8, 12, 15)), param('Срд, 09 янв. 2019 г. 12:15', datetime(2019, 1, 9, 12, 15)), - param('Чт, 10 янв. 2019 г. 12:15', datetime(2019, 1, 10, 12, 15)), param('Птн, 11 янв. 2019 г. 12:15', datetime(2019, 1, 11, 12, 15)), - param('Сб, 12 янв. 2019 г. 12:15', datetime(2019, 1, 12, 12, 15)), # Turkish dates param('11 Ağustos, 2014', datetime(2014, 8, 11)), param('08.Haziran.2014, 11:07', datetime(2014, 6, 8, 11, 7)), # forum.andronova.net From 59da5d217ac2082d25685296964f14349c2d36e4 Mon Sep 17 00:00:00 2001 From: Serhii Abarovskyi Date: Tue, 4 Oct 2022 12:00:46 +0300 Subject: [PATCH 4/6] Improve Russian weekdays --- dateparser/data/date_translation_data/ru.py | 22 +++++++++---------- .../date_translation_data/ru.yaml | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dateparser/data/date_translation_data/ru.py b/dateparser/data/date_translation_data/ru.py index 4e2846217..790fadc31 100644 --- a/dateparser/data/date_translation_data/ru.py +++ b/dateparser/data/date_translation_data/ru.py @@ -66,41 +66,41 @@ "monday": [ "пн", "понедельник", - "Пнд" + "пнд" ], "tuesday": [ "вт", "вторник", - "Втр" + "втр" ], "wednesday": [ "ср", "среда", - "Срд", - "Среду" + "срд", + "среду" ], "thursday": [ "четверг", "чт", - "Чтв" + "чтв" ], "friday": [ "пт", "пятница", - "Птн", - "Пятницу" + "птн", + "пятницу" ], "saturday": [ "сб", "суббота", - "Сбт", - "Субботу" + "сбт", + "субботу" ], "sunday": [ "воскресенье", "вс", - "Вск", - "Воскресение" + "вск", + "воскресение" ], "am": [ "дп" diff --git a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml index c8f01284c..97fee0179 100644 --- a/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml +++ b/dateparser_data/supplementary_language_data/date_translation_data/ru.yaml @@ -3,23 +3,23 @@ skip: ["в", "во", "и", "около", "примерно"] sentence_splitter_group : 1 monday: - - Пнд + - пнд tuesday: - - Втр + - втр wednesday: - - Срд - - Среду + - срд + - среду thursday: - - Чтв + - чтв friday: - - Птн - - Пятницу + - птн + - пятницу saturday: - - Сбт - - Субботу + - сбт + - субботу sunday: - - Вск - - Воскресение + - вск + - воскресение february: - Фев From 73f39ea27f917808743126bdbd51f49dedc0b7d2 Mon Sep 17 00:00:00 2001 From: Serhii Abarovskyi Date: Tue, 4 Oct 2022 12:17:04 +0300 Subject: [PATCH 5/6] Add tests --- tests/test_date_parser.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py index 015d71171..a2a6879ac 100644 --- a/tests/test_date_parser.py +++ b/tests/test_date_parser.py @@ -99,7 +99,10 @@ def setUp(self): param('21 сентября 2021г., вторник', datetime(2021, 9, 21, 0, 0)), param('Пнд, 07 янв. 2019 г. 12:15', datetime(2019, 1, 7, 12, 15)), param('Срд, 09 янв. 2019 г. 12:15', datetime(2019, 1, 9, 12, 15)), + param('чтв, 1 снт. 2022 г. 09:00', datetime(2022, 9, 1, 9, 00)), param('Птн, 11 янв. 2019 г. 12:15', datetime(2019, 1, 11, 12, 15)), + param('сбт, 1 окт. 2022 г. 10:22', datetime(2022, 10, 1, 10, 22)), + param('вск, 2 окт. 2022 г. 11:17', datetime(2022, 10, 2, 11, 17)), # Turkish dates param('11 Ağustos, 2014', datetime(2014, 8, 11)), param('08.Haziran.2014, 11:07', datetime(2014, 6, 8, 11, 7)), # forum.andronova.net From 995167f5de02b5f069460f8ecd2d8c42f255dc72 Mon Sep 17 00:00:00 2001 From: Serhii Abarovskyi Date: Tue, 4 Oct 2022 12:22:43 +0300 Subject: [PATCH 6/6] Fix test --- tests/test_date_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_date_parser.py b/tests/test_date_parser.py index a2a6879ac..560a1dd38 100644 --- a/tests/test_date_parser.py +++ b/tests/test_date_parser.py @@ -99,7 +99,7 @@ def setUp(self): param('21 сентября 2021г., вторник', datetime(2021, 9, 21, 0, 0)), param('Пнд, 07 янв. 2019 г. 12:15', datetime(2019, 1, 7, 12, 15)), param('Срд, 09 янв. 2019 г. 12:15', datetime(2019, 1, 9, 12, 15)), - param('чтв, 1 снт. 2022 г. 09:00', datetime(2022, 9, 1, 9, 00)), + param('чтв, 1 сентября 2022 г. 09:00', datetime(2022, 9, 1, 9, 00)), param('Птн, 11 янв. 2019 г. 12:15', datetime(2019, 1, 11, 12, 15)), param('сбт, 1 окт. 2022 г. 10:22', datetime(2022, 10, 1, 10, 22)), param('вск, 2 окт. 2022 г. 11:17', datetime(2022, 10, 2, 11, 17)),