p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #34455 -- Restored i18n_patterns() respect of prefix_default_language argument when fallback language is used. 

Regression in 94e7f471c4.

Thanks Oussama Jarrousse for the report.
This commit is contained in:
sarahboyce 2023-04-06 19:40:14 +02:00 committed by Mariusz Felisiak
parent 2eb1f37260
commit 3b4728310a
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/urls/resolvers.py
View File

@ -23,7 +23,7 @@ from django.utils.datastructures import MultiValueDict
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.http import RFC3986_SUBDELIMS, escape_leading_slashes from django.utils.http import RFC3986_SUBDELIMS, escape_leading_slashes
from django.utils.regex_helper import _lazy_re_compile, normalize from django.utils.regex_helper import _lazy_re_compile, normalize
from django.utils.translation import get_language from django.utils.translation import get_language, get_supported_language_variant
from .converters import get_converter from .converters import get_converter
from .exceptions import NoReverseMatch, Resolver404 from .exceptions import NoReverseMatch, Resolver404
@ -351,7 +351,8 @@ class LocalePrefixPattern:
@property @property
def language_prefix(self): def language_prefix(self):
language_code = get_language() or settings.LANGUAGE_CODE language_code = get_language() or settings.LANGUAGE_CODE
if language_code == settings.LANGUAGE_CODE and not self.prefix_default_language: default_language = get_supported_language_variant(settings.LANGUAGE_CODE)
if language_code == default_language and not self.prefix_default_language:
return "" return ""
else: else:
return "%s/" % language_code return "%s/" % language_code

1
django/utils/translation/__init__.py
View File

@ -17,6 +17,7 @@ __all__ = [
"get_language_from_request", "get_language_from_request",
"get_language_info", "get_language_info",
"get_language_bidi", "get_language_bidi",
"get_supported_language_variant",
"check_for_language", "check_for_language",
"to_language", "to_language",
"to_locale", "to_locale",

4
docs/releases/4.2.1.txt
View File

@ -25,3 +25,7 @@ Bugfixes
* Enforced UTF-8 client encoding on PostgreSQL, following a regression in * Enforced UTF-8 client encoding on PostgreSQL, following a regression in
Django 4.2 (:ticket:`34470`). Django 4.2 (:ticket:`34470`).
* Fixed a regression in Django 4.2 where ``i18n_patterns()`` didn't respect the
``prefix_default_language`` argument when a fallback language of the default
language was used (:ticket:`34455`).

6
tests/i18n/tests.py
View File

@ -1916,6 +1916,12 @@ class UnprefixedDefaultLanguageTests(SimpleTestCase):
response = self.client.get("/simple/") response = self.client.get("/simple/")
self.assertEqual(response.content, b"Yes") self.assertEqual(response.content, b"Yes")
@override_settings(LANGUAGE_CODE="en-us")
def test_default_lang_fallback_without_prefix(self):
response = self.client.get("/simple/")
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, b"Yes")
def test_other_lang_with_prefix(self): def test_other_lang_with_prefix(self):
response = self.client.get("/fr/simple/") response = self.client.get("/fr/simple/")
self.assertEqual(response.content, b"Oui") self.assertEqual(response.content, b"Oui")