From 7c82a565ae62ee31e242a41efcd35a9a494110f7 Mon Sep 17 00:00:00 2001 From: Michael Zetterberg Date: Mon, 7 Apr 2025 07:33:28 +0200 Subject: [PATCH] feat: improve instantiation of intl --- apps/scandic-web/app/[lang]/(live)/layout.tsx | 15 ++++--- .../app/[lang]/(live-current)/layout.tsx | 16 ++++--- .../app/[lang]/(no-layout)/layout.tsx | 15 ++++--- .../(protected)/sas-x-scandic/login/page.tsx | 7 +--- .../app/[lang]/(partner)/layout.tsx | 15 ++++--- .../scandic-web/app/[lang]/webview/layout.tsx | 15 ++++--- .../DynamicContent/LoyaltyLevels/index.tsx | 7 +--- apps/scandic-web/i18n/Provider.tsx | 20 ++++++--- apps/scandic-web/i18n/index.ts | 42 ++++++++++--------- .../navigation/mypages/getPrimaryLinks.ts | 2 +- apps/scandic-web/types/i18n.ts | 6 +-- 11 files changed, 95 insertions(+), 65 deletions(-) diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx index a9cb480fa..0049c8c09 100644 --- a/apps/scandic-web/app/[lang]/(live)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx @@ -7,6 +7,7 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools" import Script from "next/script" import { SessionProvider } from "next-auth/react" +import { Lang } from "@/constants/languages" import TrpcProvider from "@/lib/trpc/Provider" import { SessionRefresher } from "@/components/Auth/TokenRefresher" @@ -19,8 +20,8 @@ import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import AdobeSDKScript from "@/components/TrackingSDK/AdobeSDKScript" import GTMScript from "@/components/TrackingSDK/GTMScript" import RouterTracking from "@/components/TrackingSDK/RouterTracking" -import { getIntl } from "@/i18n" -import ServerIntlProvider from "@/i18n/Provider" +import { getMessages } from "@/i18n" +import ClientIntlProvider from "@/i18n/Provider" import { setLang } from "@/i18n/serverContext" import type { LangParams, LayoutArgs } from "@/types/params" @@ -35,7 +36,7 @@ export default async function RootLayout({ } >) { setLang(params.lang) - const { defaultLocale, locale, messages } = await getIntl() + const messages = await getMessages(params.lang) return ( @@ -56,7 +57,11 @@ export default async function RootLayout({ - + @@ -70,7 +75,7 @@ export default async function RootLayout({ - + diff --git a/apps/scandic-web/app/[lang]/(live-current)/layout.tsx b/apps/scandic-web/app/[lang]/(live-current)/layout.tsx index 236b3611f..3863c9aba 100644 --- a/apps/scandic-web/app/[lang]/(live-current)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live-current)/layout.tsx @@ -5,6 +5,8 @@ import "@scandic-hotels/design-system/style.css" import Script from "next/script" +import { Lang } from "@/constants/languages" + import TokenRefresher from "@/components/Auth/TokenRefresher" import CookieBotConsent from "@/components/CookieBot" import AdobeScript from "@/components/Current/AdobeScript" @@ -12,8 +14,8 @@ import Footer from "@/components/Current/Footer" import LangPopup from "@/components/Current/LangPopup" import SkipToMainContent from "@/components/SkipToMainContent" import RouterTracking from "@/components/TrackingSDK/RouterTracking" -import { getIntl } from "@/i18n" -import ServerIntlProvider from "@/i18n/Provider" +import { getMessages } from "@/i18n" +import ClientIntlProvider from "@/i18n/Provider" import { setLang } from "@/i18n/serverContext" import type { Metadata } from "next" @@ -34,7 +36,7 @@ export default async function RootLayout({ LayoutArgs & { header: React.ReactNode } >) { setLang(params.lang) - const { defaultLocale, locale, messages } = await getIntl() + const messages = await getMessages(params.lang) return ( @@ -59,14 +61,18 @@ export default async function RootLayout({ - + {header} {children}