Kaydet (Commit) 714612a6 authored tarafından Tim Graham's avatar Tim Graham Kaydeden (comit) Carlton Gibson

[2.1.x] Fixed #29511 -- Added charset to JavaScriptCatalog's Content-Type header.

Backport of 7cdeb23a from master
üst ea75f8ab
...@@ -309,7 +309,7 @@ class JavaScriptCatalog(View): ...@@ -309,7 +309,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):
......
...@@ -206,6 +206,7 @@ class I18NViewTests(SimpleTestCase): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment