summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorsarahboyce <sarahvboyce95@gmail.com>2023-04-06 19:40:14 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-04-10 08:49:54 +0200
commit3b4728310a7a64f8fcc548163b0aa5f98a5c78f5 (patch)
treed9c84dd02171d5611f3b94ceb9ba49730ae50f1c /django
parent2eb1f37260f0e0b71ef3a77eb5522d2bb68d6489 (diff)
Fixed #34455 -- Restored i18n_patterns() respect of prefix_default_language argument when fallback language is used.
Regression in 94e7f471c4edef845a4fe5e3160132997b4cca81. Thanks Oussama Jarrousse for the report.
Diffstat (limited to 'django')
-rw-r--r--django/urls/resolvers.py5
-rw-r--r--django/utils/translation/__init__.py1
2 files changed, 4 insertions, 2 deletions
diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py
index b021673772..658a6a6f97 100644
--- a/django/urls/resolvers.py
+++ b/django/urls/resolvers.py
@@ -23,7 +23,7 @@ from django.utils.datastructures import MultiValueDict
from django.utils.functional import cached_property
from django.utils.http import RFC3986_SUBDELIMS, escape_leading_slashes
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 .exceptions import NoReverseMatch, Resolver404
@@ -351,7 +351,8 @@ class LocalePrefixPattern:
@property
def language_prefix(self):
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 ""
else:
return "%s/" % language_code
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 0b3f78e486..69820a2fc4 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -17,6 +17,7 @@ __all__ = [
"get_language_from_request",
"get_language_info",
"get_language_bidi",
+ "get_supported_language_variant",
"check_for_language",
"to_language",
"to_locale",