diff --git a/pages/_document.js b/pages/_document.js index 0f1387fb..c83ef42a 100644 --- a/pages/_document.js +++ b/pages/_document.js @@ -24,9 +24,9 @@ class MyDocument extends Document { const cookieObj = ctx.req.cookies.CookiePolicy || {}; console.log("useGATracking: ", useGATracking); - setCookie(ctx, "pedw_locale", ctx.locale, { - path: "/", - }); + // setCookie(ctx, "pedw_locale", ctx.locale, { + // path: "/", + // }); const headers = ctx.req?.headers; const generatedNonce = headers?.["x-nonce"]; diff --git a/pages/myportal/index.js b/pages/myportal/index.js index 9e982065..fa4e3ab1 100644 --- a/pages/myportal/index.js +++ b/pages/myportal/index.js @@ -264,15 +264,19 @@ export const getServerSideProps = wrapper.getServerSideProps( ); console.log("req locale :", ctx.locale); + console.log("cookie locale :", cookies.pedw_locale); store.dispatch(setLocale(ctx.locale)); - const preferredLocale = + let preferredLocale = accountDetails.pinswg_preferredlanguage == "846040000" ? "cy" : "en"; // added to redirect if not the users preferred language + cookies.hasOwnProperty("pedw_locale") && + (preferredLocale = cookies.pedw_locale); + if (preferredLocale != ctx.locale) { return { redirect: {