p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #29511 -- Added charset to JavaScriptCatalog's Content-Type header.

This commit is contained in:
Tim Graham 2018-06-22 03:15:29 -04:00 committed by Carlton Gibson
parent ae38777698
commit 7cdeb23ae7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/views/i18n.py
View File

@ -284,7 +284,7 @@ class JavaScriptCatalog(View):
) if context['catalog'] else None ) if context['catalog'] else None
context['formats_str'] = indent(json.dumps(context['formats'], sort_keys=True, indent=2)) context['formats_str'] = indent(json.dumps(context['formats'], sort_keys=True, indent=2))
return HttpResponse(template.render(Context(context)), 'text/javascript') return HttpResponse(template.render(Context(context)), 'text/javascript; charset="utf-8"')
class JSONCatalog(JavaScriptCatalog): class JSONCatalog(JavaScriptCatalog):

1
tests/view_tests/tests/test_i18n.py
View File

@ -206,6 +206,7 @@ class I18NViewTests(SimpleTestCase):
catalog = gettext.translation('djangojs', locale_dir, [lang_code]) catalog = gettext.translation('djangojs', locale_dir, [lang_code])
trans_txt = catalog.gettext('this is to be translated') trans_txt = catalog.gettext('this is to be translated')
response = self.client.get('/jsi18n/') response = self.client.get('/jsi18n/')
self.assertEqual(response['Content-Type'], 'text/javascript; charset="utf-8"')
# response content must include a line like: # response content must include a line like:
# "this is to be translated": <value of trans_txt Python variable> # "this is to be translated": <value of trans_txt Python variable>
# json.dumps() is used to be able to check unicode strings # json.dumps() is used to be able to check unicode strings