Reapply fix for bug 723242 branched from mdn.

apps/wiki/tests/test_views.py

@@ -95,6 +95,23 @@ def _create_en_and_de_docs(self):
         de_rev.save()
         return en_doc, de_doc
 
+    def test_ui_locale(self):
+        """Bug 723242: make sure wiki redirects insert the correct UI
+        locale in the URL, so that the locale middleware doesn't have
+        to redirect again."""
+        en = settings.WIKI_DEFAULT_LANGUAGE
+        target = document(title='Locale Redirect Test Target',
+                          html='<p>Locale Redirect Test Target</p>',
+                          locale=en)
+        target.save()
+        source = document(title='Locale Redirect Test Document',
+                          html='REDIRECT <a class="redirect" href="/docs/en/locale-redirect-test-target/">Locale Redirect Test Target</a>',
+                          locale=en)
+        source.save()
+        url = reverse('wiki.document', args=[source.slug], locale=en)
+        response = self.client.get(url, follow=False)
+        self.assertEqual(response.status_code, 302)
+        assert ('/%s/docs/' % en) in response['Location']
 
 class ViewTests(TestCaseBase):
     fixtures = ['test_users.json', 'wiki/documents.json']

apps/wiki/views.py

@@ -22,7 +22,7 @@
 
 from access.decorators import permission_required, login_required
 from sumo.helpers import urlparams
-from sumo.urlresolvers import reverse
+from sumo.urlresolvers import Prefixer, reverse
 from sumo.utils import paginate, smart_int
 from wiki import DOCUMENTS_PER_PAGE
 from wiki.events import (EditDocumentEvent, ReviewableRevisionInLocaleEvent,
@@ -127,6 +127,12 @@ def document(request, document_slug):
     if redirect_url:
         url = urlparams(redirect_url, query_dict=request.GET,
                         redirectslug=doc.slug, redirectlocale=doc.locale)
+        # We want to make sure the UI locale is preserved in this
+        # redirect, so that the locale middleware doesn't have to
+        # redirect again afterward. Simplest way is just to do what
+        # the locale middleware would be doing.
+        prefixer = Prefixer(request=request)
+        url = prefixer.fix(url)
         return HttpResponseRedirect(url)
 
     # Get "redirected from" doc if we were redirected: