From 3db9234d75ce656b3063f2442c6a6a6015b39544 Mon Sep 17 00:00:00 2001
From: Manuel Brandstetter <36969812+brandstetterm@users.noreply.github.com>
Date: Wed, 3 Apr 2024 19:40:18 +0200
Subject: [PATCH] improvement: show default language on index path (remove
 `/en` path) (#197)

---
 src/components/Footer/Footer.astro     | 21 +++++++++++----------
 src/components/Navbar/Navbar.astro     | 15 ++++++++-------
 src/components/UserMenu/UserMenu.tsx   |  2 +-
 src/i18n/utils.ts                      | 17 +++++++++++++++++
 src/layouts/Layout.astro               |  8 +++++---
 src/layouts/LegalLayout.astro          | 15 ++++++++-------
 src/pages/[lang]/cookie-policy.astro   | 20 --------------------
 src/pages/[lang]/data-protection.astro | 21 ---------------------
 src/pages/[lang]/legal-notice.astro    | 20 --------------------
 src/pages/[lang]/terms.astro           | 26 --------------------------
 src/pages/cookie-policy.astro          | 11 +++++++++++
 src/pages/data-protection.astro        | 12 ++++++++++++
 src/pages/de/cookie-policy.astro       | 11 +++++++++++
 src/pages/de/data-protection.astro     | 12 ++++++++++++
 src/pages/{[lang] => de}/index.astro   |  8 ++------
 src/pages/de/legal-notice.astro        | 11 +++++++++++
 src/pages/de/terms.astro               | 17 +++++++++++++++++
 src/pages/en/cookie-policy.astro       |  4 ++++
 src/pages/en/data-protection.astro     |  4 ++++
 src/pages/en/index.astro               |  4 ++++
 src/pages/en/legal-notice.astro        |  4 ++++
 src/pages/en/terms.astro               |  4 ++++
 src/pages/index.astro                  | 20 +++++++++++++++++++-
 src/pages/legal-notice.astro           | 11 +++++++++++
 src/pages/terms.astro                  | 17 +++++++++++++++++
 src/views/AboutUs/AboutUs.astro        |  5 +++--
 src/views/Choices/Choices.astro        |  5 +++--
 src/views/Features/Features.astro      |  5 +++--
 src/views/Feedback/Feedback.astro      |  5 +++--
 src/views/Hero/Hero.astro              |  5 +++--
 src/views/Mobile/Mobile.astro          |  7 ++++---
 src/views/TargetUser/TargetUser.astro  |  7 ++++---
 src/views/Uniqueness/Uniqueness.astro  |  7 ++++---
 33 files changed, 220 insertions(+), 141 deletions(-)
 create mode 100644 src/i18n/utils.ts
 delete mode 100644 src/pages/[lang]/cookie-policy.astro
 delete mode 100644 src/pages/[lang]/data-protection.astro
 delete mode 100644 src/pages/[lang]/legal-notice.astro
 delete mode 100644 src/pages/[lang]/terms.astro
 create mode 100644 src/pages/cookie-policy.astro
 create mode 100644 src/pages/data-protection.astro
 create mode 100644 src/pages/de/cookie-policy.astro
 create mode 100644 src/pages/de/data-protection.astro
 rename src/pages/{[lang] => de}/index.astro (71%)
 create mode 100644 src/pages/de/legal-notice.astro
 create mode 100644 src/pages/de/terms.astro
 create mode 100644 src/pages/en/cookie-policy.astro
 create mode 100644 src/pages/en/data-protection.astro
 create mode 100644 src/pages/en/index.astro
 create mode 100644 src/pages/en/legal-notice.astro
 create mode 100644 src/pages/en/terms.astro
 create mode 100644 src/pages/legal-notice.astro
 create mode 100644 src/pages/terms.astro

diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro
index 6b3c98b..d2ce986 100644
--- a/src/components/Footer/Footer.astro
+++ b/src/components/Footer/Footer.astro
@@ -1,4 +1,6 @@
 ---
+import getTranslatedContent from "@utils/directus";
+import {getLangFromUrl, getPathForLanguage} from "../../i18n/utils";
 import { Github } from "@icons/Github";
 import { Instagram } from "@icons/Instagram";
 import { Linkedin } from "@icons/Linkedin";
@@ -6,11 +8,10 @@ import { Podcast } from "@icons/Podcast";
 import { X } from "@icons/X";
 import { Xing } from "@icons/Xing";
 import { Inovex } from "@icons/Inovex";
-import getTranslatedContent from "@utils/directus";
 import "./Footer.scss";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Footer", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Footer", lang);
 ---
 
 <footer>
