mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #26295 -- Allowed using i18n_patterns() in any root URLconf.

Browse Source 
Thanks Tim for the review.
This commit is contained in:
Simon Charette
2015-12-14 12:36:09 -05:00
parent 2404d209a5
commit d0451e4cad
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
django/middleware/locale.py
View File

@@ -5,9 +5,8 @@ from django.http import HttpResponseRedirect
from django.urls import (
LocaleRegexURLResolver, get_resolver, get_script_prefix, is_valid_path,
)
from django.utils import translation
from django.utils import lru_cache, translation
from django.utils.cache import patch_vary_headers
from django.utils.functional import cached_property
class LocaleMiddleware(object):
@@ -21,17 +20,19 @@ class LocaleMiddleware(object):
response_redirect_class = HttpResponseRedirect
def process_request(self, request):
urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
language = translation.get_language_from_request(
request, check_path=self.is_language_prefix_patterns_used)
request, check_path=self.is_language_prefix_patterns_used(urlconf)
)
translation.activate(language)
request.LANGUAGE_CODE = translation.get_language()
def process_response(self, request, response):
language = translation.get_language()
language_from_path = translation.get_language_from_path(request.path_info)
urlconf = getattr(request, 'urlconf', settings.ROOT_URLCONF)
if (response.status_code == 404 and not language_from_path
and self.is_language_prefix_patterns_used):
urlconf = getattr(request, 'urlconf', None)
and self.is_language_prefix_patterns_used(urlconf)):
language_path = '/%s%s' % (language, request.path_info)
path_valid = is_valid_path(language_path, urlconf)
path_needs_slash = (
@@ -52,20 +53,20 @@ class LocaleMiddleware(object):
)
return self.response_redirect_class(language_url)
if not (self.is_language_prefix_patterns_used
if not (self.is_language_prefix_patterns_used(urlconf)
and language_from_path):
patch_vary_headers(response, ('Accept-Language',))
if 'Content-Language' not in response:
response['Content-Language'] = language
return response
@cached_property
def is_language_prefix_patterns_used(self):
@lru_cache.lru_cache(maxsize=None)
def is_language_prefix_patterns_used(self, urlconf):
"""
Returns `True` if the `LocaleRegexURLResolver` is used
at root level of the urlpatterns, else it returns `False`.
"""
for url_pattern in get_resolver(None).url_patterns:
for url_pattern in get_resolver(urlconf).url_patterns:
if isinstance(url_pattern, LocaleRegexURLResolver):
return True
return False