From 118c206bb1d53e402088b9eae6a2eda597744d8c Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Tue, 7 Jan 2025 11:05:15 +0100
Subject: [PATCH] Set locale properly if locale is already in query string

---
 src/pretix/presale/templates/pretixpresale/event/base.html     | 3 ++-
 .../presale/templates/pretixpresale/organizers/base.html       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html
index b925deb12..fd9a996fc 100644
--- a/src/pretix/presale/templates/pretixpresale/event/base.html
+++ b/src/pretix/presale/templates/pretixpresale/event/base.html
@@ -1,4 +1,5 @@
 {% extends "pretixpresale/base.html" %}
+{% load urlreplace %}
 {% load i18n %}
 {% load static %}
 {% load thumb %}
@@ -44,7 +45,7 @@
                         <nav class="locales" aria-label="{% trans "select language" %}">
                             <ul>
                             {% for l in languages %}
-                                <li><a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}{% if request.META.QUERY_STRING %}%3F{{ request.META.QUERY_STRING|urlencode }}{% endif %}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow" lang="{{ l.code }}" hreflang="{{ l.code }}"
+                                <li><a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}{% if request.META.QUERY_STRING %}%3F{% url_replace request "locale" "" %}{% endif %}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow" lang="{{ l.code }}" hreflang="{{ l.code }}"
                                     aria-label="{% language l.code %}{% blocktrans trimmed with language=l.name_local %}
                                         Website in {{ language }}
                                         {% endblocktrans %}{% endlanguage %}">{{ l.name_local }}</a></li>
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/base.html b/src/pretix/presale/templates/pretixpresale/organizers/base.html
index c1cd81f85..cd3bd346a 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/base.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/base.html
@@ -1,4 +1,5 @@
 {% extends "pretixpresale/base.html" %}
+{% load urlreplace %}
 {% load i18n %}
 {% load static %}
 {% load thumb %}
@@ -26,7 +27,7 @@
                     {% if organizer.settings.locales|length > 1 %}
                         <nav class="locales" aria-label="{% trans "select language" %}">
                             {% for l in languages %}
-                                <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow"
+                                <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}{% if request.META.QUERY_STRING %}%3F{% url_replace request "locale" "" %}{% endif %}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow"
                                     lang="{{ l.code }}" hreflang="{{ l.code }}"
                                     aria-label="{% language l.code %}{% blocktrans trimmed with language=l.name_local %}
                                         Website in {{ language }}