mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 10:40:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #12448 - Make sure format strings are handled correctly as unicode.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2009-12-30 22:11:11 +00:00
parent dcdca8d78c
commit 6eb02fa9bb
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
django/views/i18n.py
View file

@ -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)