Merge pull request #288 from blz-it/fix-everything

Fix Everything
blz-it · Oct 15, 2024 · 4b2ce41 · 4b2ce41
2 parents 96e1fd7 + 700c73d
commit 4b2ce41
Show file tree

Hide file tree

Showing 13 changed files with 418 additions and 317 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -10,7 +10,6 @@ export default defineConfig({
   i18n: {
     defaultLocale: defaultLang,
     locales: Object.keys(languages),
-    routing: "manual", // see: src/middleware.ts
   },
   integrations: [tailwind(), react(), icon()],
   site: "https://blz-it.de",

diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
@@ -15,11 +15,19 @@ export function useTranslations(lang: Language) {
   };
 }
 
+const removeLocalePrefix = (path: string): string => {
+  const localePattern = new RegExp(
+    `^/(${Object.keys(languages).join("|")})\\b`,
+  );
+  return path.replace(localePattern, "");
+};
+
 export type LocalePath = { lang: Language; path: string };
 export const getLocalePaths = (url: URL): LocalePath[] => {
+  const cleanPath = removeLocalePrefix(url.pathname);
   return Object.keys(languages).map((lang) => ({
     lang: lang as Language,
-    path: getRelativeLocaleUrl(lang, url.pathname.replace(/^\/[a-zA-Z-]+/, "")),
+    path: getRelativeLocaleUrl(lang, cleanPath),
   }));
 };
 

diff --git a/src/middleware.ts b/src/middleware.ts
diff --git a/src/pages/404.astro b/src/pages/404.astro
@@ -0,0 +1,35 @@
+---
+// This page automatically redirects to 404 page for user's locale
+import { defaultLang, languages } from "~/i18n";
+
+const langs = Object.keys(languages);
+---
+
+<html lang={defaultLang}>
+  <head>
+    <meta charset="UTF-8" />
+    <title>404 PAGE NOT FOUND</title>
+    <link rel="canonical" href={Astro.site} />
+
+    <noscript>
+      <meta http-equiv="refresh" content={`0;url=/${defaultLang}/404/`} />
+    </noscript>
+
+    <script is:inline define:vars={{ langs, defaultLang }}>
+      const urlHasLang = langs.includes(location.pathname.split("/")[1]);
+
+      // First, try to redirect to the default locale (e.g., page could be monolingual)
+      if (!urlHasLang) {
+        location.href = "/" + defaultLang + location.pathname;
+        return;
+      }
+
+      // If the user's locale is not available, redirect to 404 page
+      location.href = `/${location.pathname.split("/")[1]}/404/`;
+    </script>
+  </head>
+  <body>
+    <h1>404 PAGE NOT FOUND</h1>
+    <a href="/">TOP PAGE</a>
+  </body>
+</html>
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
diff --git a/src/pages/[lang]/it-software-solutions-for-business.astro b/src/pages/[lang]/it-software-solutions-for-business.astro
diff --git a/src/pages/[lang]/mobile-applications-development.astro b/src/pages/[lang]/mobile-applications-development.astro