Fixed #12435 - Handle Unicode characters in format strings correctly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Jan 1, 2010 · ac371cc · ac371cc
1 parent 855e805
commit ac371cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 import sys
 import decimal
 import datetime
@@ -138,6 +139,10 @@ def test_locale_independent(self):
         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,