summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCleiton Lima <cleiton.limapin@gmail.com>2021-09-20 15:56:54 -0300
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-09-21 08:07:59 +0200
commita077f10df477880a23faad333aae8d9ef8738152 (patch)
treea54df653e94f53c3df395ab96d53d24bb5b5c4a4 /django
parent3c751f008f86a56f3ebd20465bccf8d5bf5a80d1 (diff)
[4.0.x] Fixed #33070 -- Fixed loading translations with language subtags in admin's Select2 widget.
Backport of 8eb56930915f8022aa27ec29ab5be7d21764608c from main
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/widgets.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index aeb74773ac..f1002cac6c 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -388,6 +388,7 @@ class AutocompleteMixin:
self.db = using
self.choices = choices
self.attrs = {} if attrs is None else attrs.copy()
+ self.i18n_name = SELECT2_TRANSLATIONS.get(get_language())
def get_url(self):
return reverse(self.url_name % self.admin_site.name)
@@ -413,6 +414,7 @@ class AutocompleteMixin:
'data-theme': 'admin-autocomplete',
'data-allow-clear': json.dumps(not self.is_required),
'data-placeholder': '', # Allows clearing of the input.
+ 'lang': self.i18n_name,
'class': attrs['class'] + (' ' if attrs['class'] else '') + 'admin-autocomplete',
})
return attrs
@@ -449,8 +451,7 @@ class AutocompleteMixin:
@property
def media(self):
extra = '' if settings.DEBUG else '.min'
- i18n_name = SELECT2_TRANSLATIONS.get(get_language())
- i18n_file = ('admin/js/vendor/select2/i18n/%s.js' % i18n_name,) if i18n_name else ()
+ i18n_file = ('admin/js/vendor/select2/i18n/%s.js' % self.i18n_name,) if self.i18n_name else ()
return forms.Media(
js=(
'admin/js/vendor/jquery/jquery%s.js' % extra,