linaro-jekyll-theme 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1bdd8de5ea876f98e9a2f4e44c45bfc80876a7f5ee1323d492efdf06ecc0bf
-  data.tar.gz: 1164f51ed8abb2df3523181e46dab78a1f6f902978d13dddc92053e7fb1f5e06
+  metadata.gz: dae9e039186802f8d1895a3f31e57466af8df2b5093c9804102884b1d663cddf
+  data.tar.gz: 39b3bb094a73e3ba9b482aa587db2c9f93a8e4f0f119dc4bae786e05ed715820
 SHA512:
-  metadata.gz: e21f998d31280cd195aa71cce2f969b3bd46afe69ada174a7dc162fb536ca612869050dbc4fe554670e94a5ed7943a6d7f62646a3bb2bfe555a10ddae88cd7d2
-  data.tar.gz: f02a9000883c1576320cb6c6e7c61b93675819d836ca3f094910726c1f3b71c3af8dbb3bf78b3b382c758b4195c678a28ec109267cee5aa85229d7ab7f2eb8cc
+  metadata.gz: 1dccff4593e73d1af9ff38c052ea0103a3a6121ab9654f4980de9741ac03e4b18879480adad66a86aadfbb4d8e51eda6e22ef1304d9b9aadff39b41772c0ccc9
+  data.tar.gz: d2d066ca73293225eec6f235bb5200d5074abc53db605be25fc3f141de22c98ed1c400eca3aadef2f026c022feadf54fa61922ff2567dc3a7bcd4261d7ff89f9

data/_includes/footer/footer.html

@@ -15,9 +15,9 @@
                         {% include_cached social_media_icons.html %}
                     </div>
                     {% if site.i18n_enabled %}
-                    <div class="col col-12 text-white text-center">
+                    <div class="col col-12 text-white text-center" id="language_switcher">
                         {% for lang in site.languages %}
-                            <a {% if lang == site.active_lang %}style="font-weight: bold;"{% endif %} {% static_href %}href="{% if lang == site.default_lang %}{{site.baseurl}}{{page.url}}{% else %}{{site.baseurl}}/{{ lang }}{{page.url}}{% endif %}"{% endstatic_href %} >{{ lang }}</a>
+                            <a data-lang="{{lang}}" {% if lang == site.active_lang %}style="font-weight: bold;"{% endif %} href="#" class="lang_anchor">{{ lang }}</a>
                             {% unless forloop.last %}
                                 <span class="coloured-bp">&bull;</span>
                             {% endunless %}

data/assets/js/app/custom.js

@@ -0,0 +1,79 @@
+// i18n support
+$(document).ready(function () {
+  // Check if i18n functionality is enabled.
+  if ($("#language_switcher").length > 0) {
+    const i18n_site_versions = {
+      en: "/",
+      "en-GB": "/",
+      "en-US": "/",
+      ja: "/ja/",
+    };
+    // On click handler for language switcher.
+    $("#language_switcher a").on("click", function (anchor) {
+      anchor.preventDefault();
+      let lang = $(this).attr("data-lang");
+      console.log("Clicked lang: ", lang);
+      localStorage.setItem("siteLang", lang);
+      checkUserIsOnCorrectLanguage(lang);
+    });
+
+    const checkUserIsOnCorrectLanguage = (setLanguage) => {
+      let currentPath = window.location.pathname;
+      console.log("Current path:", currentPath);
+      // If the current path does not include the correct language sub path, redirect users to the correct version of the page.
+      console.log("Set lanugage: ", setLanguage);
+      console.log("Set language path:", i18n_site_versions[setLanguage]);
+      // Check to see if language subpath exists in the current path. E.g /ja/ in /ja/about/ or /about/
+      let hasLangInUrl = currentPath.match(/\/[A-Za-z]{2}\//g);
+      // Check if a lang code already exists in the pathname.
+      if (hasLangInUrl) {
+        console.log("language exists in url:", hasLangInUrl);
+        let newPath = currentPath.replace(
+          hasLangInUrl[0],
+          i18n_site_versions[setLanguage]
+        );
+        console.log(newPath);
+        if (currentPath !== newPath) {
+          console.log("Redirecting user to correct path: ", newPath);
+          window.location.href = newPath;
+        } else {
+          console.log("No redirect needed");
+        }
+      } else {
+        let newPath =
+          i18n_site_versions[setLanguage] + currentPath.substring(1);
+        console.log(newPath);
+        if (currentPath !== newPath) {
+          console.log("Redirecting user to correct path: ", newPath);
+          window.location.href = newPath;
+        } else {
+          console.log("No redirect needed");
+        }
+      }
+    };
+    // Get the current siteLang from local storage.
+    const currentSetLang = localStorage.getItem("siteLang");
+    // Get the current set lang on the browser.
+    var browserLang = navigator.language || navigator.userLanguage;
+    // Check to see if currentLang is null or not the same as the browser lang.
+    console.log("Current set lang:", currentSetLang);
+    console.log("Browser lang:", browserLang);
+    if (currentSetLang === null) {
+      console.log("No current language set or the browser lang is different.");
+      // Get the available locale keys.
+      let availableKeys = Object.keys(i18n_site_versions);
+
+      if (availableKeys.includes(browserLang)) {
+        localStorage.setItem("siteLang", browserLang);
+        checkUserIsOnCorrectLanguage(browserLang);
+      } else {
+        console.log("No alternate language available");
+        localStorage.setItem("siteLang", "en");
+      }
+    } else {
+      console.log("A current language has been set.");
+      // Get the current path and check that the user is on the correct version of the page.
+      checkUserIsOnCorrectLanguage(currentSetLang);
+    }
+  }
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linaro-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Kyle Kirkby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll