Skip to content

Commit 227d1ec

Browse files
committed
Date intervals: allow using other as fallback form
Fixes #825
1 parent 9a70340 commit 227d1ec

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

babel/dates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ def _iter_patterns(a_unit):
948948
pattern = None
949949
for patterns in _iter_patterns(unit):
950950
if patterns is not None:
951-
pattern = patterns[plural_form]
951+
pattern = patterns.get(plural_form) or patterns.get('other')
952952
break
953953
# This really should not happen
954954
if pattern is None:

tests/test_date_intervals.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,13 @@ def test_format_interval_invalid_skeleton():
5252
t2 = TEST_DATE + datetime.timedelta(days=1)
5353
assert dates.format_interval(t1, t2, "mumumu", fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"
5454
assert dates.format_interval(t1, t2, fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"
55+
56+
57+
def test_issue_825():
58+
assert dates.format_timedelta(
59+
datetime.timedelta(hours=1),
60+
granularity='hour',
61+
threshold=100,
62+
format='short',
63+
locale='pt',
64+
) == '1 h'

0 commit comments

Comments
 (0)