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

Merged in chore/more-partner-sas-boilerplate (pull request #2756)

Browse Source 
chore: Misc for partner-sas

* Add global-error to partner-sas

* Add redirect to lang in partner-sas

* Actually use language from param

* Increase test timeouts and use parsed lang to fix tests

* Remove need to import serverClient to setup trpc


Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Anton Gunnarsson
2025-09-04 07:45:14 +00:00
parent 36b6685ad5
commit 7e585b2d9a
9 changed files with 162 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/partner-sas/app/[lang]/layout.tsx
View File

@@ -10,8 +10,6 @@ import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
import { Lang } from "@scandic-hotels/common/constants/language"
import { TrpcProvider } from "@scandic-hotels/trpc/Provider"
import { serverClient } from "@/lib/trpc"
import { getMessages } from "@/i18n"
import ClientIntlProvider from "@/i18n/Provider"
import { setLang } from "@/i18n/serverContext"
@@ -41,17 +39,13 @@ type RootLayoutProps = {
}
export default async function RootLayout(props: RootLayoutProps) {
// const params = await props.params
const lang = Lang.en //params.lang
const params = await props.params
const lang = params.lang
const { children } = props
setLang(lang)
const messages = await getMessages(lang)
// TODO we need this import right now to ensure configureServerClient is called,
// but check where we do this
const _caller = await serverClient()
const parsedLanguage = setLang(lang)
const messages = await getMessages(parsedLanguage)
return (
<html lang="en">
@@ -60,7 +54,7 @@ export default async function RootLayout(props: RootLayoutProps) {
<div className="root">
<ClientIntlProvider
defaultLocale={Lang.en}
locale={lang}
locale={parsedLanguage}
messages={messages}
>
<NuqsAdapter>

2
apps/partner-sas/app/[lang]/middleware-error/404/page.tsx
View File

@@ -1,4 +1,4 @@
export default function NotFoundPage() {
// eslint-disable-next-line formatjs/no-literal-string-in-jsx
return <div>Not found, forgot lang in url?</div>
return <div>Not Found</div>
}