Merge pull request #3785 from mozilla/1237661-admin

Fix bug 1237661: Fix wonky admin
mdn · Feb 17, 2016 · 67bb93d · 67bb93d
2 parents ecb07f0 + c10ae65
commit 67bb93d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/kuma/core/middleware.py b/kuma/core/middleware.py
@@ -55,7 +55,10 @@ def process_request(self, request):
 
         request.path_info = '/' + prefixer.shortened_path
         request.LANGUAGE_CODE = prefixer.locale or settings.LANGUAGE_CODE
-        translation.activate(prefixer.locale)
+        # prefixer.locale can be '', but we need a real locale code to activate
+        # otherwise the request uses the previously handled request's
+        # translations.
+        translation.activate(prefixer.locale or settings.LANGUAGE_CODE)
 
     def process_response(self, request, response):
         """Unset the thread-local var we set during `process_request`."""