Refs #25933 -- Fixed i18n_patterns() prefix_default_language=False with HTTP_ACCEPT_LANGUAGE header.

1 files changed, 2 insertions, 4 deletions

diff --git a/django/middleware/locale.py b/django/middleware/locale.py
index 44dec75a54..c8cbd58685 100644
--- a/django/middleware/locale.py
+++ b/django/middleware/locale.py
@@ -22,7 +22,8 @@ class LocaleMiddleware(object):
         urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
         i18n_patterns_used, prefixed_default_language = is_language_prefix_patterns_used(urlconf)
         language = translation.get_language_from_request(request, check_path=i18n_patterns_used)
-        if not language and i18n_patterns_used and not prefixed_default_language:
+        language_from_path = translation.get_language_from_path(request.path_info)
+        if not language_from_path and i18n_patterns_used and not prefixed_default_language:
             language = settings.LANGUAGE_CODE
         translation.activate(language)
         request.LANGUAGE_CODE = translation.get_language()
@@ -33,9 +34,6 @@ class LocaleMiddleware(object):
         urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
         i18n_patterns_used, prefixed_default_language = is_language_prefix_patterns_used(urlconf)
 
-        if not language_from_path and i18n_patterns_used and not prefixed_default_language:
-            language_from_path = settings.LANGUAGE_CODE
-
         if response.status_code == 404 and not language_from_path and i18n_patterns_used:
             language_path = '/%s%s' % (language, request.path_info)
             path_valid = is_valid_path(language_path, urlconf)