Merged in feature/refactor-lang (pull request #387)

feat: SW-238 Avoid prop drilling of lang Approved-by: Michael Zetterberg
2024-08-14 11:00:20 +00:00
parent 35128dbf44
commit e67212bd94
94 changed files with 378 additions and 322 deletions
--- a/app/[lang]/(preview-current)/layout.tsx
+++ b/app/[lang]/(preview-current)/layout.tsx
@@ -4,6 +4,7 @@ import Footer from "@/components/Current/Footer"
 import LangPopup from "@/components/Current/LangPopup"
 import InitLivePreview from "@/components/Current/LivePreview"
 import SkipToMainContent from "@/components/SkipToMainContent"
+import { getLang, setLang } from "@/i18n/serverContext"

 import type { Metadata } from "next"

@@ -20,8 +21,10 @@ export default function RootLayout({
  children,
  params,
 }: React.PropsWithChildren<LayoutArgs<LangParams>>) {
+  setLang(params.lang)
+
  return (
-    <html lang={params.lang}>
+    <html lang={getLang()}>
      <head>
        {/* eslint-disable-next-line @next/next/no-css-tags */}
        <link rel="stylesheet" href="/_static/css/core.css" />
@@ -30,10 +33,10 @@ export default function RootLayout({
      </head>
      <body>
        <InitLivePreview />
-        <LangPopup lang={params.lang} />
+        <LangPopup />
        <SkipToMainContent />
        {children}
-        <Footer lang={params.lang} />
+        <Footer />
      </body>
    </html>
  )