Ticket #17720: 17720.diff

django/middleware/locale.py

@@ -15 +15 @@
     """
 
     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()
 

django/utils/translation/__init__.py

@@ -144 +144 @@
 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)

django/utils/translation/trans_null.py

@@ -55 +55 @@
     else:
         return language.lower()
 
-def get_language_from_request(request):
+def get_language_from_request(request, check_path):
     return settings.LANGUAGE_CODE
 
 def get_language_from_path(request):

django/utils/translation/trans_real.py

@@ -363 +363 @@
         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):
     """
     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)

new file tests/regressiontests/i18n/patterns/templates/showlang.html

@@ +1 @@
+LANGUAGE: {{ lang }} 

tests/regressiontests/i18n/patterns/tests.py

@@ -292 +292 @@
             {% language 'pt-br' %}{% url 'no-prefix-translated-slug' slug='apo' %}{% endlanguage %}""")
         self.assertEqual(tpl.render(Context({})).strip().split(),
                          [u'/vertaald/apo/', u'/traduzidos/apo/'])
+
+class NoI18NPatternsTest(URLTestCaseBase):
+    urls = 'regressiontests.i18n.patterns.urls.no18n'
+    def test_no_lang_activate(self):
+        """
+        Check that if no i18n_patterns is used in root urlconfs, then no
+        language activation happens based on url prefix.
+        """
+        rev = reverse('notrans')
+        response = self.client.get(rev)
+        self.assertContains(response, 'LANGUAGE: en')

new file tests/regressiontests/i18n/patterns/urls/no18n.py

@@ +1 @@
+from django.conf.urls import url
+from django.conf.urls import patterns
+from django.views.generic import TemplateView
+from django.utils.translation import get_language
+
+class LangTemplate(TemplateView):
+    def get_context_data(self, **kwargs):
+        context = super(LangTemplate, self).get_context_data(**kwargs)
+        context['lang'] = get_language
+        return context
+
+view = LangTemplate.as_view(template_name='showlang.html')
+
+urlpatterns = patterns('',
+    url(r'^nl/notrans/', view, name='notrans'),
+)

tests/regressiontests/i18n/tests.py

@@ -39 +39 @@
 from .patterns.tests import (URLRedirectWithoutTrailingSlashTests,
     URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase,
     URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests,
-    URLPrefixTests, URLResponseTests, URLRedirectTests)
+    URLPrefixTests, URLResponseTests, URLRedirectTests, NoI18NPatternsTest)
 from .test_warnings import DeprecationWarningTests