From f0ef54422c70e64dd63c62d6e1cd71b19050a094 Mon Sep 17 00:00:00 2001 From: achour94 Date: Tue, 19 Aug 2025 14:20:44 +0200 Subject: [PATCH] Update import for getComputedLanguage Signed-off-by: achour94 --- package-lock.json | 8 ++++---- package.json | 2 +- src/components/App/app.tsx | 2 +- src/redux/local-storage.ts | 3 +-- src/utils/language.ts | 19 ------------------- 5 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 src/utils/language.ts diff --git a/package-lock.json b/package-lock.json index 8e3b3d2..d19a1eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", - "@gridsuite/commons-ui": "0.112.0", + "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.119.2.tgz", "@hookform/resolvers": "^4.0.0", "@mui/icons-material": "^5.16.14", "@mui/lab": "5.0.0-alpha.175", @@ -3074,9 +3074,9 @@ } }, "node_modules/@gridsuite/commons-ui": { - "version": "0.112.0", - "resolved": "https://registry.npmjs.org/@gridsuite/commons-ui/-/commons-ui-0.112.0.tgz", - "integrity": "sha512-4xD4ZUCz8dJlogQJbRAmOXFPOBcWJ+mAQX0du2Mw6B9c1c/DBBd81OO/4lj2ccM3VoW4nJ8EtWQlgptnlTl83w==", + "version": "0.119.2", + "resolved": "file:../commons-ui/gridsuite-commons-ui-0.119.2.tgz", + "integrity": "sha512-hOXCTqqH71smdE0SKyYUEuufBnD6htXAZ+ObahuyDOEME0yLn5ULzxmKC7bYFsxJDhzlIYnHp+FmkFzfMFPNxA==", "license": "MPL-2.0", "dependencies": { "@ag-grid-community/locale": "^33.1.0", diff --git a/package.json b/package.json index 9455b78..1aee9a4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dependencies": { "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", - "@gridsuite/commons-ui": "0.112.0", + "@gridsuite/commons-ui": "file:../commons-ui/gridsuite-commons-ui-0.119.2.tgz", "@hookform/resolvers": "^4.0.0", "@mui/icons-material": "^5.16.14", "@mui/lab": "5.0.0-alpha.175", diff --git a/src/components/App/app.tsx b/src/components/App/app.tsx index 86746c1..02cd7c9 100644 --- a/src/components/App/app.tsx +++ b/src/components/App/app.tsx @@ -11,6 +11,7 @@ import { Grid } from '@mui/material'; import { AnnouncementNotification, CardErrorBoundary, + getComputedLanguage, NotificationsUrlKeys, useNotificationsListener, useSnackMessage, @@ -19,7 +20,6 @@ import { selectComputedLanguage, selectLanguage, selectTheme } from '../../redux import { AppState } from '../../redux/reducer'; import { ConfigParameters, ConfigSrv } from '../../services'; import { APP_NAME, COMMON_APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../../utils/config-params'; -import { getComputedLanguage } from '../../utils/language'; import AppTopBar from './app-top-bar'; import { useDebugRender } from '../../utils/hooks'; import { AppDispatch } from '../../redux/store'; diff --git a/src/redux/local-storage.ts b/src/redux/local-storage.ts index af0574b..535bb03 100644 --- a/src/redux/local-storage.ts +++ b/src/redux/local-storage.ts @@ -5,8 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { DARK_THEME, GsLang, GsTheme, LANG_SYSTEM } from '@gridsuite/commons-ui'; -import { getComputedLanguage } from '../utils/language'; +import { DARK_THEME, getComputedLanguage, GsLang, GsTheme, LANG_SYSTEM } from '@gridsuite/commons-ui'; import { APP_NAME } from '../utils/config-params'; const LOCAL_STORAGE_THEME_KEY = (APP_NAME + '_THEME').toUpperCase(); diff --git a/src/utils/language.ts b/src/utils/language.ts deleted file mode 100644 index cb9f52a..0000000 --- a/src/utils/language.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2021, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -import { GsLang, GsLangUser, LANG_ENGLISH, LANG_FRENCH, LANG_SYSTEM } from '@gridsuite/commons-ui'; - -const supportedLanguages: string[] = [LANG_FRENCH, LANG_ENGLISH]; - -export function getSystemLanguage(): GsLangUser { - const systemLanguage = navigator.language.split(/[-_]/)[0]; - return supportedLanguages.includes(systemLanguage) ? (systemLanguage as GsLangUser) : LANG_ENGLISH; -} - -export function getComputedLanguage(language: GsLang): GsLangUser { - return language === LANG_SYSTEM ? getSystemLanguage() : language; -}