Merged PR 1679: 17143 language switcher refactor push
17143 language switcher refactor push Related work items: #17143
This commit is contained in:
@@ -112,9 +112,11 @@ const Header = (props) => {
|
|||||||
.join("&")
|
.join("&")
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
router.push(router.pathname + queryString, undefined, {
|
// router.push(router.pathname + queryString, undefined, {
|
||||||
locale: switchLocale,
|
// locale: switchLocale,
|
||||||
});
|
// });
|
||||||
|
|
||||||
|
router.push(router.asPath, router.asPath, { locale: switchLocale });
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
"locales": ["en", "cy"],
|
"locales": ["en", "cy"],
|
||||||
"defaultLocale": "en",
|
"defaultLocale": "en",
|
||||||
|
"localeDetection": false,
|
||||||
"domains": [
|
"domains": [
|
||||||
{
|
{
|
||||||
"domain": process.env.I18N_DOMAIN,
|
"domain": process.env.I18N_DOMAIN,
|
||||||
|
|||||||
@@ -89,12 +89,25 @@ const authOptions = (locale, req, res) => {
|
|||||||
"verification url API: " + url + "\n",
|
"verification url API: " + url + "\n",
|
||||||
"============================================================\n"
|
"============================================================\n"
|
||||||
);
|
);
|
||||||
|
const baseDomain = `${protocol}//${host}`;
|
||||||
|
const emailAddress = email;
|
||||||
|
const prefLang = await getPreferredLanguage(emailAddress);
|
||||||
|
|
||||||
|
const registeredPrefLanguage =
|
||||||
|
prefLang.value.length > 0
|
||||||
|
? prefLang.value[0].pinswg_preferredlanguage ===
|
||||||
|
846040000
|
||||||
|
? "cy"
|
||||||
|
: "en"
|
||||||
|
: "en";
|
||||||
|
|
||||||
|
const effectiveLocale = registeredPrefLanguage ?? locale;
|
||||||
|
|
||||||
let newURL =
|
let newURL =
|
||||||
locale == "cy"
|
effectiveLocale == "cy"
|
||||||
? process.env.CY_API_ROOT +
|
? baseDomain +
|
||||||
"/api/auth/callback/email?callbackUrl=" +
|
"/api/auth/callback/email?callbackUrl=" +
|
||||||
encodeURIComponent(process.env.CY_API_ROOT) +
|
encodeURIComponent(baseDomain + "/cy") +
|
||||||
"&token=" +
|
"&token=" +
|
||||||
searchParams.get("token") +
|
searchParams.get("token") +
|
||||||
"&email=" +
|
"&email=" +
|
||||||
|
|||||||
Reference in New Issue
Block a user