Ticket #21579: i18n_patterns_with_script_name_patch.diff

django/middleware/locale.py

@@ -4 +4 @@
 
 from django.conf import settings
 from django.core.urlresolvers import (is_valid_path, get_resolver,
-                                      LocaleRegexURLResolver)
+                                      LocaleRegexURLResolver, get_script_prefix)
 from django.http import HttpResponseRedirect
 from django.utils.cache import patch_vary_headers
 from django.utils import translation
@@ -50 +50 @@
                 path_valid = is_valid_path("%s/" % language_path, urlconf)
 
             if path_valid:
-                language_url = "%s://%s/%s%s" % (
-                    request.scheme, request.get_host(), language,
-                    request.get_full_path())
+                script_prefix = get_script_prefix()
+                language_url = "%s://%s%s" % (
+                    request.scheme, request.get_host(),
+                        request.get_full_path().replace(script_prefix, 
+                            '%s%s/' % (script_prefix, language), 1))
                 return self.response_redirect_class(language_url)
 
         # Store language back into session if it is not present

tests/i18n/patterns/tests.py

@@ -3 +3 @@
 import os
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, clear_url_caches
+from django.core.urlresolvers import (reverse, clear_url_caches, 
+                                      set_script_prefix)
 from django.http import HttpResponsePermanentRedirect
 from django.middleware.locale import LocaleMiddleware
 from django.test import TestCase
@@ -291 +292 @@
         self.assertEqual(response.context['LANGUAGE_CODE'], 'pt-br')
 
 
+class URLRedirectWithScriptAliasTests(URLTestCaseBase):
+    """
+    Tests if the response has the right language-code.
+    """
+    def setUp(self):
+        super(URLRedirectWithScriptAliasTests, self).setUp()
+        self.script_prefix = '/script_prefix'
+        set_script_prefix(self.script_prefix)
+
+    def tearDown(self):
+        super(URLRedirectWithScriptAliasTests, self).tearDown()
+        # reset script prefix
+        set_script_prefix('')
+        
+    def test_language_prefix_with_script_prefix(self):
+        response = self.client.get('/prefixed/', HTTP_ACCEPT_LANGUAGE='en', 
+            SCRIPT_NAME=self.script_prefix)
+        
+        self.assertRedirects(response, '%s/en/prefixed/' % self.script_prefix, 
+            target_status_code=404)
+
+
 class URLTagTests(URLTestCaseBase):
     """
     Test if the language tag works.