Fix ValueError is raised if LANGUAGE is empty string

This commit is contained in:
Takeshi KOMIYA 2016-02-17 01:13:00 +09:00
parent 423bf7b5e3
commit b780d2207a
3 changed files with 6 additions and 2 deletions

View File

@ -13,6 +13,7 @@ Bugs fixed
----------
* Remove ``image/gif`` from supported_image_types of LaTeX writer (#2272)
* Fix code-block literals raises highlighting warnings by default
* Fix ValueError is raised if LANGUAGE is empty string
Documentation
-------------

View File

@ -154,7 +154,7 @@ def babel_format_date(date, format, locale):
try:
return babel.dates.format_date(date, format, locale=locale)
except babel.core.UnknownLocaleError:
except (ValueError, babel.core.UnknownLocaleError):
# fallback to English
return babel.dates.format_date(date, format, locale='en')

View File

@ -170,13 +170,16 @@ def test_format_date():
format = None
assert i18n.format_date(format, date=date) == 'Feb 7, 2016'
assert i18n.format_date(format, date=date, language='') == 'Feb 7, 2016'
assert i18n.format_date(format, date=date, language='unknown') == 'Feb 7, 2016'
assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016'
assert i18n.format_date(format, date=date, language='ja') == '2016/02/07'
assert i18n.format_date(format, date=date, language='de') == '07.02.2016'
format = '%B %d, %Y'
print(i18n.format_date(format, date=date))
assert i18n.format_date(format, date=date) == 'February 07, 2016'
assert i18n.format_date(format, date=date, language='') == 'February 07, 2016'
assert i18n.format_date(format, date=date, language='unknown') == 'February 07, 2016'
assert i18n.format_date(format, date=date, language='en') == 'February 07, 2016'
assert i18n.format_date(format, date=date, language='ja') == u'2月 07, 2016'
assert i18n.format_date(format, date=date, language='de') == 'Februar 07, 2016'