From 89773de4d1406b6e328969edf6e594e3bde807cf Mon Sep 17 00:00:00 2001
From: Mandel Olaiya <mandeleolaiya15@icloud.com>
Date: Fri, 10 Apr 2026 22:21:02 +0200
Subject: [PATCH] fix(i18n): normalize manage language-switch next URL

---
 .../templates/oxyan/headers/partials/carbasa-user-bar.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
index d4dbe0f..d071355 100644
--- a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
+++ b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
@@ -3,7 +3,7 @@
 <div class="header-right">
     <form action="{% url 'set_language' %}" method="post" class="ms-lang-switcher me-2" aria-label="Language switcher">
         {% csrf_token %}
-        <input name="next" type="hidden" value="{{ request.get_full_path }}">
+        <input name="next" type="hidden" value="{{ language_neutral_url_path|default:request.path|untranslated_url }}">
         <label for="header-language-switcher" class="visually-hidden">{% trans "Language" %}</label>
         <select id="header-language-switcher" name="language" class="form-select form-select-sm" onchange="this.form.submit()">
             <option value="nl" {% if LANGUAGE_CODE == 'nl' %}selected{% endif %}>NL</option>