From 4b3b9fab080f517b7dc41fb933f6eae3e24081ce Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 25 Jun 2018 09:41:04 -0400 Subject: [2.0.x] Reverted "Fixed #29511 -- Added charset to JavaScriptCatalog's Content-Type header." This reverts commit 8e082a6e0b63a1cfdb0bc7b2835c6447123aa239 as it doesn't qualify for a backport. --- django/views/i18n.py | 2 +- tests/view_tests/tests/test_i18n.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/django/views/i18n.py b/django/views/i18n.py index 240059a19f..e121d3038a 100644 --- a/django/views/i18n.py +++ b/django/views/i18n.py @@ -311,7 +311,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; charset="utf-8"') + return HttpResponse(template.render(Context(context)), 'text/javascript') class JSONCatalog(JavaScriptCatalog): diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index 4f1a07b272..38e5367d03 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -200,7 +200,6 @@ 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": # json.dumps() is used to be able to check unicode strings -- cgit v1.3