mirror of
https://github.com/django/django.git
synced 2025-10-25 14:46:09 +00:00
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:
committed by
Mariusz Felisiak
parent
2eb1f37260
commit
3b4728310a
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user