Skip to content

Commit 29b1f94

Browse files
authored
Parse some abbreviated strings as relative dates (#1219)
1 parent 1d4b058 commit 29b1f94

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

dateparser/data/date_translation_data/en.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@
800800
"(?:12\\s+)?midnight": "00:00"
801801
},
802802
{
803-
"(\\d+[.,]?\\d*)h(\\d+[.,]?\\d*)m?": "\\1:\\2"
803+
"(\\d+[.,]?\\d*)h(\\d+[.,]?\\d*)": "\\1:\\2"
804804
},
805805
{
806806
"(?<=from\\s+)now": "in"

dateparser_data/supplementary_language_data/date_translation_data/en.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ simplifications:
6767
- a: '1'
6868
- (?:12\s+)?noon: '12:00'
6969
- (?:12\s+)?midnight: '00:00'
70-
- (\d+[.,]?\d*)h(\d+[.,]?\d*)m?: \1:\2
70+
- (\d+[.,]?\d*)h(\d+[.,]?\d*): \1:\2
7171
- (?<=from\s+)now: in
7272
- less than 1 minute ago: 45 second ago
7373
- (\d+[.,]?\d*) (decade|year|month|week|day|hour|minute|second)s? later: in \1 \2

tests/test_languages.py

+8
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,14 @@ def test_translation(self, shortname, datetime_string, expected_translation):
10881088
param("en", "day before yesterday", "2 day ago"),
10891089
param("en", "last month", "1 month ago"),
10901090
param("en", "less than a minute ago", "45 second ago"),
1091+
param("en", "10h11", "10:11"),
1092+
param("en", "10h11m", "10 hour 11 minute"),
1093+
param("en", "3d8h2m", "3 day 8 hour 2 minute"),
1094+
param("en", "5d9h59m10s", "5 day 9 hour 59 minute 10 second"),
1095+
param("en", "3d1h", "3 day 1 hour"),
1096+
param("en", "3d29m", "3 day 29 minute"),
1097+
param("en", "1.5d10s", "1.5 day 10 second"),
1098+
param("en", "7m1s", "7 minute 1 second"),
10911099
# German
10921100
param("de", "vorgestern", "2 day ago"),
10931101
param("de", "heute", "0 day ago"),

0 commit comments

Comments
 (0)