diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-09-22 15:54:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-09-22 16:45:03 +0200 |
| commit | 353f745be9d22c660a4968bdfcfc3cc85e4f51f2 (patch) | |
| tree | a8da7dfba75f1139875cd9b5b995325663e9bfdb | |
| parent | bb4073c629fa961d2e35a98ebf4f360ee9d140d7 (diff) | |
| download | Ishtar-353f745be9d22c660a4968bdfcfc3cc85e4f51f2.tar.bz2 Ishtar-353f745be9d22c660a4968bdfcfc3cc85e4f51f2.zip | |
🐛 select2 widget: fix translation
| -rw-r--r-- | ishtar_common/context_processors.py | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 1 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 76ac14b82..ce379a4cd 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -25,7 +25,7 @@ from django.conf import settings from django.core.cache import cache from django.contrib.sites.models import Site from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, get_language from ishtar_common.version import __version__ from ishtar_common.models import get_current_profile @@ -85,6 +85,7 @@ def get_base_context(request): "URL_PATH": settings.URL_PATH, "BASE_URL": "", "ISHTAR_MAP_MAX_ITEMS": settings.ISHTAR_MAP_MAX_ITEMS, + "LANGUAGE": get_language() or "en" } if "HTTP_HOST" in request.META: dct["BASE_URL"] = "{}://{}".format(request.scheme, request.META["HTTP_HOST"]) diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 5101e9040..7d57fa54e 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -19,6 +19,7 @@ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/papaparse.min.js?ver={{VERSION}}"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/chosen/chosen.jquery.min.js?ver={{VERSION}}"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}select2/js/select2.full.min.js?ver={{VERSION}}"></script> + <script language="javascript" type="text/javascript" src="{{STATIC_URL}}select2/js/i18n/{{LANGUAGE}}.js?ver={{VERSION}}"></script> {# <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/prettyPhoto/js/jquery.prettyPhoto.js?ver={{VERSION}}"></script> #} <script language="javascript" type="text/javascript" src="{{STATIC_URL}}ol/ol.js?ver={{VERSION}}"></script> diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 2e6dc36af..be6cb23e8 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -40,7 +40,7 @@ from django.utils.functional import lazy from django.utils.html import escape from django.utils.safestring import mark_safe from json import JSONEncoder -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, get_language from ishtar_common import models from ishtar_common.utils import get_columns_from_class, reverse_coordinates @@ -127,8 +127,8 @@ class Select2Media: # TODO: to remove? put in on base.html css = {"all": ("select2/css/select2.css",)} js = ["select2/js/select2.full.min.js"] - for lang_code, lang in settings.LANGUAGES: - js.append("select2/js/i18n/{}.js".format(lang_code)) + lang_code = get_language() or "en" + js.append("select2/js/i18n/{}.js".format(lang_code)) media = forms.Media(css=css, js=js) return media |