From feabb864da1d55f37f929998c1f355e2babc1d72 Mon Sep 17 00:00:00 2001 From: Alla Doroshkevych Date: Wed, 2 Aug 2023 16:36:12 -0400 Subject: [PATCH 1/5] browser locale test for IE --- .../src/application-base/ApplicationBase.jsx | 1 + .../src/application-base/private/getBrowserLocale.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/packages/terra-application/src/application-base/ApplicationBase.jsx b/packages/terra-application/src/application-base/ApplicationBase.jsx index 142648486..83dceb194 100644 --- a/packages/terra-application/src/application-base/ApplicationBase.jsx +++ b/packages/terra-application/src/application-base/ApplicationBase.jsx @@ -28,6 +28,7 @@ import styles from './ApplicationBase.module.scss'; const cx = classNames.bind(styles); const browserLocale = getBrowserLocale(); +console.log('browserLocale: ', browserLocale); // We only need to retrieve the root theme and root theme name once for the life of the application. const themeConfig = (typeof (TERRA_THEME_CONFIG) !== 'undefined') ? TERRA_THEME_CONFIG : undefined; diff --git a/packages/terra-application/src/application-base/private/getBrowserLocale.js b/packages/terra-application/src/application-base/private/getBrowserLocale.js index 147b5c107..2b214f8d1 100644 --- a/packages/terra-application/src/application-base/private/getBrowserLocale.js +++ b/packages/terra-application/src/application-base/private/getBrowserLocale.js @@ -62,6 +62,11 @@ const getBrowserLocale = () => { return navigator.browserLanguage; } + /* + if (isSupported(navigator.Systemlanguage)) { + return navigator.Systemlanguage; + } */ + return DEFAULT_LOCALE; }; From cc3a79ec22cc0aeef9cf449bc1980d1d24c91689 Mon Sep 17 00:00:00 2001 From: Alla Doroshkevych Date: Thu, 3 Aug 2023 09:34:08 -0400 Subject: [PATCH 2/5] systemLanguage check for IE added --- .../src/application-base/private/getBrowserLocale.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/terra-application/src/application-base/private/getBrowserLocale.js b/packages/terra-application/src/application-base/private/getBrowserLocale.js index 2b214f8d1..3ea880a7f 100644 --- a/packages/terra-application/src/application-base/private/getBrowserLocale.js +++ b/packages/terra-application/src/application-base/private/getBrowserLocale.js @@ -49,6 +49,10 @@ const getBrowserLocale = () => { if (preferredLocale) { return preferredLocale; } + /* for IE support, as languages and language in IE return undefined, and userLanguage and browserLanguage return "en-US" */ + if (isSupported(navigator.systemLanguage)) { + return navigator.systemLanguage; + } if (isSupported(navigator.language)) { return navigator.language; @@ -62,11 +66,6 @@ const getBrowserLocale = () => { return navigator.browserLanguage; } - /* - if (isSupported(navigator.Systemlanguage)) { - return navigator.Systemlanguage; - } */ - return DEFAULT_LOCALE; }; From 1ed905c68d8597288c22c732bdfb738685ecdab9 Mon Sep 17 00:00:00 2001 From: Alla Doroshkevych Date: Thu, 3 Aug 2023 16:09:08 -0400 Subject: [PATCH 3/5] changelog update --- packages/terra-application/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/terra-application/CHANGELOG.md b/packages/terra-application/CHANGELOG.md index 1b95f1bb0..c84fbe0fe 100644 --- a/packages/terra-application/CHANGELOG.md +++ b/packages/terra-application/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased * Changed + * Updated `getBrowserLocale` method for IE. * Updated jest snapshots for terra-icon and terra-button changes. * Updated size explanations for ModalManager managed by DisclosureManagerContext. * Updated `uuid` to `8.2.0` for consistency with other components. From 434db3213943b5da12deb2a798361098114d4714 Mon Sep 17 00:00:00 2001 From: Alla Doroshkevych Date: Thu, 3 Aug 2023 17:22:59 -0400 Subject: [PATCH 4/5] console.log removed --- .../terra-application/src/application-base/ApplicationBase.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/terra-application/src/application-base/ApplicationBase.jsx b/packages/terra-application/src/application-base/ApplicationBase.jsx index 83dceb194..142648486 100644 --- a/packages/terra-application/src/application-base/ApplicationBase.jsx +++ b/packages/terra-application/src/application-base/ApplicationBase.jsx @@ -28,7 +28,6 @@ import styles from './ApplicationBase.module.scss'; const cx = classNames.bind(styles); const browserLocale = getBrowserLocale(); -console.log('browserLocale: ', browserLocale); // We only need to retrieve the root theme and root theme name once for the life of the application. const themeConfig = (typeof (TERRA_THEME_CONFIG) !== 'undefined') ? TERRA_THEME_CONFIG : undefined; From 4be6a3e1495e7c8d4750b0b5b1655ddd7fb98ec6 Mon Sep 17 00:00:00 2001 From: Alla Doroshkevych Date: Thu, 9 Nov 2023 10:39:46 -0500 Subject: [PATCH 5/5] snapshot update per button component change --- .../utility-menu/__snapshots__/UtilityMenu.test.jsx.snap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/terra-application/tests/jest/application-navigation/private/utility-menu/__snapshots__/UtilityMenu.test.jsx.snap b/packages/terra-application/tests/jest/application-navigation/private/utility-menu/__snapshots__/UtilityMenu.test.jsx.snap index e55110341..c7cece8d5 100644 --- a/packages/terra-application/tests/jest/application-navigation/private/utility-menu/__snapshots__/UtilityMenu.test.jsx.snap +++ b/packages/terra-application/tests/jest/application-navigation/private/utility-menu/__snapshots__/UtilityMenu.test.jsx.snap @@ -867,7 +867,7 @@ exports[`UtilityMenu should render with function callbacks 1`] = ` type="button" >