public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix: use session locale when dealing with SSG-ed pages (#11831)

pull/11700/head^2
Greg Pabian 2023-10-11 17:15:11 +02:00 committed by GitHub
parent ce532e0ff6
commit d72a1ee328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/lib/app-providers.tsx
View File

@ -71,7 +71,11 @@ const CustomI18nextProvider = (props: AppPropsWithoutNonce) => {
/** /**
* i18n should never be clubbed with other queries, so that it's caching can be managed independently. * i18n should never be clubbed with other queries, so that it's caching can be managed independently.
**/ **/
const clientViewerI18n = useViewerI18n(props.pageProps.newLocale);
const session = useSession();
const locale = session?.data?.user.locale ?? props.pageProps.newLocale;
const clientViewerI18n = useViewerI18n(locale);
const i18n = clientViewerI18n.data?.i18n; const i18n = clientViewerI18n.data?.i18n;
const passedProps = { const passedProps = {
@ -247,8 +251,8 @@ const AppProviders = (props: AppPropsWithChildren) => {
const RemainingProviders = ( const RemainingProviders = (
<EventCollectionProvider options={{ apiPath: "/api/collect-events" }}> <EventCollectionProvider options={{ apiPath: "/api/collect-events" }}>
<CustomI18nextProvider {...propsWithoutNonce}> <SessionProvider session={pageProps.session ?? undefined}>
<SessionProvider session={pageProps.session ?? undefined}> <CustomI18nextProvider {...propsWithoutNonce}>
<TooltipProvider> <TooltipProvider>
{/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */} {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
<CalcomThemeProvider <CalcomThemeProvider
@ -264,8 +268,8 @@ const AppProviders = (props: AppPropsWithChildren) => {
</FeatureFlagsProvider> </FeatureFlagsProvider>
</CalcomThemeProvider> </CalcomThemeProvider>
</TooltipProvider> </TooltipProvider>
</SessionProvider> </CustomI18nextProvider>
</CustomI18nextProvider> </SessionProvider>
</EventCollectionProvider> </EventCollectionProvider>
); );