diff --git a/404.html b/404.html index 8e81b21d3..ef05c70bb 100644 --- a/404.html +++ b/404.html @@ -105,7 +105,6 @@ ['dk', '/'], ['it', '/'], ['br', '/'], - ['cn', '/'], ['de', '/'], ['es', '/'], ['fi', '/'], @@ -119,7 +118,6 @@ ['vn_en', '/'], ['vn_vi', '/'], ['za', '/'], - ['zh-Hans-CN', '/cn/' ], ['zh-Hant-TW', '/tw/'], ] ); diff --git a/express/code/scripts/scripts.js b/express/code/scripts/scripts.js index 0206d13f2..e574c0196 100644 --- a/express/code/scripts/scripts.js +++ b/express/code/scripts/scripts.js @@ -445,9 +445,10 @@ async function loadPage() { import('./instrument.js').then((mod) => { mod.default(); }); } - /* region based redirect to homepage */ + /* region based redirect to CN homepage */ + const isAdobeOrigin = /^(www\.stage\.|www\.)adobe\.com$/.test(window.location.hostname); import('./utils/location-utils.js').then(({ getCountry }) => getCountry()).then((country) => { - if (country === 'cn') { window.location.href = '/cn'; } + if (country === 'cn' && isAdobeOrigin && !window.location.pathname.startsWith('/cn') && !window.isErrorPage) { window.location.href = '/cn'; } }); document.head.querySelectorAll('meta').forEach((meta) => {