Fixed #8121 -- Don't override the Content-Language HTTP header in the locale

middleware if it's already been set. Thanks, jcassee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8259 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/middleware/locale.py

@@ -19,6 +19,7 @@ class LocaleMiddleware(object):
 
     def process_response(self, request, response):
         patch_vary_headers(response, ('Accept-Language',))
-        response['Content-Language'] = translation.get_language()
+        if 'Content-Language' not in response:
+            response['Content-Language'] = translation.get_language()
         translation.deactivate()
         return response