Skip to content

Extract a format_date_with_time helper function #267

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.

Sign up for GitHub

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

Closed
mbirtwell wants to merge 1 commit into from
Closed

Extract a format_date_with_time helper function #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions babel/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,23 @@ def format_date(date=None, format='medium', locale=LC_TIME):
return pattern.apply(date, locale)


def format_date_with_time(date, time, format='medium', locale=LC_TIME):
r"""Combines a pre-formatted date and time in to a single string

>>> format_date_with_time("20/8/15", "14:40", locale='en')
u'20/8/15, 14:40'
>>> format_date_with_time("20/8/15", "14:40", 'long', 'en')
u'20/8/15 at 14:40'
>>> format_date_with_time("20/8/15", "14:40", 'long', 'de')
u'20/8/15 um 14:40'

"""
return get_datetime_format(format, locale=locale) \
.replace("'", "") \
.replace('{0}', time) \
.replace('{1}', date)


def format_datetime(datetime=None, format='medium', tzinfo=None,
locale=LC_TIME):
r"""Return a date formatted according to the given pattern.
Expand Down Expand Up @@ -609,11 +626,12 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,

locale = Locale.parse(locale)
if format in ('full', 'long', 'medium', 'short'):
return get_datetime_format(format, locale=locale) \
.replace("'", "") \
.replace('{0}', format_time(datetime, format, tzinfo=None,
locale=locale)) \
.replace('{1}', format_date(datetime, format, locale=locale))
return format_date_with_time(
format_date(datetime, format, locale=locale),
format_time(datetime, format, tzinfo=None, locale=locale),
format,
locale,
)
else:
return parse_pattern(format).apply(datetime, locale)

Expand Down
6 changes: 6 additions & 0 deletions tests/test_dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,12 @@ def test_format_date():
u"Sun, Apr 1, '07")


def test_format_date_with_time():
assert dates.format_date_with_time("20/8/15", "14:40", locale='en') == u'20/8/15, 14:40'
assert dates.format_date_with_time("20/8/15", "14:40", 'long', 'en') == u'20/8/15 at 14:40'
assert dates.format_date_with_time("20/8/15", "14:40", 'long', 'de') == u'20/8/15 um 14:40'


def test_format_datetime():
dt = datetime(2007, 4, 1, 15, 30)
assert (dates.format_datetime(dt, locale='en_US') ==
Expand Down