Use Django's get_select2_language() to get the i18n locale name

Add to Django in django/django@3079133.

Author: rsebille

django_select2/forms.py

@@ -54,12 +54,11 @@
 
 import django
 from django import forms
-from django.contrib.admin.widgets import SELECT2_TRANSLATIONS, AutocompleteMixin
+from django.contrib.admin.widgets import AutocompleteMixin
 from django.core import signing
 from django.db.models import Q
 from django.forms.models import ModelChoiceIterator
 from django.urls import reverse
-from django.utils.translation import get_language
 
 from .cache import cache
 from .conf import settings
@@ -89,7 +88,15 @@ class Select2Mixin:
     @property
     def i18n_name(self):
         """Name of the i18n file for the current language."""
-        return SELECT2_TRANSLATIONS.get(get_language())
+        if django.VERSION < (4, 1):
+            from django.contrib.admin.widgets import SELECT2_TRANSLATIONS
+            from django.utils.translation import get_language
+
+            return SELECT2_TRANSLATIONS.get(get_language())
+        else:
+            from django.contrib.admin.widgets import get_select2_language
+
+            return get_select2_language()
 
     def build_attrs(self, base_attrs, extra_attrs=None):
         """Add select2 data attributes."""

tests/test_forms.py

@@ -2,6 +2,7 @@
 import os
 from collections.abc import Iterable
 
+import django
 import pytest
 from django.db.models import QuerySet
 from django.urls import reverse
@@ -57,6 +58,13 @@ def test_lang_attr(self):
         with translation.override("de"):
             assert widget.i18n_name == "de"
 
+        # Handle language code with country
+        with translation.override("fr-FR"):
+            if django.VERSION < (4, 1):
+                assert widget.i18n_name is None
+            else:
+                assert widget.i18n_name == "fr"
+
     def test_allow_clear(self, db):
         required_field = self.form.fields["artist"]
         assert required_field.required is True
@@ -175,6 +183,20 @@ def test_i18n(self):
             "django_select2/django_select2.js",
         )
 
+        translation.activate("fr-FR")
+        with translation.override("fr-FR"):
+            if django.VERSION < (4, 1):
+                assert tuple(Select2Widget().media._js) == (
+                    "admin/js/vendor/select2/select2.full.min.js",
+                    "django_select2/django_select2.js",
+                )
+            else:
+                assert tuple(Select2Widget().media._js) == (
+                    "admin/js/vendor/select2/select2.full.min.js",
+                    "admin/js/vendor/select2/i18n/fr.js",
+                    "django_select2/django_select2.js",
+                )
+
     def test_theme_setting(self, settings):
         settings.SELECT2_THEME = "classic"
         widget = self.widget_cls()
@@ -261,6 +283,13 @@ def test_lang_attr(self):
             widget = self.widget_cls(data_view="heavy_data_1")
             assert 'lang="fr"' in widget.render("name", None)
 
+        # Handle language code with country
+        with translation.override("fr-FR"):
+            if django.VERSION < (4, 1):
+                assert widget.i18n_name is None
+            else:
+                assert widget.i18n_name == "fr"
+
     def test_selected_option(self, db):
         not_required_field = self.form.fields["primary_genre"]
         assert not_required_field.required is False