Fix cookie popup text resolution per active language

This reverts commit 6cca48eaf9.

mandelstudio/templates/cookie_jar/cookie_banner.html

@@ -1,19 +1,23 @@
 {% load i18n %}
 {% load wagtailcore_tags ocyanjson %}
+{% load mandelstudio_i18n %}
 
 {% with settings.cookie_jar.CookieSettings as cookie_settings %}
+    {% with request.LANGUAGE_CODE|default:'nl' as language_code %}
+    {% with language_code|slice:':2' as lang %}
     {% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
         {% if cookie_jar.needs_display or cookie_jar.cookie is None %}
-        <div id="cookie_popup_body" class="cookie-consent-overlay" role="region" aria-label="{% trans 'Cookie settings' %}">
+        <div id="cookie_popup_body" class="cookie-consent-overlay" role="region" aria-label="{% if lang == 'ru' %}Настройки cookie{% elif lang == 'de' %}Cookie-Einstellungen{% elif lang == 'fr' %}Paramètres des cookies{% elif lang == 'es' %}Configuración de cookies{% elif lang == 'it' %}Impostazioni cookie{% elif lang == 'pt' %}Definições de cookies{% elif lang == 'en' %}Cookie settings{% else %}Cookie instellingen{% endif %}">
             <div class="cookie-consent-modal" role="dialog" aria-modal="true" aria-labelledby="cookie-consent-title">
                 <div class="cookie-consent-panel is-active" id="cookie-consent-main-panel">
                     <div class="cookie-banner-title" id="cookie-consent-title">
                         <i class="fa fa-shield-halved" aria-hidden="true"></i>
-                        <span>{% trans 'Privacy & Cookies' %}</span>
+                        <span>{% if lang == 'ru' %}Конфиденциальность и файлы cookie{% elif lang == 'de' %}Datenschutz & Cookies{% elif lang == 'fr' %}Confidentialité & Cookies{% elif lang == 'es' %}Privacidad y Cookies{% elif lang == 'it' %}Privacy e Cookie{% elif lang == 'pt' %}Privacidade & Cookies{% else %}Privacy & Cookies{% endif %}</span>
                     </div>
                     <div id="cookie_popup_content">
-                        {% if cookie_settings.cookie_message %}
+                        {% localized_setting_text cookie_settings "cookie_message" as cookie_message_text %}
-                            {{ cookie_settings.cookie_message|richtext }}
+                        {% if cookie_message_text %}
+                            {{ cookie_message_text|richtext }}
                         {% else %}
                             <p>
                                 {% blocktrans %}
@@ -23,26 +27,27 @@
                         {% endif %}
                     </div>
                     <div id="cookie_buttons" class="cookie-consent-actions">
-                        <button type="button" id="cookie_popup_acceptButton" data-cookie-key="{{ cookie_jar.cookie_key }}">{% trans 'Accept' %}</button>
+                        <button type="button" id="cookie_popup_acceptButton" data-cookie-key="{{ cookie_jar.cookie_key }}">{% if lang == 'ru' %}Принять{% elif lang == 'de' %}Akzeptieren{% elif lang == 'fr' %}Accepter{% elif lang == 'es' %}Aceptar{% elif lang == 'it' %}Accetta{% elif lang == 'pt' %}Aceitar{% elif lang == 'en' %}Accept{% else %}Accepteer{% endif %}</button>
-                        <button type="button" id="cookie_popup_settingsToggle">{% trans 'Settings' %}</button>
+                        <button type="button" id="cookie_popup_settingsToggle">{% if lang == 'ru' %}Настройки{% elif lang == 'de' %}Einstellungen{% elif lang == 'fr' %}Paramètres{% elif lang == 'es' %}Configuración{% elif lang == 'it' %}Impostazioni{% elif lang == 'pt' %}Definições{% elif lang == 'en' %}Settings{% else %}Instellingen{% endif %}</button>
                     </div>
                     <div class="cookie-consent-hint">
-                        {% trans 'You can update your cookie preferences at any time.' %}
+                        {% if lang == 'ru' %}Вы можете изменить свои настройки cookie в любое время.{% elif lang == 'de' %}Sie können Ihre Cookie-Einstellungen jederzeit aktualisieren.{% elif lang == 'fr' %}Vous pouvez mettre à jour vos préférences de cookies à tout moment.{% elif lang == 'es' %}Puede actualizar sus preferencias de cookies en cualquier momento.{% elif lang == 'it' %}Puoi aggiornare le tue preferenze sui cookie in qualsiasi momento.{% elif lang == 'pt' %}Pode atualizar as suas preferências de cookies a qualquer momento.{% elif lang == 'en' %}You can update your cookie preferences at any time.{% else %}U kunt uw cookievoorkeuren op elk moment aanpassen.{% endif %}
                     </div>
                 </div>
 
                 <div class="cookie-consent-panel" id="cookie-consent-settings-panel">
                     <button type="button" class="cookie-consent-back" id="cookie_popup_backButton">
                         <i class="fa fa-arrow-left" aria-hidden="true"></i>
-                        <span>{% trans 'Back' %}</span>
+                        <span>{% if lang == 'ru' %}Назад{% elif lang == 'de' %}Zurück{% elif lang == 'fr' %}Retour{% elif lang == 'es' %}Volver{% elif lang == 'it' %}Indietro{% elif lang == 'pt' %}Voltar{% elif lang == 'en' %}Back{% else %}Terug{% endif %}</span>
                     </button>
                     <div class="cookie-banner-title">
                         <i class="fa fa-sliders" aria-hidden="true"></i>
-                        <span>{% trans 'Cookie settings' %}</span>
+                        <span>{% if lang == 'ru' %}Настройки cookie{% elif lang == 'de' %}Cookie-Einstellungen{% elif lang == 'fr' %}Paramètres des cookies{% elif lang == 'es' %}Configuración de cookies{% elif lang == 'it' %}Impostazioni cookie{% elif lang == 'pt' %}Definições de cookies{% elif lang == 'en' %}Cookie settings{% else %}Cookie instellingen{% endif %}</span>
                     </div>
                     <div id="cookie_popup_content_modal">
-                        {% if cookie_settings.popup_cookie_message %}
+                        {% localized_setting_text cookie_settings "popup_cookie_message" as popup_cookie_message_text %}
-                            {{ cookie_settings.popup_cookie_message|richtext }}
+                        {% if popup_cookie_message_text %}
+                            {{ popup_cookie_message_text|richtext }}
                         {% else %}
                             <p>
                                 {% blocktrans %}
@@ -53,8 +58,8 @@
                     </div>
                     {% include "cookie_jar/partials/cookie_checkboxes.html" %}
                     <div class="cookie-consent-actions cookie-consent-actions-settings">
-                        <button type="button" id="cookie_popup_acceptButton_settings">{% trans 'Accept' %}</button>
+                        <button type="button" id="cookie_popup_acceptButton_settings">{% if lang == 'ru' %}Принять{% elif lang == 'de' %}Akzeptieren{% elif lang == 'fr' %}Accepter{% elif lang == 'es' %}Aceptar{% elif lang == 'it' %}Accetta{% elif lang == 'pt' %}Aceitar{% elif lang == 'en' %}Accept{% else %}Accepteer{% endif %}</button>
-                        <button type="button" id="cookie_model_saveButton" data-cookie-key="{{ cookie_jar.cookie_key }}">{% trans 'Save preferences' %}</button>
+                        <button type="button" id="cookie_model_saveButton" data-cookie-key="{{ cookie_jar.cookie_key }}">{% if lang == 'ru' %}Сохранить настройки{% elif lang == 'de' %}Einstellungen speichern{% elif lang == 'fr' %}Enregistrer les préférences{% elif lang == 'es' %}Guardar preferencias{% elif lang == 'it' %}Salva preferenze{% elif lang == 'pt' %}Guardar preferências{% elif lang == 'en' %}Save preferences{% else %}Voorkeuren opslaan{% endif %}</button>
                     </div>
                 </div>
             </div>
@@ -62,6 +67,8 @@
         {% endif %}
     {% endif %}
     {% endwith %}
+    {% endwith %}
+{% endwith %}
 
 <script>
   (function () {

mandelstudio/templatetags/mandelstudio_i18n.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from django import template
+from django.utils.translation import get_language
 
 from mandelstudio.i18n_utils import normalize_set_language_next
 
@@ -29,3 +30,22 @@ def skip_to_content_text(context) -> str:
 def language_neutral_path(value: str | None) -> str:
     """Normalize a path for set_language by removing any leading language prefix."""
     return normalize_set_language_next(value)
+
+
+@register.simple_tag
+def localized_setting_text(settings_obj, field_name: str, fallback_text: str = "") -> str:
+    """
+    Resolve a translated settings field by active language and fallback to base field.
+    """
+    if not settings_obj or not field_name:
+        return fallback_text
+
+    language = (get_language() or "").lower().split("-")[0]
+    if language and language != "nl":
+        translated_name = f"{field_name}_{language}"
+        translated_value = getattr(settings_obj, translated_name, None)
+        if translated_value:
+            return translated_value
+
+    base_value = getattr(settings_obj, field_name, None)
+    return base_value or fallback_text