Ticket #17555: 17555.v2.diff

django/utils/translation/trans_real.py

@@ -38 +38 @@
         (?:\s*,\s*|$)                                 # Multiple accepts per header.
         ''', re.VERBOSE)
 
-language_code_prefix_re = re.compile(r'^/([\w-]+)/')
+language_code_prefix_re = re.compile(r'^/([\w-]+)(/|$)')
 
 def to_locale(language, to_lower=False):
     """

tests/regressiontests/utils/tests.py

@@ -26 +26 @@
 from .crypto import TestUtilsCryptoPBKDF2
 from .archive import TestZip, TestTar, TestGzipTar, TestBzip2Tar
 from .regex_helper import NormalizeTests
+from .translation import TranslationI18nEnabledTests, TranslationI18nDisabledTests

new file tests/regressiontests/utils/translation.py

@@ +1 @@
+from django.test import TestCase
+from django.utils.translation.trans_real import get_language_from_path as get_language_from_path_real
+from django.utils.translation.trans_null import get_language_from_path as get_language_from_path_null
+
+class TranslationTestCase(TestCase):
+    def setUp(self):
+        self.language = 'pl'
+        self.path_slash = '/%s/' % self.language
+        self.path_no_slash = '/%s' % self.language
+        self.path_unknown = '/xyz/'
+
+
+class TranslationI18nEnabledTests(TranslationTestCase):
+    def test_get_language_from_path(self):
+        self.assertEqual(get_language_from_path_real(self.path_slash), self.language)
+        self.assertEqual(get_language_from_path_real(self.path_no_slash), self.language)
+        self.assertEqual(get_language_from_path_real(self.path_unknown), None)
+
+
+class TranslationI18nDisabledTests(TranslationTestCase):
+    def test_get_language_from_path(self):
+        self.assertEqual(get_language_from_path_null(self.path_slash), None)
+        self.assertEqual(get_language_from_path_null(self.path_no_slash), None)
+        self.assertEqual(get_language_from_path_null(self.path_unknown), None)
+