mirror of
https://github.com/getpelican/pelican.git
synced 2025-10-15 20:28:56 +02:00
Merge b084a22dc8 into 25732f7be6
This commit is contained in:
Alex Chan
GitHub
commit
67e82b1cf3
2 changed files with 87 additions and 60 deletions
|
|
@ -386,33 +386,30 @@ class TestUtils(LoggedTestCase):
|
|||
locale_available('Turkish'),
|
||||
'Turkish locale needed')
|
||||
def test_strftime_locale_dependent_turkish(self):
|
||||
# store current locale
|
||||
old_locale = locale.setlocale(locale.LC_ALL)
|
||||
|
||||
if platform == 'win32':
|
||||
locale.setlocale(locale.LC_ALL, str('Turkish'))
|
||||
new_locale = 'Turkish'
|
||||
else:
|
||||
locale.setlocale(locale.LC_ALL, str('tr_TR.UTF-8'))
|
||||
new_locale = 'tr_TR.UTF-8'
|
||||
|
||||
d = utils.SafeDatetime(2012, 8, 29)
|
||||
with utils.temporary_locale(new_locale):
|
||||
|
||||
# simple
|
||||
self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
|
||||
self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
|
||||
'Çarşamba, 29 Ağustos 2012')
|
||||
d = utils.SafeDatetime(2012, 8, 29)
|
||||
|
||||
# with text
|
||||
self.assertEqual(
|
||||
utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
|
||||
'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
|
||||
# simple
|
||||
self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 Ağustos 2012')
|
||||
self.assertEqual(utils.strftime(d, '%A, %d %B %Y'),
|
||||
'Çarşamba, 29 Ağustos 2012')
|
||||
|
||||
# non-ascii format candidate (someone might pass it… for some reason)
|
||||
self.assertEqual(
|
||||
utils.strftime(d, '%Y yılında %üretim artışı'),
|
||||
'2012 yılında %üretim artışı')
|
||||
# with text
|
||||
self.assertEqual(
|
||||
utils.strftime(d, 'Yayınlanma tarihi: %A, %d %B %Y'),
|
||||
'Yayınlanma tarihi: Çarşamba, 29 Ağustos 2012')
|
||||
|
||||
# restore locale back
|
||||
locale.setlocale(locale.LC_ALL, old_locale)
|
||||
# non-ascii format candidate (someone might pass it… for
|
||||
# some reason)
|
||||
self.assertEqual(
|
||||
utils.strftime(d, '%Y yılında %üretim artışı'),
|
||||
'2012 yılında %üretim artışı')
|
||||
|
||||
# test the output of utils.strftime in a different locale
|
||||
# French locale
|
||||
|
|
@ -420,34 +417,31 @@ class TestUtils(LoggedTestCase):
|
|||
locale_available('French'),
|
||||
'French locale needed')
|
||||
def test_strftime_locale_dependent_french(self):
|
||||
# store current locale
|
||||
old_locale = locale.setlocale(locale.LC_ALL)
|
||||
|
||||
if platform == 'win32':
|
||||
locale.setlocale(locale.LC_ALL, str('French'))
|
||||
new_locale = 'French'
|
||||
else:
|
||||
locale.setlocale(locale.LC_ALL, str('fr_FR.UTF-8'))
|
||||
new_locale = 'fr_FR.UTF-8'
|
||||
|
||||
d = utils.SafeDatetime(2012, 8, 29)
|
||||
with utils.temporary_locale(new_locale):
|
||||
|
||||
# simple
|
||||
self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
|
||||
d = utils.SafeDatetime(2012, 8, 29)
|
||||
|
||||
# depending on OS, the first letter is m or M
|
||||
self.assertTrue(utils.strftime(d, '%A') in ('mercredi', 'Mercredi'))
|
||||
# simple
|
||||
self.assertEqual(utils.strftime(d, '%d %B %Y'), '29 août 2012')
|
||||
|
||||
# with text
|
||||
self.assertEqual(
|
||||
utils.strftime(d, 'Écrit le %d %B %Y'),
|
||||
'Écrit le 29 août 2012')
|
||||
# depending on OS, the first letter is m or M
|
||||
self.assertIn(utils.strftime(d, '%A'), ('mercredi', 'Mercredi'))
|
||||
|
||||
# non-ascii format candidate (someone might pass it… for some reason)
|
||||
self.assertEqual(
|
||||
utils.strftime(d, '%écrits en %Y'),
|
||||
'%écrits en 2012')
|
||||
# with text
|
||||
self.assertEqual(
|
||||
utils.strftime(d, 'Écrit le %d %B %Y'),
|
||||
'Écrit le 29 août 2012')
|
||||
|
||||
# restore locale back
|
||||
locale.setlocale(locale.LC_ALL, old_locale)
|
||||
# non-ascii format candidate (someone might pass it… for
|
||||
# some reason)
|
||||
self.assertEqual(
|
||||
utils.strftime(d, '%écrits en %Y'),
|
||||
'%écrits en 2012')
|
||||
|
||||
def test_maybe_pluralize(self):
|
||||
self.assertEqual(
|
||||
|
|
@ -589,13 +583,13 @@ class TestDateFormatter(unittest.TestCase):
|
|||
self.assertEqual(
|
||||
u'jeudi, 14 août 2014',
|
||||
df(date, date_format="%A, %d %B %Y").lower())
|
||||
# Let us now set the global locale to C:
|
||||
locale.setlocale(locale.LC_ALL, str('C'))
|
||||
# DateFormatter should still work as expected
|
||||
# since it is the whole point of DateFormatter
|
||||
# (This is where pre-2014/4/15 code fails on macos10)
|
||||
df_date = df(date, date_format="%A, %d %B %Y").lower()
|
||||
self.assertEqual(u'jeudi, 14 août 2014', df_date)
|
||||
|
||||
with utils.temporary_locale(str('C')):
|
||||
# DateFormatter should still work as expected
|
||||
# since it is the whole point of DateFormatter
|
||||
# (This is where pre-2014/4/15 code fails on macos10)
|
||||
df_date = df(date, date_format="%A, %d %B %Y").lower()
|
||||
self.assertEqual(u'jeudi, 14 août 2014', df_date)
|
||||
|
||||
@unittest.skipUnless(locale_available('fr_FR.UTF-8') or
|
||||
locale_available('French'),
|
||||
|
|
@ -666,3 +660,30 @@ class TestDateFormatter(unittest.TestCase):
|
|||
with utils.pelican_open(output_path) as output_file:
|
||||
self.assertEqual(output_file,
|
||||
utils.strftime(self.date, 'date = %A, %d %B %Y'))
|
||||
|
||||
@unittest.skipUnless(
|
||||
(locale_available('tr_TR.UTF-8') or locale_available('Turkish')) and
|
||||
(locale_available('fr_FR.UTF-8') or locale_available('French')),
|
||||
'French and Turkish locales needed'
|
||||
)
|
||||
def test_temporary_locale(self):
|
||||
'''
|
||||
Test the temporary_locale context manager. Use it to temporarily
|
||||
set the locale to Turkish (or French, if we are already using the
|
||||
Turkish locale).
|
||||
'''
|
||||
if platform == 'win32':
|
||||
new_locale = 'Turkish'
|
||||
alt_locale = 'French'
|
||||
else:
|
||||
new_locale = 'tr_TR.UTF-8'
|
||||
alt_locale = 'fr_FR.UTF-8'
|
||||
|
||||
# If our locale is already Turkish, we will use French instead
|
||||
if locale.setlocale(locale.LC_ALL) == new_locale:
|
||||
new_locale = alt_locale
|
||||
|
||||
self.assertNotEqual(locale.setlocale(locale.LC_ALL), new_locale)
|
||||
with utils.temporary_locale(new_locale):
|
||||
self.assertEqual(locale.setlocale(locale.LC_ALL), new_locale)
|
||||
self.assertNotEqual(locale.setlocale(locale.LC_ALL), new_locale)
|
||||
|
|
|
|||
|
|
@ -120,19 +120,8 @@ class DateFormatter(object):
|
|||
self.locale = locale.setlocale(locale.LC_TIME)
|
||||
|
||||
def __call__(self, date, date_format):
|
||||
old_lc_time = locale.setlocale(locale.LC_TIME)
|
||||
old_lc_ctype = locale.setlocale(locale.LC_CTYPE)
|
||||
|
||||
locale.setlocale(locale.LC_TIME, self.locale)
|
||||
# on OSX, encoding from LC_CTYPE determines the unicode output in PY3
|
||||
# make sure it's same as LC_TIME
|
||||
locale.setlocale(locale.LC_CTYPE, self.locale)
|
||||
|
||||
formatted = strftime(date, date_format)
|
||||
|
||||
locale.setlocale(locale.LC_TIME, old_lc_time)
|
||||
locale.setlocale(locale.LC_CTYPE, old_lc_ctype)
|
||||
return formatted
|
||||
with temporary_locale(self.locale):
|
||||
return strftime(date, date_format)
|
||||
|
||||
|
||||
def python_2_unicode_compatible(klass):
|
||||
|
|
@ -838,3 +827,20 @@ def maybe_pluralize(count, singular, plural):
|
|||
if count == 1:
|
||||
selection = singular
|
||||
return '{} {}'.format(count, selection)
|
||||
|
||||
|
||||
@contextmanager
|
||||
def temporary_locale(temp_locale=None):
|
||||
'''
|
||||
Enable code to run in a context with a temporary locale.
|
||||
|
||||
Resets the locale back when context exits. Can set a temporary
|
||||
locale if provided.
|
||||
'''
|
||||
orig_locale = locale.setlocale(locale.LC_ALL)
|
||||
|
||||
if temp_locale is not None:
|
||||
locale.setlocale(locale.LC_ALL, temp_locale)
|
||||
|
||||
yield
|
||||
locale.setlocale(locale.LC_ALL, orig_locale)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue