diff options
| -rw-r--r-- | django/utils/formats.py | 1 | ||||
| -rw-r--r-- | tests/regressiontests/i18n/tests.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/django/utils/formats.py b/django/utils/formats.py index db2930316a..77479ae2a6 100644 --- a/django/utils/formats.py +++ b/django/utils/formats.py @@ -40,6 +40,7 @@ def get_format(format_type): language (locale), defaults to the format in the settings. format_type is the name of the format, e.g. 'DATE_FORMAT' """ + format_type = smart_str(format_type) if settings.USE_L10N: for module in get_format_modules(): try: diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py index 87351eb6b2..2df08a6648 100644 --- a/tests/regressiontests/i18n/tests.py +++ b/tests/regressiontests/i18n/tests.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- import sys import decimal import datetime @@ -138,6 +139,10 @@ class FormattingTests(TestCase): self.assertEqual(u'-66666.6', format(-66666.666, decimal_sep='.', decimal_pos=1)) self.assertEqual(u'-66666.0', format(int('-66666'), decimal_sep='.', decimal_pos=1)) + # date filter + self.assertEqual(u'31.12.2009 в 20:50', Template('{{ dt|date:"d.m.Y в H:i" }}').render(self.ctxt)) + self.assertEqual(u'⌚ 10:15', Template('{{ t|time:"⌚ H:i" }}').render(self.ctxt)) + def test_l10n_disabled(self): """ Catalan locale with format i18n disabled translations will be used, |