From 5f1c4b8674b576feb51e4a5312f4803e61cc0136 Mon Sep 17 00:00:00 2001 From: rkhatta1 Date: Sun, 9 Feb 2025 01:07:31 -0700 Subject: [PATCH 1/5] Fix: Issue#1726 - FE - Language preference should be stored in Redux store. --- Client/src/Components/LanguageSelector.jsx | 7 +++++-- Client/src/Features/UI/uiSlice.js | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Client/src/Components/LanguageSelector.jsx b/Client/src/Components/LanguageSelector.jsx index 4f1193cd0..e1a19c231 100644 --- a/Client/src/Components/LanguageSelector.jsx +++ b/Client/src/Components/LanguageSelector.jsx @@ -3,15 +3,18 @@ import { useTranslation } from "react-i18next"; import { Box, MenuItem, Select, Stack } from "@mui/material"; import { useTheme } from "@emotion/react"; import Flag from "react-world-flags"; +import { useSelector, useDispatch } from "react-redux"; +import { setLanguage } from "../Features/Settings/uiSlice"; const LanguageSelector = () => { const { i18n } = useTranslation(); const theme = useTheme(); - const [language, setLanguage] = useState(i18n.language || "gb"); + const dispatch = useDispatch(); + const language = useSelector((state) => state.ui.language); const handleChange = (event) => { const newLang = event.target.value; - setLanguage(newLang); + dispatch(setLanguage(newLang)); i18n.changeLanguage(newLang); }; diff --git a/Client/src/Features/UI/uiSlice.js b/Client/src/Features/UI/uiSlice.js index 4565c6c5d..5731307ec 100644 --- a/Client/src/Features/UI/uiSlice.js +++ b/Client/src/Features/UI/uiSlice.js @@ -23,6 +23,7 @@ const initialState = { greeting: { index: 0, lastUpdate: null }, timezone: "America/Toronto", distributedUptimeEnabled: false, + language: "gb", }; const uiSlice = createSlice({ @@ -51,6 +52,9 @@ const uiSlice = createSlice({ setTimezone(state, action) { state.timezone = action.payload.timezone; }, + setLanguage(state, action) { + state.language = action.payload; + }, }, }); @@ -62,4 +66,5 @@ export const { setGreeting, setTimezone, setDistributedUptimeEnabled, + setLanguage, } = uiSlice.actions; From f3dfa17d7fbc4992e861e72c8062ba3f49abe9d3 Mon Sep 17 00:00:00 2001 From: rkhatta1 Date: Sun, 9 Feb 2025 13:13:23 -0700 Subject: [PATCH 2/5] Cleaned the imports and corrected the default language code in uiSlice.js --- Client/src/Components/LanguageSelector.jsx | 1 - Client/src/Features/UI/uiSlice.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Client/src/Components/LanguageSelector.jsx b/Client/src/Components/LanguageSelector.jsx index 9f60a5b42..2d2fb184a 100644 --- a/Client/src/Components/LanguageSelector.jsx +++ b/Client/src/Components/LanguageSelector.jsx @@ -1,4 +1,3 @@ -import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Box, MenuItem, Select, Stack } from "@mui/material"; import { useTheme } from "@emotion/react"; diff --git a/Client/src/Features/UI/uiSlice.js b/Client/src/Features/UI/uiSlice.js index 5731307ec..2dd73bc07 100644 --- a/Client/src/Features/UI/uiSlice.js +++ b/Client/src/Features/UI/uiSlice.js @@ -23,7 +23,7 @@ const initialState = { greeting: { index: 0, lastUpdate: null }, timezone: "America/Toronto", distributedUptimeEnabled: false, - language: "gb", + language: "en", }; const uiSlice = createSlice({ From f747751563d016f6db3106724f1d1dfdda3cdbdf Mon Sep 17 00:00:00 2001 From: rkhatta1 Date: Sun, 9 Feb 2025 13:17:12 -0700 Subject: [PATCH 3/5] Corrcted the uiSlice import in LanguageSelector.jsx --- Client/src/Components/LanguageSelector.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/Components/LanguageSelector.jsx b/Client/src/Components/LanguageSelector.jsx index 2d2fb184a..1893c10c4 100644 --- a/Client/src/Components/LanguageSelector.jsx +++ b/Client/src/Components/LanguageSelector.jsx @@ -3,7 +3,7 @@ import { Box, MenuItem, Select, Stack } from "@mui/material"; import { useTheme } from "@emotion/react"; import "flag-icons/css/flag-icons.min.css"; import { useSelector, useDispatch } from "react-redux"; -import { setLanguage } from "../Features/Settings/uiSlice"; +import { setLanguage } from "../Features/UI/uiSlice"; const LanguageSelector = () => { const { i18n } = useTranslation(); From 590338a48baf007d03726411dc677c6a131ec1e3 Mon Sep 17 00:00:00 2001 From: rkhatta1 Date: Sun, 9 Feb 2025 22:09:39 -0700 Subject: [PATCH 4/5] Made the requested changes to i18.js, LanguageSelector.jsx and uiSlice.js. --- Client/src/Components/LanguageSelector.jsx | 7 ++----- Client/src/Features/UI/uiSlice.js | 2 +- Client/src/Utils/i18n.js | 6 ++++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Client/src/Components/LanguageSelector.jsx b/Client/src/Components/LanguageSelector.jsx index 1893c10c4..ca8e9207c 100644 --- a/Client/src/Components/LanguageSelector.jsx +++ b/Client/src/Components/LanguageSelector.jsx @@ -2,18 +2,15 @@ import { useTranslation } from "react-i18next"; import { Box, MenuItem, Select, Stack } from "@mui/material"; import { useTheme } from "@emotion/react"; import "flag-icons/css/flag-icons.min.css"; -import { useSelector, useDispatch } from "react-redux"; -import { setLanguage } from "../Features/UI/uiSlice"; +import { useSelector } from "react-redux"; const LanguageSelector = () => { const { i18n } = useTranslation(); const theme = useTheme(); - const dispatch = useDispatch(); - const language = useSelector((state) => state.ui.language); + const { language } = useSelector((state) => state.ui); const handleChange = (event) => { const newLang = event.target.value; - dispatch(setLanguage(newLang)); i18n.changeLanguage(newLang); }; diff --git a/Client/src/Features/UI/uiSlice.js b/Client/src/Features/UI/uiSlice.js index 2dd73bc07..5731307ec 100644 --- a/Client/src/Features/UI/uiSlice.js +++ b/Client/src/Features/UI/uiSlice.js @@ -23,7 +23,7 @@ const initialState = { greeting: { index: 0, lastUpdate: null }, timezone: "America/Toronto", distributedUptimeEnabled: false, - language: "en", + language: "gb", }; const uiSlice = createSlice({ diff --git a/Client/src/Utils/i18n.js b/Client/src/Utils/i18n.js index f7528f4b5..7ccc0d241 100644 --- a/Client/src/Utils/i18n.js +++ b/Client/src/Utils/i18n.js @@ -1,5 +1,7 @@ import i18n from "i18next"; import { initReactI18next } from "react-i18next"; +import { setLanguage } from "../Features/UI/uiSlice"; +import store from "../store"; const primaryLanguage = "gb"; @@ -13,7 +15,7 @@ Object.keys(translations).forEach((path) => { }; }); -const savedLanguage = localStorage.getItem("language") || primaryLanguage; +const savedLanguage = store.getState.ui.language || primaryLanguage; i18n.use(initReactI18next).init({ resources, @@ -28,7 +30,7 @@ i18n.use(initReactI18next).init({ }); i18n.on("languageChanged", (lng) => { - localStorage.setItem("language", lng); + store.dispatch(setLanguage(lng)); }); export default i18n; From 46e27a69f36164b4f9f90dc841805416ef0c0f64 Mon Sep 17 00:00:00 2001 From: rkhatta1 Date: Mon, 10 Feb 2025 10:38:51 -0700 Subject: [PATCH 5/5] Corrected the usage of getState() funciotn in i18n.js. --- Client/src/Utils/i18n.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Client/src/Utils/i18n.js b/Client/src/Utils/i18n.js index 7ccc0d241..6243a2599 100644 --- a/Client/src/Utils/i18n.js +++ b/Client/src/Utils/i18n.js @@ -15,11 +15,12 @@ Object.keys(translations).forEach((path) => { }; }); -const savedLanguage = store.getState.ui.language || primaryLanguage; +const savedLanguage = store.getState()?.ui?.language; +const initialLanguage = savedLanguage || primaryLanguage; i18n.use(initReactI18next).init({ resources, - lng: savedLanguage, + lng: initialLanguage, fallbackLng: primaryLanguage, debug: import.meta.env.MODE === "development", ns: ["translation"],