Make language detection from url more robust

Author: razzeee

src/i18n/utils.ts

@@ -2,8 +2,16 @@ import { de, enUS } from "date-fns/locale";
 import { ui, defaultLang } from "./ui";
 
 export function getLangFromUrl(url: URL) {
-  const [, lang] = url.pathname.split("/");
-  if (lang in ui) return lang as keyof typeof ui;
+  const candidates = url.pathname.split("/").filter((a) => a.length === 2);
+
+  if (candidates.includes("de")) {
+    return "de";
+  }
+
+  if (candidates.includes("en")) {
+    return "en";
+  }
+
   return defaultLang;
 }
 

src/layouts/Layout.astro

@@ -1,5 +1,5 @@
 ---
-import { getLangFromUrl, useTranslations } from "../i18n/utils";
+import { getLangFromUrl } from "../i18n/utils";
 import Head from "../components/Head.astro";
 import "@/styles/globals.css";
 import Footer from "../components/Footer.astro";
@@ -8,7 +8,6 @@ import Navigation from "../components/Navigation.astro";
 const { title } = Astro.props;
 
 const lang = getLangFromUrl(Astro.url);
-const t = useTranslations(lang);
 ---
 
 <script is:inline>