Ticket #27402: locale_404_bug_with_test.diff

django/middleware/locale.py

@@ -37 +37 @@
 
         if response.status_code == 404 and not language_from_path and i18n_patterns_used:
             language_path = '/%s%s' % (language, request.path_info)
+            if i18n_patterns_used and not prefixed_default_language and str(language) == str(settings.LANGUAGE_CODE):
+                language_path = '/%s' % (request.path_info)
             path_valid = is_valid_path(language_path, urlconf)
             path_needs_slash = (
                 not path_valid and (
@@ -44 +46 @@
                     is_valid_path('%s/' % language_path, urlconf)
                 )
             )
-
             if path_valid or path_needs_slash:
                 script_prefix = get_script_prefix()
                 # Insert language after the script prefix and before the

tests/i18n/tests.py

@@ -1839 +1839 @@
         with self.assertRaisesMessage(AssertionError, "Unexpected kwargs for i18n_patterns(): {'foo':"):
             i18n_patterns(object(), foo='bar')
 
+    def test_404_page_no_default_language_redirect(self):
+        response = self.client.get('/non-existent-page', follow=False)
+        self.assertEqual(response.status_code, 404)
+
 
 @override_settings(
     USE_I18N=True,

tests/i18n/urls_default_unprefixed.py

@@ -5 +5 @@
 
 urlpatterns = i18n_patterns(
     url(r'^simple/$', lambda r: HttpResponse(_("Yes"))),
+    url(r'^(?P<group1>.+)/(?P<group2>.+)/$', lambda r: HttpResponse(_("Group1-Group2"))),
     prefix_default_language=False,
 )