Merge pull request #4609 from kobotoolbox/3804-language-selector-in-a…

…ll-django-templates Make language selector being available in all templates
kobotoolbox · Sep 1, 2023 · 26ae72b · 26ae72b
2 parents 5ac0c9c + a93f911
commit 26ae72b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/kobo/apps/accounts/templates/account/base.html b/kobo/apps/accounts/templates/account/base.html
@@ -23,6 +23,32 @@
     {% endif %}
 {% endblock %}
 
+{% block language_selector %}
+{% load i18n %}
+{# This is the language switcher dropdown #}
+<form action="{% url 'set_language' %}" method="post" class="language-switcher">
+  {% csrf_token %}
+
+  <input name="next" type="hidden" value="{{ redirect_to }}" />
+
+  <select name="language" onchange="this.form.submit()">
+    {% get_current_language as LANGUAGE_CODE %}
+    {% get_available_languages as LANGUAGES %}
+    {% get_language_info_list for LANGUAGES as languages %}
+    {% for language in languages %}
+      <option
+        value="{{ language.code }}"
+        {% if language.code == LANGUAGE_CODE %}selected="selected"{% endif %}
+      >
+        {{ language.name_local }}
+      </option>
+    {% endfor %}
+  </select>
+
+  <input type="submit" value="Go" class="hidden" />
+</form>
+{% endblock %}
+
 {% block content %}
 {% endblock %}
 

diff --git a/kobo/apps/accounts/templates/account/signup.html b/kobo/apps/accounts/templates/account/signup.html
@@ -1,24 +1,9 @@
-{% extends "account/base.html" %} {% load static %}
+{% extends "account/base.html" %}
+{% load static %}
 {% load i18n %}
 {% load account get_provider_appname socialaccount %}
 
 {% block content %}
-<form action="{% url 'set_language' %}" method="post" class="language-switcher">
-  {% csrf_token %}
-    <input name="next" type="hidden" value="{{ redirect_to }}" />
-    <select name="language" onchange="this.form.submit()">
-        {% get_current_language as LANGUAGE_CODE %}
-        {% get_available_languages as LANGUAGES %}
-        {% get_language_info_list for LANGUAGES as languages %}
-        {% for language in languages %}
-            <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                {{ language.name_local }}
-            </option>
-        {% endfor %}
-    </select>
-    <input type="submit" value="Go" class="hidden" />
-</form>
-
 <form action="." method="post" class="registration registration--register">
   <div class="registration--logo">
     <a href="/">

diff --git a/kpi/templates/base.html b/kpi/templates/base.html
@@ -23,6 +23,7 @@
 </head>
 <body>
 <div class="registration__bg">
+{% block language_selector %}{% endblock %}
 {% block content %}{% endblock %}
 {% if livereload_address %}
 <script src="{{livereload_address}}"></script>