get language code from html attribute bcz of missing cookie

hypy13 · Feb 23, 2025 · 4467907 · 4467907
1 parent 8c47e9f
commit 4467907
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/django_daisy/admin.py b/django_daisy/admin.py
@@ -1,6 +1,7 @@
 import logging
 
 from django.apps import apps
+from django.conf import settings
 from django.contrib import admin
 from django.core.files.storage import FileSystemStorage
 from django.db import models
@@ -107,6 +108,7 @@ def each_context(self, request):
             "change_language_url": change_language_url,
             'logo': self.get_logo(request),
             'can_delete_popup': '',
+            'use_i18n': getattr(settings, 'USE_I18N', False)
         }
 
     def get_logo(self, request):

diff --git a/django_daisy/static/admin/fields/json-editor/init.js b/django_daisy/static/admin/fields/json-editor/init.js
@@ -24,12 +24,13 @@ $(document).ready(function () {
         "defaultUploadHandler": function (jseditor, type, file, cbs) {
             // Create a new XMLHttpRequest object
             var xhr = new XMLHttpRequest();
-            let django_lang = getCookie("django_language")
-            let url = ""
-            if (django_lang) {
-                url = `/${django_lang}/admin/json-editor-upload-handler/`
-            } else {
-                url = '/admin/json-editor-upload-handler/'
+            const htmlElement = document.documentElement;
+            let url = '/admin/json-editor-upload-handler/'
+            if (htmlElement.hasAttribute('data-use-i18n') && htmlElement.getAttribute('data-use-i18n') === "1") {
+                const djangoLang = htmlElement.getAttribute('lang');
+                if (djangoLang) {
+                    url = `/${djangoLang}${url}`;
+                }
             }
 
             // Configure it to send a POST request to the server endpoint

diff --git a/django_daisy/templates/admin/base.html b/django_daisy/templates/admin/base.html
@@ -4,7 +4,7 @@
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 
 <!DOCTYPE html>
-<html data-theme="" class="custom-scrollbars" lang="{{ LANGUAGE_CODE|default:"en-us" }}"
+<html data-use-i18n="{{ use_i18n|yesno:'1,0' }}" data-theme="" class="custom-scrollbars" lang="{{ LANGUAGE_CODE|default:"en-us" }}"
       {% if LANGUAGE_BIDI %}dir="rtl"
       {% else %}dir="ltr"{% endif %}>