@@ -88,13 +89,13 @@ const content = await getTranslatedContent("Footer", lang!);
     <nav class="footer__right">
       <ul class="footer__internal-links">
         <li>
-          <a href=`/${lang}#home`>{content.home}</a>
+          <a href={getPathForLanguage(lang, "#home")}>{content.home}</a>
         </li>
         <li>
-          <a href=`/${lang}#features`>{content.features}</a>
+          <a href={getPathForLanguage(lang, "#features")}>{content.features}</a>
         </li>
         <li>
-          <a href=`/${lang}#about`>{content.about}</a>
+          <a href={getPathForLanguage(lang, "#about")}>{content.about}</a>
         </li>
         <li>
           <a href=`/new`>{content.getStarted}</a>
@@ -106,16 +107,16 @@ const content = await getTranslatedContent("Footer", lang!);
     <div class="footer__bottom-content">
       <ul class="footer__legal-links">
         <li>
-          <a href=`/${lang}/data-protection`>{content.privacy}</a>
+          <a href={getPathForLanguage(lang, "/data-protection")}>{content.privacy}</a>
         </li>
         <li>
-          <a href=`/${lang}/cookie-policy`>{content.cookies}</a>
+          <a href={getPathForLanguage(lang, "/cookie-policy")}>{content.cookies}</a>
         </li>
         <li>
-          <a href=`/${lang}/terms`>{content.terms}</a>
+          <a href={getPathForLanguage(lang, "/terms")}>{content.terms}</a>
         </li>
         <li>
-          <a href=`/${lang}/legal-notice`>{content.legal_notice}</a>
+          <a href={getPathForLanguage(lang, "/legal-notice")}>{content.legal_notice}</a>
         </li>
       </ul>
       <span>{content.copyright}</span>
diff --git a/src/components/Navbar/Navbar.astro b/src/components/Navbar/Navbar.astro
index 7cbcc82..ce9c06f 100644
--- a/src/components/Navbar/Navbar.astro
+++ b/src/components/Navbar/Navbar.astro
@@ -1,13 +1,14 @@
 ---
+import getTranslatedContent from "@utils/directus";
+import { getLangFromUrl, getPathForLanguage } from '../../i18n/utils';
 import { Logo } from "../Logo";
 import { Plus } from "../../icons/Plus";
 import { Link } from "../Link/Link";
