Commit 470d6c2f authored by Claude Paroz's avatar Claude Paroz
Browse files

[4.1.x] Fixed #33888 -- Fixed get_select2_language() crash with no language activated.

parent f2e47df763a7
......@@ -456,7 +456,7 @@ SELECT2_TRANSLATIONS.update({"zh-hans": "zh-CN", "zh-hant": "zh-TW"})
def get_select2_language():
lang_code = get_language()
supported_code = SELECT2_TRANSLATIONS.get(lang_code)
if supported_code is None:
if supported_code is None and lang_code is not None:
# If 'zh-hant-tw' is not supported, try subsequent language codes i.e.
# 'zh-hant' and 'zh'.
i = None
......@@ -11,3 +11,6 @@ Bugfixes
* Reallowed, following a regression in Django 4.1, using ``GeoIP2()`` when GEOS
is not installed (:ticket:`33886`).
* Fixed a regression in Django 4.1 that caused a crash of admin's autocomplete
widgets when translations are deactivated (:ticket:`33888`).
......@@ -179,6 +179,7 @@ class AutocompleteMixinTests(TestCase):
("sr-cyrl", "sr-Cyrl"),
("zh-hans", "zh-CN"),
("zh-hant", "zh-TW"),
(None, None),
for lang, select_lang in languages:
with self.subTest(lang=lang):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment