fix: Fixed invalid navbar link bug and invalid null redirect

Kipper-Lang · Sep 16, 2024 · f30dc56 · f30dc56
1 parent 54a0fac
commit f30dc56
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/partials/header-nav-bar.ejs b/src/partials/header-nav-bar.ejs
@@ -39,7 +39,7 @@ const pages = {
                   // Insert locale name into the URL
                   const href = link.getAttribute("href");
                   if (!href.includes(localeName) && !href.includes("docs")) {
-                    link.setAttribute("href", `/${localeName}${href}`);
+                    link.setAttribute("href", `/${localeName}${window.location.pathname}`);
                   }
                 }
               })();

diff --git a/src/partials/meta-head.ejs b/src/partials/meta-head.ejs
@@ -83,7 +83,7 @@ See main.scss for the --scheme-primary variable
     // In case a site was loaded with a different locale than the one in the locale storage, then we redirect to
     // the correct locale
     if (
-      storedLocale !== undefined &&
+      !!storedLocale &&
       storedLocale !== locale.name &&
       !window.location.pathname.includes(`/${storedLocale}/`) &&
       !window.location.pathname.includes("/docs/")

diff --git a/src/partials/phone-header-nav-bar.ejs b/src/partials/phone-header-nav-bar.ejs
@@ -31,6 +31,20 @@
                         </a>
                     </li>
                 <% } %>
+
+                <script defer>
+                  (() => {
+                    const links = document.querySelectorAll("#phone-header-nav-bar-menu li .top-nav-menu-item");
+                    const localeName = localStorage.getItem(window.localeKey);
+                    for (const link of links) {
+                      // Insert locale name into the URL
+                      const href = link.getAttribute("href");
+                      if (!href.includes(localeName) && !href.includes("docs")) {
+                        link.setAttribute("href", `/${localeName}${window.location.pathname}`);
+                      }
+                    }
+                  })();
+                </script>
             </ul>
         </li>
         <li>