scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: improve instantiation of intl

Browse Source
This commit is contained in:
Michael Zetterberg
2025-04-07 07:33:28 +02:00
parent f31b374370
commit 7c82a565ae
11 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/scandic-web/app/[lang]/(live-current)/layout.tsx
View File

@@ -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<LangParams> & { header: React.ReactNode }
>) {
setLang(params.lang)
const { defaultLocale, locale, messages } = await getIntl()
const messages = await getMessages(params.lang)
return (
<html lang={params.lang}>
@@ -59,14 +61,18 @@ export default async function RootLayout({
<body className="theme-00Corecolours theme-X0Oldcorecolours">
<LangPopup />
<SkipToMainContent />
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<ClientIntlProvider
defaultLocale={Lang.en}
locale={params.lang}
messages={messages}
>
<RouterTracking />
{header}
{children}
<Footer />
<TokenRefresher />
<CookieBotConsent />
</ServerIntlProvider>
</ClientIntlProvider>
<Script id="page-tracking">{`
if (typeof _satellite !== "undefined" && typeof _satellite.pageBottom === "function") {
_satellite.pageBottom();