diff options
| author | Jannis Leidel <jannis@leidel.info> | 2009-12-30 22:11:11 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2009-12-30 22:11:11 +0000 |
| commit | 6eb02fa9bbd6e68d57f6b5b6e7419271ca4fd0ab (patch) | |
| tree | 9a12261c40f50c13ca2df6270e97415509bfbed9 /django | |
| parent | dcdca8d78c8fb3749a977d1f971dec3819a3d42c (diff) | |
Fixed #12448 - Make sure format strings are handled correctly as unicode.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/views/i18n.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/views/i18n.py b/django/views/i18n.py index ddd75203a7..17f5613de5 100644 --- a/django/views/i18n.py +++ b/django/views/i18n.py @@ -6,6 +6,7 @@ from django.conf import settings from django.utils import importlib from django.utils.translation import check_for_language, activate, to_locale, get_language from django.utils.text import javascript_quote +from django.utils.encoding import smart_unicode from django.utils.formats import get_format_modules def set_language(request): @@ -208,7 +209,7 @@ def javascript_catalog(request, domain='djangojs', packages=None): for k, v in pdict.items(): src.append("catalog['%s'] = [%s];\n" % (javascript_quote(k), ','.join(["''"]*(v+1)))) for k, v in get_formats().items(): - src.append("catalog['%s'] = '%s';\n" % (javascript_quote(k), javascript_quote(unicode(v)))) + src.append("catalog['%s'] = '%s';\n" % (javascript_quote(k), javascript_quote(smart_unicode(v)))) src.extend(csrc) src.append(LibFoot) src.append(InterPolate) |