Fix language switcher

goanpeca · goanpeca · commit b9269b76e441 · 2025-05-19T09:06:26.000-05:00
diff --git a/content/_includes/masthead.html b/content/_includes/masthead.html
@@ -12,6 +12,8 @@
   {% assign page_language = site.default_language %}
 {% endunless %}
 
+<h1>{{ page_language }}</h1>
+
 {% capture logo_path %}{{ site.logo }}{% endcapture %}
 <div class="masthead">
   <div class="masthead__inner-wrap">
diff --git a/content/_layouts/default.html b/content/_layouts/default.html
@@ -14,12 +14,17 @@
   {% assign page_language = site.default_language %}
 {% endunless %}
 
+<h1>{{ page_language }}</h1>
+
 <!doctype html>
 {% include copyright.html %}
 <html lang="{{ page_language }}" class="no-js">
   <head>
     {% include head.html %}
     {% include head/custom.html %}
+    <script type="text/javascript">
+      localStorage.setItem("page_language", "{{ page_language }}");
+    </script>
   </head>
 
   <body class="layout--{{ page.layout | default: layout.layout }}{% if page.classes or layout.classes %}{{ page.classes | default: layout.classes | join: ' ' | prepend: ' ' }}{% endif %}" dir="{% if site.rtl %}rtl{% else %}ltr{% endif %}">
diff --git a/content/assets/js/language_switcher.js b/content/assets/js/language_switcher.js
@@ -1,9 +1,11 @@
 window.addEventListener("DOMContentLoaded", function() {
   let current_language = localStorage.getItem("current_language");
-  if (current_language === null) {
+  let page_language = localStorage.getItem("page_language");
+  if (current_language !== page_language) {
     // No language set, defaulting to English
-    current_language = "en";
+    current_language = page_language || "en";
   }
+  console.log(current_language);
   // Set the option in the select element to have the "selected" attribute
   var selectElement = document.getElementById("select_language");
   var selectedOption = selectElement.querySelector(
@@ -16,18 +18,15 @@ window.addEventListener("DOMContentLoaded", function() {
 
 // Change language for current page
 function change_language() {
+  let page_language = localStorage.getItem("page_language");
   var selectElement = document.getElementById("select_language");
-  var value = selectElement.options[selectElement.selectedIndex].value;
+  var new_language = selectElement.options[selectElement.selectedIndex].value;
 
   // Get the current page URL
   const currentPageUrl = window.location.href;
-  const old_language = localStorage.getItem("current_language");
-
-  localStorage.setItem("current_language", value);
-  // Update the lang attribute of the HTML element
-  document.documentElement.setAttribute("lang", value);
+  localStorage.setItem("current_language", new_language);
   window.location.href = currentPageUrl.replace(
-    "/" + old_language + "/",
-    "/" + value + "/"
+    "/" + page_language + "/",
+    "/" + new_language + "/"
   );
 }