-import getTranslatedContent from "@utils/directus";
 import UserMenu from "@components/UserMenu/UserMenu";
 import "./Navbar.scss";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Header", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Header", lang);
 
 const userMenuLabels = {
   germanLabel: content.german,
@@ -20,18 +21,18 @@ const userMenuLabels = {
 <nav id="navbar" class="navbar">
   <ul>
     <li>
-      <a aria-label={content.home} href=`/${lang}`>
+      <a aria-label={content.home} href={getPathForLanguage(lang, "/")}>
         <Logo />
       </a>
     </li>
     <li>
-      <a href=`/${lang}#home`>{content.home}</a>
+      <a href={getPathForLanguage(lang, "#home")}>{content.home}</a>
     </li>
     <li>
-      <a href=`/${lang}#features`>{content.features}</a>
+      <a href={getPathForLanguage(lang, "#features")}>{content.features}</a>
     </li>
     <li>
-      <a href=`/${lang}#about`>{content.aboutUs}</a>
+      <a href={getPathForLanguage(lang, "#about")}>{content.aboutUs}</a>
     </li>
     <li>
       <UserMenu client:load {...userMenuLabels} />
diff --git a/src/components/UserMenu/UserMenu.tsx b/src/components/UserMenu/UserMenu.tsx
index 95b7031..5895c92 100644
--- a/src/components/UserMenu/UserMenu.tsx
+++ b/src/components/UserMenu/UserMenu.tsx
@@ -95,7 +95,7 @@ const UserMenu = ({
             </a>
           </li>
           <li>
-            <a href="/en">
+            <a href="/">
               <svg
                 width="32"
                 height="32"
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
new file mode 100644
index 0000000..db7bc5f
--- /dev/null
+++ b/src/i18n/utils.ts
@@ -0,0 +1,17 @@
+const languages = {
+  en: 'English',
+  de: 'German',
+};
+
+const defaultLang = 'en';
+
+export function getLangFromUrl(url: URL) {
+  const [, lang] = url.pathname.split('/');
+  if (lang in languages) return lang as keyof typeof languages;
+  return defaultLang;
+}
+
+export function getPathForLanguage(lang: keyof typeof languages, path: string) {
+  return lang === defaultLang ? path : `/${lang}${path}`;
+}
+
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index a0ebb89..5947bf1 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,4 +1,5 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import Navbar from "../components/Navbar/Navbar.astro";
 import Footer from "../components/Footer/Footer.astro";
 
@@ -7,10 +8,11 @@ export interface Props {
 }
 
 const { title } = Astro.props;
+const lang = getLangFromUrl(Astro.url);
 ---
 
 <!doctype html>
-<html lang="en">
+<html lang={lang}>
   <head>
     <meta charset="UTF-8" />
     <meta name="description" content="Open source online retrospective & collaboration tool - fast onboarding, jump right into a session with your team" />
@@ -25,11 +27,11 @@ const { title } = Astro.props;
   </head>
   <body>
     <div class="body_wrapper">
-      <Navbar />
+      <Navbar lang={lang} />
       <main>
         <slot />
       </main>
-      <Footer />
+      <Footer lang={lang} />
     </div>
   </body>
 </html>
diff --git a/src/layouts/LegalLayout.astro b/src/layouts/LegalLayout.astro
index 919d845..6b0c01c 100644
--- a/src/layouts/LegalLayout.astro
+++ b/src/layouts/LegalLayout.astro
@@ -1,29 +1,30 @@
 ---
+import { getLangFromUrl, getPathForLanguage } from "src/i18n/utils";
+import getTranslatedContent from "@utils/directus";
 import { ViewTransitions } from "astro:transitions";
 import Layout from "./Layout.astro";
-import getTranslatedContent from "@utils/directus";
 import "./LegalLayout.scss";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Legal_Menu", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Legal_Menu", lang);
 
 const pathname = new URL(Astro.request.url).pathname;
 
 const navItems = [
   {
-    href: `/${lang}/data-protection`,
+    href: getPathForLanguage(lang, "/data-protection"),
     name: content.privacy,
   },
   {
-    href: `/${lang}/cookie-policy`,
+    href: getPathForLanguage(lang, "/cookie-policy"),
     name: content.cookies,
   },
   {
-    href: `/${lang}/terms`,
+    href: getPathForLanguage(lang, "/terms"),
     name: content.terms,
   },
   {
-    href: `/${lang}/legal-notice`,
+    href: getPathForLanguage(lang, "/legal-notice"),
     name: content.legal_notice,
   },
 ];
diff --git a/src/pages/[lang]/cookie-policy.astro b/src/pages/[lang]/cookie-policy.astro
deleted file mode 100644
index 7fa6446..0000000
--- a/src/pages/[lang]/cookie-policy.astro
+++ /dev/null
@@ -1,20 +0,0 @@
----
-import type {GetStaticPaths} from "astro";
-import LegalLayout from "@layouts/LegalLayout.astro";
-import getTranslatedContent from "@utils/directus.ts";
-import "@styles/Legal.scss";
-
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Cookie_Policy", lang!);
-
-export const getStaticPaths = (() => {
-    return [
-        {params: {lang: "en"}},
-        {params: {lang: "de"}},
-    ];
-}) satisfies GetStaticPaths;
----
-
-<LegalLayout>
-  <section set:html={content.Cookie_Policy} />
-</LegalLayout>
diff --git a/src/pages/[lang]/data-protection.astro b/src/pages/[lang]/data-protection.astro
deleted file mode 100644
index a81bcef..0000000
--- a/src/pages/[lang]/data-protection.astro
+++ /dev/null
@@ -1,21 +0,0 @@
----
-import type {GetStaticPaths} from "astro";
-import LegalLayout from "@layouts/LegalLayout.astro";
-import getTranslatedContent from "@utils/directus.ts";
-import "@styles/Legal.scss";
-
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Privacy_Policy", lang!);
-
-export const getStaticPaths = (() => {
-    return [
-        {params: {lang: "en"}},
-        {params: {lang: "de"}},
-    ];
-}) satisfies GetStaticPaths;
----
-
-<LegalLayout>
-  <section class="legal__content" set:html={content.Privacy_Policy} />
-</LegalLayout>
-
diff --git a/src/pages/[lang]/legal-notice.astro b/src/pages/[lang]/legal-notice.astro
deleted file mode 100644
index d8cc4d7..0000000
--- a/src/pages/[lang]/legal-notice.astro
+++ /dev/null
@@ -1,20 +0,0 @@
----
-import type {GetStaticPaths} from "astro";
-import LegalLayout from "@layouts/LegalLayout.astro";
-import getTranslatedContent from "@utils/directus.ts";
-import "@styles/Legal.scss";
-
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Legal_Notice", lang!);
-
-export const getStaticPaths = (() => {
-    return [
-        {params: {lang: "en"}},
-        {params: {lang: "de"}},
-    ];
-}) satisfies GetStaticPaths;
----
-
-<LegalLayout>
-  <section set:html={content.legal_notice} />
-</LegalLayout>
diff --git a/src/pages/[lang]/terms.astro b/src/pages/[lang]/terms.astro
deleted file mode 100644
index 5069ad1..0000000
--- a/src/pages/[lang]/terms.astro
+++ /dev/null
@@ -1,26 +0,0 @@
----
-import type { GetStaticPaths } from "astro";
-import LegalLayout from "@layouts/LegalLayout.astro";
-import getTranslatedContent from "@utils/directus.ts";
-import "@styles/Legal.scss";
-
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Terms_Conditions", lang!);
-
-export const getStaticPaths = (() => {
-    return [
-        {params: {lang: "en"}},
-        {params: {lang: "de"}},
-    ];
-}) satisfies GetStaticPaths;
----
-
-<LegalLayout>
-  <section set:html={content.Terms_Conditions} />
-</LegalLayout>
-
-<style>
-  section {
-    text-wrap: wrap;
-  }
-</style>
diff --git a/src/pages/cookie-policy.astro b/src/pages/cookie-policy.astro
new file mode 100644
index 0000000..ceaf268
--- /dev/null
+++ b/src/pages/cookie-policy.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Cookie_Policy", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.Cookie_Policy} />
+</LegalLayout>
diff --git a/src/pages/data-protection.astro b/src/pages/data-protection.astro
new file mode 100644
index 0000000..296eae5
--- /dev/null
+++ b/src/pages/data-protection.astro
@@ -0,0 +1,12 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Privacy_Policy", "en");
+---
+
+<LegalLayout>
+  <section class="legal__content" set:html={content.Privacy_Policy} />
+</LegalLayout>
+
diff --git a/src/pages/de/cookie-policy.astro b/src/pages/de/cookie-policy.astro
new file mode 100644
index 0000000..ce133e6
--- /dev/null
+++ b/src/pages/de/cookie-policy.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Cookie_Policy", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.Cookie_Policy} />
+</LegalLayout>
diff --git a/src/pages/de/data-protection.astro b/src/pages/de/data-protection.astro
new file mode 100644
index 0000000..f2b9a56
--- /dev/null
+++ b/src/pages/de/data-protection.astro
@@ -0,0 +1,12 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Privacy_Policy", "de");
+---
+
+<LegalLayout>
+  <section class="legal__content" set:html={content.Privacy_Policy} />
+</LegalLayout>
+
diff --git a/src/pages/[lang]/index.astro b/src/pages/de/index.astro
similarity index 71%
rename from src/pages/[lang]/index.astro
rename to src/pages/de/index.astro
index aa269f2..5ad3801 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/de/index.astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from "astro";
 import Hero from "@views/Hero/Hero.astro";
 import Choices from "@views/Choices/Choices.astro";
 import Uniqueness from "@views/Uniqueness/Uniqueness.astro";
@@ -9,18 +8,15 @@ import TargetUser from "@views/TargetUser/TargetUser.astro";
 import Features from "@views/Features/Features.astro";
 import Feedback from "@views/Feedback/Feedback.astro";
 import AboutUs from "@views/AboutUs/AboutUs.astro";
-
-export const getStaticPaths = (() => {
-  return [{ params: { lang: "en" } }, { params: { lang: "de" } }];
-}) satisfies GetStaticPaths;
 ---
 
-<Layout title="scrumlr.io - Online collaboration">
+<Layout title="scrumlr.io - Online collaboration" >
   <Hero />
   <Choices />
   <Uniqueness />
   <Mobile />
   <Features />
+  <TargetUser />
   <Feedback />
   <AboutUs />
 </Layout>
diff --git a/src/pages/de/legal-notice.astro b/src/pages/de/legal-notice.astro
new file mode 100644
index 0000000..87c4eb6
--- /dev/null
+++ b/src/pages/de/legal-notice.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Legal_Notice", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.legal_notice} />
+</LegalLayout>
diff --git a/src/pages/de/terms.astro b/src/pages/de/terms.astro
new file mode 100644
index 0000000..97f3c5e
--- /dev/null
+++ b/src/pages/de/terms.astro
@@ -0,0 +1,17 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Terms_Conditions", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.Terms_Conditions} />
+</LegalLayout>
+
+<style>
+  section {
+    text-wrap: wrap;
+  }
+</style>
diff --git a/src/pages/en/cookie-policy.astro b/src/pages/en/cookie-policy.astro
new file mode 100644
index 0000000..f46ad8b
--- /dev/null
+++ b/src/pages/en/cookie-policy.astro
@@ -0,0 +1,4 @@
+---
+---
+
+<meta http-equiv="refresh" content="0;url=/cookie-policy" />
diff --git a/src/pages/en/data-protection.astro b/src/pages/en/data-protection.astro
new file mode 100644
index 0000000..8be14ce
--- /dev/null
+++ b/src/pages/en/data-protection.astro
@@ -0,0 +1,4 @@
+---
+---
+
+<meta http-equiv="refresh" content="0;url=/data-protection" />
diff --git a/src/pages/en/index.astro b/src/pages/en/index.astro
new file mode 100644
index 0000000..abf0b98
--- /dev/null
+++ b/src/pages/en/index.astro
@@ -0,0 +1,4 @@
+---
+---
+
+<meta http-equiv="refresh" content="0;url=/" />
diff --git a/src/pages/en/legal-notice.astro b/src/pages/en/legal-notice.astro
new file mode 100644
index 0000000..6a76f60
--- /dev/null
+++ b/src/pages/en/legal-notice.astro
@@ -0,0 +1,4 @@
+---
+---
+
+<meta http-equiv="refresh" content="0;url=/legal-notice" />
diff --git a/src/pages/en/terms.astro b/src/pages/en/terms.astro
new file mode 100644
index 0000000..d07f21f
--- /dev/null
+++ b/src/pages/en/terms.astro
@@ -0,0 +1,4 @@
+---
+---
+
+<meta http-equiv="refresh" content="0;url=/terms" />
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 5541eb1..5ad3801 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,4 +1,22 @@
 ---
+import Hero from "@views/Hero/Hero.astro";
+import Choices from "@views/Choices/Choices.astro";
+import Uniqueness from "@views/Uniqueness/Uniqueness.astro";
+import Mobile from "@views/Mobile/Mobile.astro";
+import Layout from "@layouts/Layout.astro";
+import TargetUser from "@views/TargetUser/TargetUser.astro";
+import Features from "@views/Features/Features.astro";
+import Feedback from "@views/Feedback/Feedback.astro";
+import AboutUs from "@views/AboutUs/AboutUs.astro";
 ---
 
-<meta http-equiv="refresh" content="0;url=/en" />
+<Layout title="scrumlr.io - Online collaboration" >
+  <Hero />
+  <Choices />
+  <Uniqueness />
+  <Mobile />
+  <Features />
+  <TargetUser />
+  <Feedback />
+  <AboutUs />
+</Layout>
diff --git a/src/pages/legal-notice.astro b/src/pages/legal-notice.astro
new file mode 100644
index 0000000..66c8e5e
--- /dev/null
+++ b/src/pages/legal-notice.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Legal_Notice", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.legal_notice} />
+</LegalLayout>
diff --git a/src/pages/terms.astro b/src/pages/terms.astro
new file mode 100644
index 0000000..f37748b
--- /dev/null
+++ b/src/pages/terms.astro
@@ -0,0 +1,17 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Terms_Conditions", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.Terms_Conditions} />
+</LegalLayout>
+
+<style>
+  section {
+    text-wrap: wrap;
+  }
+</style>
diff --git a/src/views/AboutUs/AboutUs.astro b/src/views/AboutUs/AboutUs.astro
index 21b1305..5d590f1 100644
--- a/src/views/AboutUs/AboutUs.astro
+++ b/src/views/AboutUs/AboutUs.astro
@@ -1,10 +1,11 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import { Link } from "../../components/Link/Link";
 import getTranslatedContent from "../../utils/directus";
 import "./AboutUs.scss";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("AboutUs_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("AboutUs_Section", lang);
 ---
 
 <section class="about-us" id="about">
diff --git a/src/views/Choices/Choices.astro b/src/views/Choices/Choices.astro
index f772c6b..2c61a4f 100644
--- a/src/views/Choices/Choices.astro
+++ b/src/views/Choices/Choices.astro
@@ -1,10 +1,11 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import VideoPlayer from "../../components/VideoPlayer";
 import getTranslatedContent from "../../utils/directus";
 import "./Choices.scss";
 
-const { lang } = Astro.params;
-const content = await getTranslatedContent("Choices_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Choices_Section", lang);
 ---
 
 <section id="choices" class="choices">
diff --git a/src/views/Features/Features.astro b/src/views/Features/Features.astro
index 05cc7cc..d9f7d60 100644
--- a/src/views/Features/Features.astro
+++ b/src/views/Features/Features.astro
@@ -1,4 +1,5 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import "./Features.scss";
 import { Link } from "../../components/Link/Link";
 import Features_light_0 from "./images/Features_light_0.tsx";
@@ -9,8 +10,8 @@ import Features_dark_1 from "./images/Features_dark_1.tsx";
 import Features_dark_2 from "./images/Features_dark_2.tsx";
 import getTranslatedContent from "../../utils/directus";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Features_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Features_Section", lang);
 ---
 
 <section id="features" class="features">
diff --git a/src/views/Feedback/Feedback.astro b/src/views/Feedback/Feedback.astro
index bfc5756..5173ee7 100644
--- a/src/views/Feedback/Feedback.astro
+++ b/src/views/Feedback/Feedback.astro
@@ -1,9 +1,10 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import FeedbackCarousel from "./FeedbackCarousel.tsx";
 import getTranslatedContent, { getContent } from "../../utils/directus";
 
-const { lang } = Astro.params;
-const content = await getTranslatedContent("Feedback_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Feedback_Section", lang);
 const testimonials = (await getContent("testimonials")) as FeedbackItem[];
 
 export type FeedbackItem = {
diff --git a/src/views/Hero/Hero.astro b/src/views/Hero/Hero.astro
index 4e1ffd5..9f075d1 100644
--- a/src/views/Hero/Hero.astro
+++ b/src/views/Hero/Hero.astro
@@ -1,11 +1,12 @@
 ---
+import { getLangFromUrl } from "src/i18n/utils";
 import { Link } from "@components/Link/Link";
 import ArrowRight from "@icons/ArrowRight";
 import getTranslatedContent from "@utils/directus";
 import "./Hero.scss";
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("Hero_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Hero_Section", lang);
 ---
 
 
diff --git a/src/views/Mobile/Mobile.astro b/src/views/Mobile/Mobile.astro
index 7d280fe..7210a47 100644
--- a/src/views/Mobile/Mobile.astro
+++ b/src/views/Mobile/Mobile.astro
@@ -1,9 +1,10 @@
 ---
-import "./Mobile.scss";
+import { getLangFromUrl } from "src/i18n/utils";
 import getTranslatedContent from "@utils/directus";
+import "./Mobile.scss";
 
-const { lang } = Astro.params;
-const content = await getTranslatedContent("Mobile_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Mobile_Section", lang);
 ---
 
 <section class="mobile__section">
diff --git a/src/views/TargetUser/TargetUser.astro b/src/views/TargetUser/TargetUser.astro
index 2279f7f..1e55e2d 100644
--- a/src/views/TargetUser/TargetUser.astro
+++ b/src/views/TargetUser/TargetUser.astro
@@ -1,9 +1,10 @@
 ---
-import './TargetUser.scss';
+import { getLangFromUrl } from "src/i18n/utils";
 import getTranslatedContent from "../../utils/directus";
+import './TargetUser.scss';
 
-const {lang} = Astro.params;
-const content = await getTranslatedContent("TargetUser_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("TargetUser_Section", lang);
 ---
 
 <section class='target-user'>
diff --git a/src/views/Uniqueness/Uniqueness.astro b/src/views/Uniqueness/Uniqueness.astro
index a99d65f..2f4b27b 100644
--- a/src/views/Uniqueness/Uniqueness.astro
+++ b/src/views/Uniqueness/Uniqueness.astro
@@ -1,9 +1,10 @@
 ---
-import "./Uniqueness.scss";
+import { getLangFromUrl } from "src/i18n/utils";
 import getTranslatedContent from "../../utils/directus";
+import "./Uniqueness.scss";
 
-const { lang } = Astro.params;
-const content = await getTranslatedContent("Uniqueness_Section", lang!);
+const lang = getLangFromUrl(Astro.url);
+const content = await getTranslatedContent("Uniqueness_Section", lang);
 ---
 
 <section class="uniqueness__wrapper">