3 files changed, 25 insertions, 1 deletions
diff --git a/tests/regressiontests/i18n/patterns/tests.py b/tests/regressiontests/i18n/patterns/tests.py
index 40a62d4fb6..1cc4520358 100644
--- a/tests/regressiontests/i18n/patterns/tests.py
+++ b/tests/regressiontests/i18n/patterns/tests.py
@@ -78,6 +78,20 @@ class URLDisabledTests(URLTestCaseBase):
             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
diff --git a/tests/regressiontests/i18n/patterns/urls/path_unused.py b/tests/regressiontests/i18n/patterns/urls/path_unused.py
new file mode 100644
index 0000000000..1254d16c4e
--- /dev/null
+++ b/tests/regressiontests/i18n/patterns/urls/path_unused.py
@@ -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'),
+)
diff --git a/tests/regressiontests/i18n/tests.py b/tests/regressiontests/i18n/tests.py
index 4b543d2bbf..99a55bd24d 100644
--- a/tests/regressiontests/i18n/tests.py
+++ b/tests/regressiontests/i18n/tests.py
@@ -39,7 +39,7 @@ from .models import Company, TestModel
 from .patterns.tests import (URLRedirectWithoutTrailingSlashTests,
     URLTranslationTests, URLDisabledTests, URLTagTests, URLTestCaseBase,
     URLRedirectWithoutTrailingSlashSettingTests, URLNamespaceTests,
-    URLPrefixTests, URLResponseTests, URLRedirectTests)
+    URLPrefixTests, URLResponseTests, URLRedirectTests, PathUnusedTests)
 from .test_warnings import DeprecationWarningTests