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]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -10,6 +10,7 @@ import LangPopup from "@/components/Current/LangPopup"
 import SkipToMainContent from "@/components/SkipToMainContent"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
+import { getLang, setLang } from "@/i18n/serverContext"

 import type { Metadata } from "next"

@@ -31,9 +32,11 @@ export default async function RootLayout({
    myPagesMobileDropdown: React.ReactNode
  }
 >) {
+  setLang(params.lang)
  const { defaultLocale, locale, messages } = await getIntl()
+
  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" />
@@ -44,7 +47,7 @@ export default async function RootLayout({
          strategy="beforeInteractive"
          data-blockingmode="auto"
          data-cbid="6d539de8-3e67-4f0f-a0df-8cef9070f712"
-          data-culture={params.lang}
+          data-culture={getLang()}
          id="Cookiebot"
          src="https://consent.cookiebot.com/uc.js"
        />
@@ -60,16 +63,15 @@ export default async function RootLayout({
        />
      </head>
      <body className="theme-00Corecolours theme-X0Oldcorecolours">
-        <LangPopup lang={params.lang} />
+        <LangPopup />
        <SkipToMainContent />
        <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
          <Header
-            lang={params.lang}
            myPagesMobileDropdown={myPagesMobileDropdown}
            languageSwitcher={languageSwitcher}
          />
          {children}
-          <Footer lang={params.lang} />
+          <Footer />
        </ServerIntlProvider>
        <Script id="page-tracking">{`
          typeof _satellite !== "undefined" && _satellite.pageBottom();