Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using t…

…he request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7dd0ceba2e8413d79c2aaff62733f4631cd3c1e7 1 parent 52b06e2
Jannis Leidel jezdez authored
4 django/middleware/locale.py
View
@@ -15,7 +15,9 @@ class LocaleMiddleware(object):
"""
def process_request(self, request):
- language = translation.get_language_from_request(request)
+ check_path = self.is_language_prefix_patterns_used()
+ language = translation.get_language_from_request(
+ request, check_path=check_path)
translation.activate(language)
request.LANGUAGE_CODE = translation.get_language()
4 django/utils/translation/__init__.py
View
@@ -144,8 +144,8 @@ def check_for_language(lang_code):
def to_locale(language):
return _trans.to_locale(language)
-def get_language_from_request(request):
- return _trans.get_language_from_request(request)
+def get_language_from_request(request, check_path=False):
+ return _trans.get_language_from_request(request, check_path)
def get_language_from_path(path):
return _trans.get_language_from_path(path)
2  django/utils/translation/trans_null.py
View
@@ -55,7 +55,7 @@ def to_locale(language):
else:
return language.lower()
-def get_language_from_request(request):
+def get_language_from_request(request, check_path=False):
return settings.LANGUAGE_CODE
def get_language_from_path(request):
12 django/utils/translation/trans_real.py
View
@@ -363,20 +363,24 @@ def get_language_from_path(path, supported=None):
if lang_code in supported and check_for_language(lang_code):
return lang_code
-def get_language_from_request(request):
+def get_language_from_request(request, check_path=False):
"""
Analyzes the request to find what language the user wants the system to
show. Only languages listed in settings.LANGUAGES are taken into account.
If the user requests a sublanguage where we have a main language, we send
out the main language.
+
+ If check_path is True, the URL path prefix will be checked for a language
+ code, otherwise this is skipped for backwards compatibility.
"""
global _accepted
from django.conf import settings
supported = dict(settings.LANGUAGES)
- lang_code = get_language_from_path(request.path_info, supported)
- if lang_code is not None:
- return lang_code
+ if check_path:
+ lang_code = get_language_from_path(request.path_info, supported)
+ if lang_code is not None:
+ return lang_code
if hasattr(request, 'session'):
lang_code = request.session.get('django_language', None)
14 tests/regressiontests/i18n/patterns/tests.py
View
@@ -78,6 +78,20 @@ def test_prefixed_i18n_disabled(self):
self.assertEqual(reverse('prefixed'), '/prefixed/')
+class PathUnusedTests(URLTestCaseBase):
+ """
+ Check that if no i18n_patterns is used in root urlconfs, then no
+ language activation happens based on url prefix.
+ """
+ urls = 'regressiontests.i18n.patterns.urls.path_unused'
+
+ def test_no_lang_activate(self):
+ response = self.client.get('/nl/foo/')
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response['content-language'], 'en')
+ self.assertEqual(response.context['LANGUAGE_CODE'], 'en')
+
+
class URLTranslationTests(URLTestCaseBase):
"""
Tests if the pattern-strings are translated correctly (within the
10 tests/regressiontests/i18n/patterns/urls/path_unused.py
View
@@ -0,0 +1,10 @@
+from django.conf.urls import url
+from django.conf.urls import patterns
+from django.views.generic import TemplateView
+
+
+view = TemplateView.as_view(template_name='dummy.html')
+
+urlpatterns = patterns('',
+ url(r'^nl/foo/', view, name='not-translated'),
+)
2  tests/regressiontests/i18n/tests.py
View
@@ -39,7 +39,7 @@
from .patterns.tests import (URLRedirectWithoutTrailingSlashTests,
URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase,
URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests,
- URLPrefixTests, URLResponseTests, URLRedirectTests)
+ URLPrefixTests, URLResponseTests, URLRedirectTests, PathUnusedTests)
from .test_warnings import DeprecationWarningTests
Please sign in to comment.
Something went wrong with that request. Please try again.