From 5073d83d60bb3e29f790603bc226d503185d719f Mon Sep 17 00:00:00 2001
From: Pomax <pomax@nihongoresources.com>
Date: Thu, 27 May 2021 16:02:58 -0700
Subject: [PATCH] fix the language picker by making sure 'next' is the right
 URL

---
 .../templates/fragments/language_switcher.html    | 15 ++++++++-------
 .../wagtailpages/templatetags/localization.py     |  6 ++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/network-api/networkapi/templates/fragments/language_switcher.html b/network-api/networkapi/templates/fragments/language_switcher.html
index 6bbe1fb130d..0aed1e0b841 100644
--- a/network-api/networkapi/templates/fragments/language_switcher.html
+++ b/network-api/networkapi/templates/fragments/language_switcher.html
@@ -1,15 +1,16 @@
-{% load i18n localization %}
+{% load i18n localization wagtailcore_tags %}
+
+{% get_current_language as current_language %}
+{% get_local_language_names as languages %}
 
 <form action="{% url 'set_language' %}" method="post">
-  <input name="next" type="hidden" value="{{ request.path }}">
+  <input name="next" type="hidden" value="{% get_unlocalized_url page current_language %}" />
   <div class="d-flex flex-column flex-md-row align-items-md-center justify-content-center mb-md-0">
     <label class="h5-heading mb-0 d-flex align-items-center globe-glyph medium" for="language-switcher">{% trans "Language" %}</label>
     <select name="language" id="language-switcher" class="mt-3 mt-md-0 ml-md-3 w-100 form-control" onchange="this.form.submit()">
-      {% get_current_language as LANGUAGE_CODE %}
-      {% get_local_language_names as LANGUAGES %}
-      {% for CODE, NAME in LANGUAGES %}
-        <option value="{{ CODE }}"{% if CODE == LANGUAGE_CODE %} selected{% endif %}>
-          {{ NAME | capfirst }}
+      {% for language_code, language_name in languages %}
+        <option value="{{ language_code }}"{% if language_code == current_language %} selected{% endif %}>
+          {{ language_name | capfirst }}
         </option>
       {% endfor %}
     </select>
diff --git a/network-api/networkapi/wagtailpages/templatetags/localization.py b/network-api/networkapi/wagtailpages/templatetags/localization.py
index f4fb0ef95de..5e44e591587 100644
--- a/network-api/networkapi/wagtailpages/templatetags/localization.py
+++ b/network-api/networkapi/wagtailpages/templatetags/localization.py
@@ -43,3 +43,9 @@ def get_local_language_names():
     for lang in settings.LANGUAGES:
         languages.append([lang[0], get_language_info(lang[0])['name_local']])
     return sorted(languages, key=lambda x: locale.strxfrm(unicodedata.normalize('NFD', x[1])).casefold())
+
+
+# Get the url for a page, but with the locale code removed.
+@register.simple_tag()
+def get_unlocalized_url(page, locale):
+    return page.get_url().replace(f'/{locale}/', '/', 1)