Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for b and B period symbols in time format #869

Merged
merged 3 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 41 additions & 8 deletions babel/dates.py
Original file line number Diff line number Diff line change
Expand Up @@ -1313,9 +1313,8 @@ def __getitem__(self, name):
return self.format_day_of_week_in_month()
elif char in ('E', 'e', 'c'):
return self.format_weekday(char, num)
elif char == 'a':
# TODO: Add support for the rest of the period formats (a*, b*, B*)
return self.format_period(char)
elif char in ('a', 'b', 'B'):
return self.format_period(char, num)
elif char == 'h':
if self.value.hour % 12 == 0:
return self.format(12, num)
Expand Down Expand Up @@ -1453,10 +1452,44 @@ def format_day_of_year(self, num):
def format_day_of_week_in_month(self):
return '%d' % ((self.value.day - 1) // 7 + 1)

def format_period(self, char):
period = {0: 'am', 1: 'pm'}[int(self.value.hour >= 12)]
for width in ('wide', 'narrow', 'abbreviated'):
period_names = get_period_names(context='format', width=width, locale=self.locale)
def format_period(self, char, num):
"""
Return period from parsed datetime according to format pattern.

>>> format = DateTimeFormat(time(13, 42), 'fi_FI')
>>> format.format_period('a', 1)
u'ip.'
>>> format.format_period('b', 1)
u'iltap.'
>>> format.format_period('b', 4)
u'iltapäivä'
>>> format.format_period('B', 4)
u'iltapäivällä'
>>> format.format_period('B', 5)
u'ip.'

>>> format = DateTimeFormat(datetime(2022, 4, 28, 6, 27), 'zh_Hant')
>>> format.format_period('a', 1)
u'上午'
>>> format.format_period('b', 1)
u'清晨'
>>> format.format_period('B', 1)
u'清晨'

:param char: pattern format character ('a', 'b', 'B')
:param num: count of format character

"""
widths = [{3: 'abbreviated', 4: 'wide', 5: 'narrow'}[max(3, num)],
'wide', 'narrow', 'abbreviated']
akx marked this conversation as resolved.
Show resolved Hide resolved
if char == 'a':
period = 'pm' if self.value.hour >= 12 else 'am'
context = 'format'
else:
period = get_period_id(self.value, locale=self.locale)
context = 'format' if char == 'B' else 'stand-alone'
for width in widths:
period_names = get_period_names(context=context, width=width, locale=self.locale)
if period in period_names:
return period_names[period]
raise ValueError('Could not format period %s in %s' % (period, self.locale))
Expand Down Expand Up @@ -1579,7 +1612,7 @@ def get_week_number(self, day_of_period, day_of_week=None):
'w': [1, 2], 'W': [1], # week
'd': [1, 2], 'D': [1, 2, 3], 'F': [1], 'g': None, # day
'E': [1, 2, 3, 4, 5, 6], 'e': [1, 2, 3, 4, 5, 6], 'c': [1, 3, 4, 5, 6], # week day
'a': [1], # period
'a': [1, 2, 3, 4, 5], 'b': [1, 2, 3, 4, 5], 'B': [1, 2, 3, 4, 5], # period
'h': [1, 2], 'H': [1, 2], 'K': [1, 2], 'k': [1, 2], # hour
'm': [1, 2], # minute
's': [1, 2], 'S': None, 'A': None, # second
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dates.py
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ def test_lithuanian_long_format():

def test_zh_TW_format():
# Refs GitHub issue #378
assert dates.format_time(datetime(2016, 4, 8, 12, 34, 56), locale='zh_TW') == u'B12:34:56'
assert dates.format_time(datetime(2016, 4, 8, 12, 34, 56), locale='zh_TW') == u'中午12:34:56'


def test_format_current_moment():
Expand Down