diff options
| author | Tim Graham <timograham@gmail.com> | 2018-06-22 03:15:29 -0400 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2018-06-22 09:32:33 +0200 |
| commit | 714612a638ff02f02406553a583b2f8a1a424885 (patch) | |
| tree | 5afd24d13919b50877421c0cb707412f39b72481 | |
| parent | ea75f8abca851ed4b6f3764a9d1af95e215208f0 (diff) | |
[2.1.x] Fixed #29511 -- Added charset to JavaScriptCatalog's Content-Type header.
Backport of 7cdeb23ae7ef2d125276840ff298dbb9683959f2 from master
| -rw-r--r-- | django/views/i18n.py | 2 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_i18n.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/views/i18n.py b/django/views/i18n.py index 4f13040ea3..da638a210c 100644 --- a/django/views/i18n.py +++ b/django/views/i18n.py @@ -309,7 +309,7 @@ class JavaScriptCatalog(View): ) if context['catalog'] else None 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): diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index 125d6e0a5f..5baa755580 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -206,6 +206,7 @@ class I18NViewTests(SimpleTestCase): catalog = gettext.translation('djangojs', locale_dir, [lang_code]) trans_txt = catalog.gettext('this is to be translated') response = self.client.get('/jsi18n/') + self.assertEqual(response['Content-Type'], 'text/javascript; charset="utf-8"') # response content must include a line like: # "this is to be translated": <value of trans_txt Python variable> # json.dumps() is used to be able to check unicode strings |