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]/webview/layout.tsx
+++ b/app/[lang]/webview/layout.tsx
@@ -8,6 +8,7 @@ import TrpcProvider from "@/lib/trpc/Provider"
 import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
+import { getLang, setLang } from "@/i18n/serverContext"

 import styles from "./layout.module.css"

@@ -23,9 +24,11 @@ export default async function RootLayout({
  children,
  params,
 }: React.PropsWithChildren<LayoutArgs<LangParams>>) {
+  setLang(params.lang)
  const { defaultLocale, locale, messages } = await getIntl()
+
  return (
-    <html lang={params.lang}>
+    <html lang={getLang()}>
      <head>
        <AdobeSDKScript />
        <Script id="ensure-adobeDataLayer">{`
@@ -34,7 +37,7 @@ export default async function RootLayout({
      </head>
      <body className={styles.layout}>
        <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
-          <TrpcProvider lang={params.lang}>{children}</TrpcProvider>
+          <TrpcProvider>{children}</TrpcProvider>
        </ServerIntlProvider>
      </body>
    </html>