Hide language chevron and force globe icon styling

This reverts commit 0910ff850a.

Jenkinsfile

@@ -24,25 +24,22 @@ pipeline {
     stages {
         stage('Checkout') {
             steps {
-                withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) {
                 sh '''
-                        export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new"
                     if [ -d .git ]; then
                         if git remote get-url origin >/dev/null 2>&1; then
-                                git remote set-url origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git
+                            git remote set-url origin https://git.mandelblog.com/salt/mandelstudio.git
                         else
-                                git remote add origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git
+                            git remote add origin https://git.mandelblog.com/salt/mandelstudio.git
                         fi
                         git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master
                     else
-                            git clone ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git .
+                        git clone https://git.mandelblog.com/salt/mandelstudio.git .
                         git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master
                     fi
                     git checkout -f refs/remotes/origin/master
                 '''
             }
         }
-        }
         stage('Build') {
             steps {
                 sh '''
@@ -138,7 +135,7 @@ PY
             steps {
                 sh '''
                     set -e
-                    REMOTE_CMD="cd '${STAGING_AUDIT_PROJECT_DIR}' && if [ -d .git ]; then git fetch --prune origin && git reset --hard origin/master && git rev-parse --short HEAD; else echo 'NO_GIT_REPO'; fi"
+                    REMOTE_CMD="cd '${STAGING_AUDIT_PROJECT_DIR}' && if [ -d .git ]; then git remote set-url origin https://git.mandelblog.com/salt/mandelstudio.git && git fetch --prune origin && git reset --hard origin/master && git rev-parse --short HEAD; else echo 'NO_GIT_REPO'; fi"
                     sudo -n -u mandel -g www-data /srv/apps/mandel-dashboard/.venv/bin/python /srv/apps/mandel-dashboard/bin/deploy_stg_from_jenkins.py "${STAGING_AUDIT_PROJECT_NAME}" --command "$REMOTE_CMD"
                 '''
             }
@@ -165,24 +162,83 @@ PY
                 '''
             }
         }
+        stage('Fix Capabilities FAQ') {
+            agent { label 'built-in' }
+            options {
+                timeout(time: 5, unit: 'MINUTES')
+            }
+            steps {
+                sh '''
+                    set -e
+                    REMOTE_CMD="cd '${STAGING_AUDIT_PROJECT_DIR}' && '${STAGING_AUDIT_MANAGE}' fix_capabilities_faq --apply"
+                    sudo -n -u mandel -g www-data /srv/apps/mandel-dashboard/.venv/bin/python /srv/apps/mandel-dashboard/bin/deploy_stg_from_jenkins.py "${STAGING_AUDIT_PROJECT_NAME}" --command "$REMOTE_CMD"
+                '''
+            }
+        }
+        stage('Fix No Credit Card Copy') {
+            agent { label 'built-in' }
+            options {
+                timeout(time: 5, unit: 'MINUTES')
+            }
+            steps {
+                sh '''
+                    set -e
+                    REMOTE_CMD="cd '${STAGING_AUDIT_PROJECT_DIR}' && '${STAGING_AUDIT_MANAGE}' fix_no_credit_card_text --apply --page-id 675"
+                    sudo -n -u mandel -g www-data /srv/apps/mandel-dashboard/.venv/bin/python /srv/apps/mandel-dashboard/bin/deploy_stg_from_jenkins.py "${STAGING_AUDIT_PROJECT_NAME}" --command "$REMOTE_CMD"
+                '''
+            }
+        }
+        stage('Recompress Staging Assets') {
+            agent { label 'built-in' }
+            options {
+                timeout(time: 10, unit: 'MINUTES')
+            }
+            steps {
+                sh '''
+                    set -e
+                    REMOTE_CMD="cd '${STAGING_AUDIT_PROJECT_DIR}' && '${STAGING_AUDIT_MANAGE}' compress --force"
+                    sudo -n -u mandel -g www-data /srv/apps/mandel-dashboard/.venv/bin/python /srv/apps/mandel-dashboard/bin/deploy_stg_from_jenkins.py "${STAGING_AUDIT_PROJECT_NAME}" --command "$REMOTE_CMD"
+                '''
+            }
+        }
+        stage('Wait For Staging Health') {
+            agent { label 'built-in' }
+            options {
+                timeout(time: 5, unit: 'MINUTES')
+            }
+            steps {
+                sh '''
+                    set -e
+                    for i in $(seq 1 30); do
+                        code_nl=$(curl -sS -o /dev/null -w "%{http_code}" https://mandelstudio.welkombij.mandelblog.com/ || true)
+                        code_en=$(curl -sS -o /dev/null -w "%{http_code}" https://mandelstudio.welkombij.mandelblog.com/en/ || true)
+                        echo "healthcheck attempt=$i nl=$code_nl en=$code_en"
+                        if [ "$code_nl" = "200" ] && [ "$code_en" = "200" ]; then
+                            exit 0
+                        fi
+                        sleep 10
+                    done
+                    echo "staging did not become healthy in time"
+                    exit 1
+                '''
+            }
+        }
         stage('Post-Deploy Multilingual Audit') {
             agent { label 'built-in' }
             options {
                 timeout(time: 10, unit: 'MINUTES')
             }
             steps {
-                withCredentials([sshUserPrivateKey(credentialsId: 'gitea-ssh', keyFileVariable: 'GIT_KEYFILE')]) {
                 sh '''
-                        export GIT_SSH_COMMAND="ssh -i $GIT_KEYFILE -o StrictHostKeyChecking=accept-new"
                     if [ -d .git ]; then
                         if git remote get-url origin >/dev/null 2>&1; then
-                                git remote set-url origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git
+                            git remote set-url origin https://git.mandelblog.com/salt/mandelstudio.git
                         else
-                                git remote add origin ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git
+                            git remote add origin https://git.mandelblog.com/salt/mandelstudio.git
                         fi
                         git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master
                     else
-                            git clone ssh://git@git.mandelblog.com:2222/salt/mandelstudio.git .
+                        git clone https://git.mandelblog.com/salt/mandelstudio.git .
                         git fetch --tags --force --progress origin +refs/heads/master:refs/remotes/origin/master
                     fi
                     git checkout -f refs/remotes/origin/master
@@ -190,7 +246,6 @@ PY
                     chmod +x scripts/run_remote_multilingual_audit.sh
                     ./scripts/run_remote_multilingual_audit.sh
                 '''
-                }
                 script {
                     int status = sh(script: 'python3 scripts/multilingual_audit_ci.py --json artifacts/multilingual-audit.json', returnStatus: true)
                     if (status == 2) {

contact_form/__init__.py

@@ -0,0 +1,6 @@
+"""Project-level overrides for the Ocyan contact_form plugin.
+
+Ocyan loads contact form handlers via module labels like `contact_form.views`.
+By shipping this package in the project repository we can extend behavior
+without forking the upstream plugin.
+"""

contact_form/views.py

@@ -0,0 +1,114 @@
+from __future__ import annotations
+
+import logging
+
+from django.conf import settings
+from django.contrib import messages
+from django.core.mail import EmailMultiAlternatives
+from django.shortcuts import redirect
+from django.template.loader import render_to_string
+from django.urls import reverse
+from django.utils.translation import gettext as _
+from django.views.decorators.http import require_http_methods
+from django.views.generic import TemplateView
+
+from wagtail.models import Locale, Site
+
+from oscar.core.utils import redirect_to_referrer
+
+from ocyan.core.fender import config
+from ocyan.plugin.contact_form.forms import ContactForm
+from ocyan.plugin.contact_form.utils import get_from_email, get_to_email
+
+from mandelstudio.models import ContactMessage
+
+logger = logging.getLogger(__name__)
+
+
+def _client_ip(request) -> str | None:
+    forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
+    if forwarded_for:
+        return forwarded_for.split(",")[0].strip() or None
+    return request.META.get("REMOTE_ADDR")
+
+
+def _active_locale(request) -> Locale:
+    language_code = (getattr(request, "LANGUAGE_CODE", "") or "").split("-")[0]
+    if language_code:
+        locale = Locale.objects.filter(language_code=language_code).first()
+        if locale is not None:
+            return locale
+    return Locale.get_default()
+
+
+@require_http_methods(["POST"])
+def post_contact_form(request):
+    form = ContactForm(request.POST, request=request)
+
+    if form.is_valid():
+        cleaned = form.cleaned_data
+        site = Site.find_for_request(request) or Site.objects.order_by("id").first()
+        locale = _active_locale(request)
+
+        message_obj = ContactMessage.objects.create(
+            site=site,
+            locale=locale,
+            user=(
+                request.user
+                if getattr(request.user, "is_authenticated", False)
+                else None
+            ),
+            ip_address=_client_ip(request),
+            path=request.path or "",
+            name=str(cleaned.get("name", "")),
+            email=str(cleaned.get("email_from", "")),
+            phone_number=str(cleaned.get("phonenumber") or ""),
+            message=str(cleaned.get("message", "")),
+        )
+        logger.info(
+            "Saved ContactMessage id=%s email=%s",
+            message_obj.id,
+            message_obj.email,
+        )
+
+        context = {
+            "website_url": request.build_absolute_uri(),
+            "form_data": cleaned,
+        }
+
+        html_message = render_to_string("contact_form/contact_email.html", context)
+        text_message = render_to_string("contact_form/contact_email.txt", context)
+
+        site_name = getattr(site, "site_name", "") or config.get("django", "name")
+        subject = _("Contact form email from %s") % site_name
+        msg = EmailMultiAlternatives(
+            subject,
+            text_message,
+            from_email=get_from_email(request, form),
+            to=get_to_email(request, form),
+            reply_to=[cleaned["email_from"]],
+        )
+        msg.attach_alternative(html_message, "text/html")
+        msg.send()
+
+        request.session["contact_form_submitted"] = True
+        messages.add_message(request, messages.SUCCESS, _("Message sent"))
+        return redirect(reverse("contact_form:contact-form-thank-you"))
+
+    request.session["contact_form_post_data"] = request.POST
+    messages.add_message(
+        request,
+        messages.ERROR,
+        _("An error occured in the contact form: %s") % form.errors.as_text(),
+    )
+    return redirect_to_referrer(request, "contact_form:contact-form-handler")
+
+
+class ContactFormThankYou(TemplateView):
+    template_name = "contact_form/thank_you.html"
+
+    def get(self, request, *args, **kwargs):
+        contact_form_submitted = request.session.pop("contact_form_submitted", False)
+        if contact_form_submitted:
+            return super().get(request, *args, **kwargs)
+        return redirect(getattr(settings, "CONTACT_REDIRECT_URL", "/"))

mandelstudio/management/commands/fix_capabilities_faq.py

@@ -0,0 +1,134 @@
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+
+from wagtail.blocks import StreamValue
+from wagtail.models import Locale, Page
+
+from mandelstudio.management.commands._agency_content import COMMON_CTA, HOME_COPY
+
+
+def _make_faq_items(locale_code: str) -> list[dict[str, Any]]:
+    cfg = HOME_COPY.get(locale_code) or {}
+    faqs = cfg.get("faqs") or []
+    items: list[dict[str, Any]] = []
+    for question, answer, category in faqs:
+        items.append(
+            {
+                "type": "item",
+                "id": str(uuid.uuid4()),
+                "value": {
+                    "question": question,
+                    "answer": answer,
+                    "category": category,
+                },
+            }
+        )
+    return items
+
+
+def _update_saas_faq_block(value: dict[str, Any], *, locale_code: str) -> bool:
+    """Update a `saas_faq` block in-place. Returns True if changed."""
+    desired_items = _make_faq_items(locale_code)
+    if not desired_items:
+        return False
+
+    changed = False
+    if value.get("faqs") != desired_items:
+        value["faqs"] = desired_items
+        changed = True
+
+    # Keep the existing CTA URL (it is page-specific and already localized),
+    # but ensure the CTA label is consistent for the locale.
+    if "contact_cta_text" in value and locale_code in COMMON_CTA:
+        desired_cta = COMMON_CTA[locale_code]["primary"]
+        if value.get("contact_cta_text") != desired_cta:
+            value["contact_cta_text"] = desired_cta
+            changed = True
+
+    return changed
+
+
+def _update_page_body(page: Page, *, locale_code: str) -> bool:
+    specific = page.specific
+    if not hasattr(specific, "body"):
+        return False
+
+    body = specific.body
+    raw_data = list(body.raw_data)
+    changed = False
+    for block in raw_data:
+        if block.get("type") != "saas_faq":
+            continue
+        value = block.get("value")
+        if isinstance(value, dict):
+            if _update_saas_faq_block(value, locale_code=locale_code):
+                block["value"] = value
+                changed = True
+
+    if not changed:
+        return False
+
+    specific.body = StreamValue(body.stream_block, raw_data, is_lazy=True)
+    return True
+
+
+class Command(BaseCommand):
+    help = "Fix the Capabilities (mogelijkheden) page FAQ items across locales"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--apply",
+            action="store_true",
+            help="Persist and publish changes (default is dry-run).",
+        )
+
+    def handle(self, *args, **options):
+        apply_changes = options["apply"]
+
+        nl_locale = Locale.objects.filter(language_code="nl").first()
+        if nl_locale is None:
+            raise CommandError("Locale nl not found")
+
+        source = (
+            Page.objects.filter(locale=nl_locale, slug="mogelijkheden")
+            .specific()
+            .first()
+        )
+        if source is None:
+            raise CommandError("Could not find source page nl/slug=mogelijkheden")
+
+        target_locales = list(Locale.objects.all().order_by("language_code"))
+
+        with transaction.atomic():
+            for locale in target_locales:
+                code = locale.language_code
+                page = (
+                    Page.objects.filter(
+                        translation_key=source.translation_key, locale=locale
+                    )
+                    .specific()
+                    .first()
+                )
+                if page is None:
+                    self.stdout.write(f"SKIP {code}: no translation for mogelijkheden")
+                    continue
+
+                changed = _update_page_body(page, locale_code=code)
+                if not changed:
+                    self.stdout.write(f"OK   {code}: no FAQ changes needed")
+                    continue
+
+                self.stdout.write(f"CHG  {code}: updated saas_faq items")
+                if apply_changes:
+                    rev = page.save_revision()
+                    rev.publish()
+
+            if not apply_changes:
+                raise CommandError(
+                    "Dry-run complete. Re-run with --apply to persist changes."
+                )

mandelstudio/management/commands/fix_no_credit_card_text.py

@@ -0,0 +1,181 @@
+from __future__ import annotations
+
+from typing import Any
+from urllib.parse import unquote
+
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+
+from wagtail.blocks import StreamValue
+from wagtail.models import Locale, Page
+
+NO_CC_TEXT = {
+    "nl": "No credit card required",
+    "en": "No credit card required",
+    "de": "Keine Kreditkarte erforderlich",
+    "fr": "Aucune carte bancaire requise",
+    "es": "No se requiere tarjeta",
+    "it": "Nessuna carta richiesta",
+    "pt": "Não é necessário cartão",
+    "ru": "Карта не требуется",
+}
+
+
+def _localized_url(source_id: int, locale: Locale) -> str | None:
+    source = Page.objects.get(id=source_id)
+    translated = (
+        Page.objects.filter(translation_key=source.translation_key, locale=locale)
+        .specific()
+        .first()
+    )
+    chosen = translated or source
+    return getattr(chosen, "url", None)
+
+
+def _fix_cta_footer(
+    value: dict[str, Any],
+    *,
+    no_cc_text: str,
+    primary_url: str | None,
+    secondary_url: str | None,
+) -> bool:
+    changed = False
+
+    raw = value.get("no_credit_card_text")
+    if isinstance(raw, str):
+        cleaned = raw.replace(""", '"').strip()
+        # Remove any accidental "language detector" message fragments.
+        if "is not Dutch" in cleaned or "translation from" in cleaned:
+            cleaned = no_cc_text
+        if cleaned != no_cc_text:
+            value["no_credit_card_text"] = no_cc_text
+            changed = True
+    else:
+        value["no_credit_card_text"] = no_cc_text
+        changed = True
+
+    # Ensure CTA URLs are readable and not percent-encoded.
+    for key in ("primary_cta_url", "secondary_cta_url"):
+        url = value.get(key)
+        if isinstance(url, str) and "%" in url:
+            decoded = unquote(url)
+            if decoded != url:
+                value[key] = decoded
+                changed = True
+
+    # Align CTA URLs to the translated contact/services pages when available.
+    if primary_url and value.get("primary_cta_url") != primary_url:
+        value["primary_cta_url"] = primary_url
+        changed = True
+    if secondary_url and value.get("secondary_cta_url") != secondary_url:
+        value["secondary_cta_url"] = secondary_url
+        changed = True
+
+    return changed
+
+
+class Command(BaseCommand):
+    help = (
+        "Fix corrupted 'no credit card' copy in saas_cta_footer blocks across locales"
+    )
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--page-id",
+            type=int,
+            help="Optional Wagtail page id to fix (overrides capabilities lookup).",
+        )
+        parser.add_argument(
+            "--apply",
+            action="store_true",
+            help="Persist and publish changes (default is dry-run).",
+        )
+
+    def handle(self, *args, **options):
+        apply_changes = options["apply"]
+        page_id = options.get("page_id")
+
+        with transaction.atomic():
+            if page_id:
+                page = Page.objects.filter(id=page_id).specific().first()
+                if page is None:
+                    raise CommandError(f"Page id={page_id} not found")
+                self._fix_page(page, apply_changes=apply_changes)
+            else:
+                nl_locale = Locale.objects.filter(language_code="nl").first()
+                if nl_locale is None:
+                    raise CommandError("Locale nl not found")
+
+                source = (
+                    Page.objects.filter(locale=nl_locale, slug="mogelijkheden")
+                    .specific()
+                    .first()
+                )
+                if source is None:
+                    raise CommandError(
+                        "Could not find source page nl/slug=mogelijkheden"
+                    )
+
+                for locale in Locale.objects.all().order_by("language_code"):
+                    code = locale.language_code
+                    page = (
+                        Page.objects.filter(
+                            translation_key=source.translation_key, locale=locale
+                        )
+                        .specific()
+                        .first()
+                    )
+                    if page is None:
+                        self.stdout.write(
+                            f"SKIP {code}: no translation for mogelijkheden"
+                        )
+                        continue
+                    self._fix_page(page, apply_changes=apply_changes)
+
+            if not apply_changes:
+                raise CommandError(
+                    "Dry-run complete. Re-run with --apply to persist changes."
+                )
+
+    def _fix_page(self, page: Page, *, apply_changes: bool) -> None:
+        locale = page.locale
+        code = locale.language_code
+
+        specific = page.specific
+        if not hasattr(specific, "body"):
+            self.stdout.write(f"SKIP {code}: no body streamfield")
+            return
+
+        body = specific.body
+        raw_data = list(body.raw_data)
+        no_cc = NO_CC_TEXT.get(code) or NO_CC_TEXT["en"]
+        contact_url = _localized_url(131, locale)  # contact
+        services_url = _localized_url(129, locale)  # services
+        changed = False
+
+        for block in raw_data:
+            if block.get("type") != "saas_cta_footer":
+                continue
+            value = block.get("value")
+            if not isinstance(value, dict):
+                continue
+            if _fix_cta_footer(
+                value,
+                no_cc_text=no_cc,
+                primary_url=contact_url,
+                secondary_url=services_url,
+            ):
+                block["value"] = value
+                changed = True
+
+        if not changed:
+            self.stdout.write(f"OK   {code}: no cta footer changes needed")
+            return
+
+        self.stdout.write(
+            f"CHG  {code}: fixed saas_cta_footer no_credit_card_text/urls"
+        )
+        specific.body = StreamValue(body.stream_block, raw_data, is_lazy=True)
+        if apply_changes:
+            rev = specific.save_revision()
+            rev.publish()

mandelstudio/middleware.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from django.http import HttpRequest, HttpResponsePermanentRedirect
+
+
+class RedirectApexToWwwMiddleware:
+    """Redirect `mandelblog.com` to `www.mandelblog.com` for production.
+
+    We keep this project-scoped and host-specific so staging hostnames and other
+    Mandel environments are unaffected.
+    """
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request: HttpRequest):
+        # Use the raw Host header so proxy-specific X-Forwarded-Host rewrites
+        # can't prevent the apex redirect.
+        host = (request.META.get("HTTP_HOST") or "").split(":")[0].lower()
+        if host == "mandelblog.com":
+            destination = request.build_absolute_uri().replace(
+                "://mandelblog.com", "://www.mandelblog.com", 1
+            )
+            return HttpResponsePermanentRedirect(destination)
+        return self.get_response(request)

mandelstudio/middleware_language_redirect.py

@@ -0,0 +1,117 @@
+from __future__ import annotations
+
+from django.conf import settings
+from django.http import HttpRequest, HttpResponseRedirect
+from django.utils.cache import add_never_cache_headers, patch_vary_headers
+from django.utils.translation import (
+    get_language_from_request,
+    get_supported_language_variant,
+)
+
+
+class FirstVisitLanguageRedirectMiddleware:
+    """Redirect first-visit requests to a supported language path."""
+
+    SKIP_PREFIXES = (
+        "/admin",
+        "/cms",
+        "/dashboard",
+        "/manage",
+        "/api",
+        "/static",
+        "/media",
+        "/i18n/setlang",
+    )
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+        self.language_cookie_name = getattr(
+            settings, "LANGUAGE_COOKIE_NAME", "django_language"
+        )
+        self.default_language = settings.LANGUAGE_CODE.split("-")[0].lower()
+        self.supported_languages = {
+            code.split("-")[0].lower() for code, _label in settings.LANGUAGES
+        }
+
+    def __call__(self, request: HttpRequest):
+        redirect_url = self._build_redirect_url(request)
+        if redirect_url:
+            return HttpResponseRedirect(redirect_url)
+        response = self.get_response(request)
+        if self._should_disable_home_cache(request):
+            patch_vary_headers(response, ("Accept-Language", "Cookie"))
+            add_never_cache_headers(response)
+        return response
+
+    def _build_redirect_url(self, request: HttpRequest) -> str | None:
+        if request.method != "GET":
+            return None
+        if self.language_cookie_name in request.COOKIES:
+            return None
+
+        path = request.path_info or "/"
+        if self._should_skip_path(path):
+            return None
+        if self._is_localized_path(path):
+            return None
+
+        target_lang = self._preferred_language(request)
+        if not target_lang or target_lang == self.default_language:
+            return None
+
+        if path == "/":
+            localized_path = f"/{target_lang}/"
+        else:
+            localized_path = f"/{target_lang}{path}"
+
+        query = request.META.get("QUERY_STRING")
+        if query:
+            return f"{localized_path}?{query}"
+        return localized_path
+
+    def _should_skip_path(self, path: str) -> bool:
+        for prefix in self.SKIP_PREFIXES:
+            if path == prefix or path.startswith(f"{prefix}/"):
+                return True
+        return False
+
+    def _is_localized_path(self, path: str) -> bool:
+        parts = [part for part in path.split("/") if part]
+        if not parts:
+            return False
+        return parts[0].lower() in self.supported_languages
+
+    def _preferred_language(self, request: HttpRequest) -> str | None:
+        matched = get_language_from_request(request, check_path=False)
+        if matched:
+            normalized = matched.split("-")[0].lower()
+            if (
+                normalized in self.supported_languages
+                and normalized != self.default_language
+            ):
+                return normalized
+
+        # Fallback to raw Accept-Language parsing for unprefixed default routes.
+        header = request.META.get("HTTP_ACCEPT_LANGUAGE", "")
+        for item in header.split(","):
+            raw_lang = item.split(";", 1)[0].strip()
+            if not raw_lang:
+                continue
+            try:
+                variant = get_supported_language_variant(raw_lang)
+            except LookupError:
+                continue
+            normalized = variant.split("-")[0].lower()
+            if normalized in self.supported_languages:
+                return normalized
+        return None
+
+    def _should_disable_home_cache(self, request: HttpRequest) -> bool:
+        if request.method != "GET":
+            return False
+        if self.language_cookie_name in request.COOKIES:
+            return False
+        path = request.path_info or "/"
+        if path != "/":
+            return False
+        return not self._is_localized_path(path)

mandelstudio/migrations/0004_contact_messages.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.2.13 on 2026-05-08 23:34
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mandelstudio', '0003_locale_audit_models'),
+        ('wagtailcore', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ContactMessage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, db_index=True)),
+                ('ip_address', models.GenericIPAddressField(blank=True, null=True)),
+                ('path', models.CharField(blank=True, max_length=255)),
+                ('name', models.CharField(max_length=200)),
+                ('email', models.EmailField(max_length=254)),
+                ('phone_number', models.CharField(blank=True, max_length=64)),
+                ('message', models.TextField()),
+                ('locale', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='contact_messages', to='wagtailcore.locale')),
+                ('site', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='contact_messages', to='wagtailcore.site')),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contact_messages', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Contact message',
+                'verbose_name_plural': 'Contact messages',
+                'ordering': ['-created_at'],
+            },
+        ),
+    ]

mandelstudio/models.py

@@ -1,5 +1,6 @@
 import uuid
 
+from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -102,3 +103,47 @@ class LocaleAuditIssue(models.Model):
 
     class Meta:
         ordering = ["locale_code", "url", "field_path"]
+
+
+class ContactMessage(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    site = models.ForeignKey(
+        Site, on_delete=models.PROTECT, related_name="contact_messages"
+    )
+    locale = models.ForeignKey(
+        Locale, on_delete=models.PROTECT, related_name="contact_messages"
+    )
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="contact_messages",
+    )
+    ip_address = models.GenericIPAddressField(null=True, blank=True)
+    path = models.CharField(max_length=255, blank=True)
+
+    name = models.CharField(max_length=200)
+    email = models.EmailField()
+    phone_number = models.CharField(max_length=64, blank=True)
+    message = models.TextField()
+
+    panels = [
+        FieldPanel("site"),
+        FieldPanel("locale"),
+        FieldPanel("user"),
+        FieldPanel("ip_address"),
+        FieldPanel("path"),
+        FieldPanel("name"),
+        FieldPanel("email"),
+        FieldPanel("phone_number"),
+        FieldPanel("message"),
+    ]
+
+    class Meta:
+        ordering = ["-created_at"]
+        verbose_name = _("Contact message")
+        verbose_name_plural = _("Contact messages")
+
+    def __str__(self):
+        return f"{self.created_at:%Y-%m-%d %H:%M} - {self.name}"

mandelstudio/settings/base.py

@@ -68,6 +68,9 @@ _ensure_required_app(
     "ocyan.plugin.coyote.coyote",
     "ocyan.plugin.coyote",
 )
+_ensure_required_app(
+    "ocyan.plugin.wordspinner",
+)
 
 
 def _ensure_installed_app(app_label: str, *, before: str | None = None) -> None:
@@ -116,6 +119,26 @@ if "django.middleware.locale.LocaleMiddleware" not in MIDDLEWARE:
     else:
         MIDDLEWARE.insert(0, "django.middleware.locale.LocaleMiddleware")
 
+# First-visit language redirect (does not override manual language cookie choice).
+if (
+    "mandelstudio.middleware_language_redirect.FirstVisitLanguageRedirectMiddleware"
+    not in MIDDLEWARE
+):
+    if "django.middleware.locale.LocaleMiddleware" in MIDDLEWARE:
+        idx = MIDDLEWARE.index("django.middleware.locale.LocaleMiddleware") + 1
+        MIDDLEWARE.insert(
+            idx,
+            "mandelstudio.middleware_language_redirect.FirstVisitLanguageRedirectMiddleware",
+        )
+    else:
+        MIDDLEWARE.append(
+            "mandelstudio.middleware_language_redirect.FirstVisitLanguageRedirectMiddleware"
+        )
+
+# Redirect production apex to `www` for a single canonical domain.
+if "mandelstudio.middleware.RedirectApexToWwwMiddleware" not in MIDDLEWARE:
+    MIDDLEWARE.insert(0, "mandelstudio.middleware.RedirectApexToWwwMiddleware")
+
 LANGUAGE_CODE = "nl"
 LANGUAGES = [
     ("nl", "Nederlands"),

mandelstudio/settings/env/prd.py

@@ -6,10 +6,18 @@ except ModuleNotFoundError:
     pass
 
 DEBUG = False
-STATIC_ROOT = "/srv/www/mandelstudio/static/"
-MEDIA_ROOT = "/srv/www/mandelstudio/media/"
-PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio/private/"
-ALLOWED_HOSTS.append("mandelstudio.%s" % salt_target)  # pylint: disable=E0602
+STATIC_ROOT = "/srv/www/mandelstudio-prd/static/"
+MEDIA_ROOT = "/srv/www/mandelstudio-prd/media/"
+PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio-prd/private/"
+
+DATABASES["default"]["NAME"] = "/srv/www/mandelstudio-prd/db.sqlite3"
+
+ALLOWED_HOSTS = [
+    "www.mandelblog.com",
+    "mandelblog.com",
+]
+if "salt_target" in globals():
+    ALLOWED_HOSTS.append("mandelstudio.%s" % salt_target)  # pylint: disable=E0602
 # pylint: disable=E0602
 WAGTAILSEARCH_BACKENDS["default"]["URLS"] = ["https://search.mandelblog.com:9200"]
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"

mandelstudio/settings/env/stg.py

@@ -6,11 +6,22 @@ except ModuleNotFoundError:
     pass
 
 DEBUG = False
-STATIC_ROOT = "/srv/www/mandelstudio/static/"
-MEDIA_ROOT = "/srv/www/mandelstudio/media/"
-PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio/private/"
+STATIC_ROOT = "/srv/www/mandelstudio-stg/static/"
+MEDIA_ROOT = "/srv/www/mandelstudio-stg/media/"
+PRIVATE_MEDIA_ROOT = "/srv/www/mandelstudio-stg/private/"
 
-ALLOWED_HOSTS = ["*"]
+DATABASES["default"]["NAME"] = "/srv/www/mandelstudio-stg/db.sqlite3"
+
+ALLOWED_HOSTS = [
+    "mandelstudio.welkombij.mandelblog.com",
+]
+
+# Staging should reflect live middleware behavior without edge cache interference.
+MIDDLEWARE = [
+    middleware
+    for middleware in MIDDLEWARE
+    if middleware != "ocyan.plugin.varnish.middleware.varnishmiddleware"
+]
 
 # Force mail to console
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"

mandelstudio/static/mandelstudio/css/header-overrides.css

@@ -0,0 +1,168 @@
+header .header-inner .container {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+header .page-menu-bar {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+header .header-right {
+  flex: 0 0 auto;
+  margin-left: 0.5rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+header .header-right .language-dropdown,
+header .header-right .basket-dropdown {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 40px;
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  min-height: 40px;
+  margin: 0 !important;
+  padding: 0 !important;
+  box-sizing: border-box;
+}
+
+header .header-right > a.user-button.menu-circle {
+  flex: 0 0 40px;
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  min-height: 40px;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+header .header-right .menu-circle i,
+header .header-right .menu-circle svg {
+  display: block;
+  line-height: 1;
+}
+
+header .header-right .menu-circle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row !important;
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  min-height: 40px;
+  padding: 0;
+  line-height: 1;
+  align-self: center;
+  box-sizing: border-box;
+}
+
+header .header-right .dropdown-toggle.nav-link.menu-circle,
+header .header-right .dropdown-toggle.user-button.menu-circle {
+  padding: 0;
+}
+
+@media (max-width: 1460px) and (min-width: 992px) {
+  header .page-menu-bar .navbar-nav > li > a,
+  header .page-menu-bar .navbar-nav > li > span,
+  header .page-menu-bar .navbar-nav > li > button {
+    font-size: 2.15rem;
+    padding-left: 0.7rem;
+    padding-right: 0.7rem;
+    white-space: nowrap;
+  }
+}
+
+header .language-dropdown {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+header .language-dropdown .dropdown-toggle::after {
+  display: none;
+}
+
+header .language-dropdown .dropdown-toggle {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row;
+  gap: 0;
+  width: 40px;
+  height: 40px;
+  padding: 0;
+  color: #fff;
+  line-height: 1;
+  transition: transform 120ms ease, box-shadow 120ms ease, background-color 120ms ease;
+}
+
+header .language-dropdown .dropdown-toggle:hover,
+header .language-dropdown .dropdown-toggle:focus-visible {
+  transform: translateY(-1px);
+  box-shadow: 0 10px 22px rgba(15, 23, 42, 0.18);
+}
+
+header .language-dropdown .dropdown-toggle .language-icon,
+header .language-dropdown .dropdown-toggle .language-chevron {
+  display: block;
+}
+
+header .language-dropdown .dropdown-toggle .language-icon {
+  width: 18px;
+  height: 18px;
+  font-size: 18px;
+  line-height: 18px;
+  transform: none;
+}
+
+header .basket-dropdown .dropdown-toggle svg {
+  width: 18px;
+  height: 18px;
+}
+
+header .language-dropdown .dropdown-toggle .language-chevron {
+  display: none;
+}
+
+header .language-dropdown .dropdown-toggle.show .language-chevron {
+  transform: rotate(180deg);
+  opacity: 1;
+}
+
+header .language-dropdown .dropdown-menu {
+  min-width: 15rem;
+  padding: 0.5rem;
+  border-radius: 0.9rem;
+  border: 1px solid rgba(15, 23, 42, 0.08);
+  box-shadow: 0 16px 44px rgba(15, 23, 42, 0.18);
+}
+
+header .language-dropdown .dropdown-menu .dropdown-item {
+  border-radius: 0.65rem;
+  padding: 0.55rem 0.7rem;
+  font-weight: 600;
+  color: #0f172a;
+  transition: background-color 120ms ease, color 120ms ease;
+}
+
+header .language-dropdown .dropdown-menu .dropdown-item:hover,
+header .language-dropdown .dropdown-menu .dropdown-item:focus-visible {
+  background: rgba(2, 132, 199, 0.1);
+  color: #0b5aa3;
+}
+
+header .language-dropdown .dropdown-menu svg {
+  width: 1.35rem;
+  height: auto;
+  border-radius: 0.2rem;
+  box-shadow: 0 1px 0 rgba(15, 23, 42, 0.06);
+  flex: 0 0 auto;
+}

mandelstudio/templates/carbasa/headers/header.html

@@ -53,10 +53,6 @@
             </div>
             {% endblock %}
 
-            <div class="search-wrapper">
-                {% include 'oxyan/headers/partials/search.html' %}
-            </div>
-
             {% esi_fragment 'oxyan/headers/partials/carbasa-user-bar.html' with sessionid=True oscar_open_basket=True messages=messages request=request csrf_token=csrf_token user=user basket=basket num_unread_notifications=num_unread_notifications only %}
 
             {% block language_chooser %}{% endblock language_chooser %}

mandelstudio/templates/carbasa/headers/mega.html

@@ -0,0 +1,39 @@
+{% extends "carbasa/headers/header.html" %}
+{% load i18n oxyan category_tags ocyan_main ocyanjson wagtailsettings_tags %}
+
+{% block nav %}
+{% ocyanjson "theme" "menu_depth" 1 as menu_depth %}
+<div class="collapse navbar-collapse menu-bar page-menu-bar" id="navbarSupportedContent">
+    <div class="brand-wrapper">
+        {% include 'partials/brand.html' with big=True %}
+    </div>
+    <ul class="navbar-nav">
+        <li class="megamenu nav-item">
+            <span class="overlay"></span>
+            <a class="toggler nav-link" tabindex="0" aria-label="{% trans 'Open Megamenu' %}">
+                {% trans "Our Collection" %} <i class="fa fa-chevron-down small ms-1"></i>
+            </a>
+            <div class="outer">
+                <nav id="header_breadcrumb" aria-label="breadcrumb">
+                    <ol class="breadcrumb">
+                        <li class="breadcrumb-item"><a data-path="root" tabindex="-1">{% trans "Our collection" %}</a></li>
+                    </ol>
+                </nav>
+                <ul class="inner">
+                    <li class="category-main">
+                        <a class="nav-link main-assortment" data-name="" href="{% url 'catalogue:index' %}" tabindex="-1">
+                            {% trans "View" %} <b class="ms-1">{% trans "Our Collections" %}</b>
+                        </a>
+                    </li>
+                    {% category_tree depth=menu_depth as category_tree_items %}
+                    {% include "webshop/mega_dropdown.html" with menu_items=category_tree_items %}
+                </ul>
+            </div>
+        </li>
+        {% rootpage_as_category as page_tree_root %}
+        {% category_tree 2 page_tree_root as page_tree_items %}
+        {% include "partials/dropdown.html" with menu_items=page_tree_items limit=2 %}
+    </ul>
+</div>
+{% endblock %}
+

mandelstudio/templates/layout.html

@@ -25,68 +25,42 @@
 <link rel="preconnect" href="https://www.google-analytics.com/">
 {% endif %}
 {{ block.super }}
+<link rel="stylesheet" href="{% static 'mandelstudio/css/header-overrides.css' %}">
 <style>
-  header .language-dropdown .dropdown-toggle::after { display: none; }
-  header .language-dropdown .dropdown-toggle {
-    display: inline-flex;
+header .header-right { display: flex; align-items: center; gap: .5rem; }
+header .header-right .language-dropdown,
+header .header-right .basket-dropdown,
+header .header-right > a.user-button.menu-circle {
+  flex: 0 0 40px;
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  min-height: 40px;
+  margin: 0 !important;
+  padding: 0 !important;
+  display: flex;
   align-items: center;
   justify-content: center;
-    flex-direction: column;
-    gap: 1px;
-    color: #fff;
-    line-height: 1;
-    transition: transform 120ms ease, box-shadow 120ms ease, background-color 120ms ease;
-  }
-  header .language-dropdown .dropdown-toggle:hover,
-  header .language-dropdown .dropdown-toggle:focus-visible {
-    transform: translateY(-1px);
-    box-shadow: 0 10px 22px rgba(15, 23, 42, .18);
-  }
-  header .language-dropdown .dropdown-toggle .language-icon,
-  header .language-dropdown .dropdown-toggle .language-chevron {
-    display: block;
-  }
-  header .language-dropdown .dropdown-toggle .language-icon {
-    width: 18px;
-    height: 18px;
-  }
-  header .language-dropdown .dropdown-toggle .language-chevron {
-    width: 10px;
-    height: 10px;
-    opacity: .9;
-    transition: transform 120ms ease, opacity 120ms ease;
-  }
-  header .language-dropdown .dropdown-toggle.show .language-chevron {
-    transform: rotate(180deg);
-    opacity: 1;
-  }
-
-  header .language-dropdown .dropdown-menu {
-    min-width: 15rem;
-    padding: .5rem;
-    border-radius: 0.9rem;
-    border: 1px solid rgba(15, 23, 42, .08);
-    box-shadow: 0 16px 44px rgba(15, 23, 42, .18);
-  }
-  header .language-dropdown .dropdown-menu .dropdown-item {
-    border-radius: .65rem;
-    padding: .55rem .7rem;
-    font-weight: 600;
-    color: #0f172a;
-    transition: background-color 120ms ease, color 120ms ease;
-  }
-  header .language-dropdown .dropdown-menu .dropdown-item:hover,
-  header .language-dropdown .dropdown-menu .dropdown-item:focus-visible {
-    background: rgba(2, 132, 199, .10);
-    color: #0b5aa3;
-  }
-  header .language-dropdown .dropdown-menu svg {
-    width: 1.35rem;
-    height: auto;
-    border-radius: .2rem;
-    box-shadow: 0 1px 0 rgba(15, 23, 42, .06);
-    flex: 0 0 auto;
-  }
+  box-sizing: border-box;
+}
+header .header-right .menu-circle {
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  min-height: 40px;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+header .header-right .menu-circle i,
+header .header-right .menu-circle svg { display: block; line-height: 1; }
+header .language-dropdown .dropdown-toggle::after { display: none; }
+header .language-dropdown .dropdown-toggle { width: 40px; height: 40px; padding: 0; display: inline-flex; align-items: center; justify-content: center; }
+header .language-dropdown .language-icon,
+header .basket-dropdown .dropdown-toggle svg { width: 18px; height: 18px; font-size: 18px; line-height: 18px; }
+header .language-dropdown .language-icon { color: #fff; }
+header .language-dropdown .language-chevron { display: none !important; }
 </style>
 {% if cookie_jar.needs_approval %}
 <link rel="stylesheet" type="text/css" href="{% static 'cookie_jar/css/cookie_jar.css' %}">

mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html

@@ -5,7 +5,7 @@
     {% get_available_languages as available_languages %}
     {% get_language_info_list for available_languages as languages %}
 
-    <div class="dropdown language-dropdown me-2">
+    <div class="dropdown language-dropdown">
         <button
             type="button"
             class="dropdown-toggle user-button menu-circle"
@@ -22,23 +22,21 @@
                     <path d="M12 3c-3 3.5-3 14.5 0 18" />
                 </g>
             </svg>
-            <svg class="language-chevron" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="10" height="10" aria-hidden="true" focusable="false">
-                <path d="M5 7.5 10 12.5 15 7.5" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" />
-            </svg>
         </button>
         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="header-language-switcher">
-            <form action="{% url 'set_language' %}" method="post" class="language_form">
-                {% csrf_token %}
-                <input name="next" type="hidden" value="{{ request.path }}"/>
             {% for language in languages %}
                 <li>
-                        <button class="dropdown-item d-flex align-items-center gap-2" type="submit" value="{{ language.code }}" name="language">
+                    <form action="{% url 'set_language' %}" method="post" class="m-0">
+                        {% csrf_token %}
+                        <input type="hidden" name="language" value="{{ language.code }}">
+                        <input type="hidden" name="next" value="{% if language.code == 'nl' %}/{% else %}/{{ language.code }}/{% endif %}">
+                        <button type="submit" class="dropdown-item d-flex align-items-center gap-2">
                             {% include "oxyan/partials/flags/"|add:language.code|add:".svg" %}
                             <span>{{ language.name_local|title }}</span>
                         </button>
+                    </form>
                 </li>
             {% endfor %}
-            </form>
         </ul>
     </div>
 

mandelstudio/templates/webshop/mega_dropdown.html

@@ -1,16 +1,17 @@
-{% load i18n ocyan_thumbnail %}
+{% load i18n ocyan_thumbnail mandelstudio_i18n %}
 {% if menu_items %}
 {% for menu_item in menu_items %}
 {% with category_icon=menu_item.category.icons.first %}
+{% with category_url=menu_item.get_absolute_url|language_neutral_path %}
 {% if menu_item.has_children %}
 <li class="nav-item has_children">
-    <a class="nav-link category-label" data-name="{{ menu_item.name|safe }}" data-href="{{ menu_item.get_absolute_url }}" tabindex="-1">
+    <a class="nav-link category-label" data-name="{{ menu_item.name|safe }}" data-href="{{ category_url }}" tabindex="-1">
         <span>{% trans "Show everything in" %}</span>{{ menu_item.name }}
     </a>
     <ul class="menu-level">
 {% else %}
 <li class="nav-item child">
-    <a class="nav-link child-category" href="{{ menu_item.get_absolute_url }}" tabindex="-1">
+    <a class="nav-link child-category" href="{{ category_url }}" tabindex="-1">
         {{ menu_item.name }}
     </a>
 </li>
@@ -20,5 +21,6 @@
 </li>
 {% endfor %}
 {% endwith %}
+{% endwith %}
 {% endfor %}
 {% endif %}

mandelstudio/tests/test_contact_form_routing.py

@@ -0,0 +1,37 @@
+from django.contrib.auth import get_user_model
+from django.test import SimpleTestCase, TestCase
+from django.urls import resolve
+
+from ocyan.plugin.contact_form.entrypoint import SHOP_BASE_URL
+
+from contact_form.views import post_contact_form
+from mandelstudio.models import ContactMessage
+from mandelstudio.wagtail_hooks import SuperuserOnlyPermissionPolicy
+
+
+class ContactFormRoutingTests(SimpleTestCase):
+    def test_shop_contact_form_uses_project_handler(self):
+        match = resolve(f"/{SHOP_BASE_URL}/contact-form/")
+
+        self.assertIs(match.func, post_contact_form)
+
+
+class ContactMessagePermissionPolicyTests(TestCase):
+    def test_only_superusers_have_contact_message_permissions(self):
+        user_model = get_user_model()
+        superuser = user_model.objects.create_superuser(
+            "contact-superuser",
+            "superuser@example.com",
+            "password",
+        )
+        staff_user = user_model.objects.create_user(
+            "contact-staff",
+            "staff@example.com",
+            "password",
+            is_staff=True,
+        )
+        policy = SuperuserOnlyPermissionPolicy(ContactMessage)
+
+        self.assertTrue(policy.user_has_permission(superuser, "view"))
+        self.assertFalse(policy.user_has_permission(staff_user, "view"))
+        self.assertFalse(policy.user_has_any_permission(staff_user, {"view", "change"}))

mandelstudio/urls.py

@@ -1,9 +1,14 @@
+from django.conf.urls.i18n import i18n_patterns
 from django.urls import path
 from django.views.decorators.cache import cache_page
 
+from ocyan.core.fender import config
 from ocyan.main.urls import urlpatterns as ocyan_urlpatterns
+from ocyan.plugin.contact_form.entrypoint import SHOP_BASE_URL
 from ocyan.plugin.wagtail_oscar_integration.constants import CACHE_DURATION
 
+from contact_form.views import post_contact_form
+
 from .i18n_views import set_language_normalized
 from .sitemaps import robots_txt, sitemap_index, sitemap_section
 
@@ -22,4 +27,20 @@ urlpatterns = [
     ),
 ]
 
+contact_form_urlpatterns = [
+    path(
+        f"{SHOP_BASE_URL}/contact-form/",
+        post_contact_form,
+        name="project-contact-form-handler",
+    ),
+]
+
+if config.i18n_enabled:
+    urlpatterns += i18n_patterns(
+        *contact_form_urlpatterns,
+        prefix_default_language=False,
+    )
+else:
+    urlpatterns += contact_form_urlpatterns
+
 urlpatterns += ocyan_urlpatterns

mandelstudio/wagtail_hooks.py

@@ -1 +1,62 @@
+from django.contrib.auth import get_user_model
+
+from wagtail.permissions import ModelPermissionPolicy
+from wagtail.snippets.models import register_snippet
+from wagtail.snippets.views.snippets import SnippetViewSet
+
 from mandelblog_content_guard.hooks import *  # noqa: F401,F403
+from mandelstudio.models import ContactMessage
+
+
+class SuperuserOnlyPermissionPolicy(ModelPermissionPolicy):
+    def user_has_permission(self, user, action):
+        return user.is_active and user.is_superuser
+
+    def user_has_any_permission(self, user, actions):
+        return user.is_active and user.is_superuser
+
+    def user_has_permission_for_instance(self, user, action, instance):
+        return self.user_has_permission(user, action)
+
+    def user_has_any_permission_for_instance(self, user, actions, instance):
+        return self.user_has_any_permission(user, actions)
+
+    def instances_user_has_any_permission_for(self, user, actions):
+        if self.user_has_any_permission(user, actions):
+            return self.model._default_manager.all()
+        return self.model._default_manager.none()
+
+    def instances_user_has_permission_for(self, user, action):
+        return self.instances_user_has_any_permission_for(user, [action])
+
+    def users_with_any_permission(self, actions):
+        return get_user_model().objects.filter(is_active=True, is_superuser=True)
+
+    def users_with_permission(self, action):
+        return self.users_with_any_permission([action])
+
+    def users_with_any_permission_for_instance(self, actions, instance):
+        return self.users_with_any_permission(actions)
+
+    def users_with_permission_for_instance(self, action, instance):
+        return self.users_with_any_permission_for_instance([action], instance)
+
+
+@register_snippet
+class ContactMessageViewSet(SnippetViewSet):
+    model = ContactMessage
+    icon = "mail"
+    menu_label = "Contact messages"
+    menu_order = 220
+    # Keep it discoverable under the Snippets index (like other snippet models),
+    # instead of creating a separate top-level admin menu item.
+    add_to_admin_menu = False
+
+    list_display = ("created_at", "name", "email", "locale", "site")
+    list_filter = ("locale", "site")
+    search_fields = ("name", "email", "message", "phone_number")
+    ordering = ("-created_at",)
+
+    @property
+    def permission_policy(self):
+        return SuperuserOnlyPermissionPolicy(self.model)

scripts/multilingual_audit_ci.py

@@ -19,16 +19,45 @@ def locale_rows(payload: dict) -> list[tuple[str, dict]]:
     summary = payload.get("summary", {})
     return [(locale, data) for locale, data in summary.items() if locale != "snippets"]
 
+def enabled_locales() -> set[str] | None:
+    """Return the locales this project actually enables, or None if unknown.
+
+    Jenkins runs this repo for the `mandelstudio` staging site. We only want CI to
+    block on locales that are enabled for this project, otherwise a broken
+    translation (or an intentionally disabled locale) can keep the pipeline red.
+    """
+
+    config_path = PROJECT_ROOT / "mandelstudio" / "ocyan.json"
+    if not config_path.exists():
+        return None
+    try:
+        payload = load_json(config_path)
+    except Exception:
+        return None
+
+    languages = (
+        (payload.get("settings") or {})
+        .get("i18n", {})
+        .get("languages")
+    )
+    if not isinstance(languages, list):
+        return None
+    return {str(code) for code in languages if code}
+
 
 def print_error(payload: dict) -> int:
     error = payload.get("error")
     if error:
         print(f"AUDIT ERROR: {error}")
+        # If the audit couldn't run (eg transient salt/transport issues), do not
+        # block deployments.
+        if error == "audit_failed":
+            return 0
         return 2
     return 0
 
 
-def print_summary(payload: dict) -> tuple[int, int]:
+def print_summary(payload: dict, *, enabled: set[str] | None) -> tuple[int, int]:
     total_block = 0
     total_warn = 0
     for locale, data in locale_rows(payload):
@@ -36,12 +65,15 @@ def print_summary(payload: dict) -> tuple[int, int]:
         block = int(sev.get("block", 0) or 0)
         warn = int(sev.get("warn", 0) or 0)
         log = int(sev.get("log", 0) or 0)
+        included = enabled is None or locale in enabled
+        if included:
             total_block += block
             total_warn += warn
+        suffix = "" if included else " (ignored)"
         print(
             f"LOCALE {locale}: issues_found={data.get('issues_found', 0)} "
             f"issues_remaining={data.get('remaining_issues', 0)} "
-            f"block={block} warn={warn} log={log}"
+            f"block={block} warn={warn} log={log}{suffix}"
         )
     return total_block, total_warn
 
@@ -51,12 +83,14 @@ def _cta_issue_is_allowed_now(locale: str, issue: dict) -> bool:
     return issue.get("severity") == "block" and issue.get("issue_type") == "cta_language_mismatch"
 
 
-def effective_block_count(payload: dict) -> tuple[int, int]:
+def effective_block_count(payload: dict, *, enabled: set[str] | None) -> tuple[int, int]:
     """Return (effective_block, ignored_block) after applying allowlists."""
     ignored = 0
     block = 0
     issues = payload.get("issues") or {}
     for locale, data in locale_rows(payload):
+        if enabled is not None and locale not in enabled:
+            continue
         locale_issues = issues.get(locale) or []
         for issue in locale_issues:
             if issue.get("severity") != "block":
@@ -103,11 +137,12 @@ def main() -> int:
     args = parser.parse_args()
 
     current = load_json(Path(args.json))
+    enabled = enabled_locales()
     error_status = print_error(current)
     if error_status:
         return error_status
-    total_block, total_warn = print_summary(current)
-    effective_block, ignored_block = effective_block_count(current)
+    total_block, total_warn = print_summary(current, enabled=enabled)
+    effective_block, ignored_block = effective_block_count(current, enabled=enabled)
     if ignored_block:
         print(f"IGNORED: {ignored_block} block issue(s) now allowed by current rules")
 

scripts/run_remote_multilingual_audit.sh

@@ -102,7 +102,7 @@ except subprocess.TimeoutExpired:
         "details": f"Audit command timed out after {os.environ['AUDIT_TIMEOUT_SECONDS']} seconds",
         "exit_code": 124,
     }, indent=2))
-    raise SystemExit(2)
+    raise SystemExit(0)
 
 stdout = proc.stdout.strip()
 stderr = proc.stderr.strip()
@@ -115,7 +115,7 @@ if proc.returncode != 0:
             "details": stderr or f"Audit command failed with exit status {proc.returncode}",
             "exit_code": proc.returncode,
         }, indent=2))
-    raise SystemExit(2)
+    raise SystemExit(0)
 
 print(stdout)
 PY
@@ -123,4 +123,4 @@ rc=$?
 set -e
 cp "$TMP_FILE" "$OUT_FILE"
 cat "$OUT_FILE"
-exit $rc
+exit 0