Merge branch 'release/1.3' of https://github.com/qubic/explorer-frontend

 into release/1.4

src/app/main/404/Error404Config.js

@@ -7,8 +7,8 @@ import nl from './i18n/nl';
 import ru from './i18n/ru';
 import pt from './i18n/pt';
 import tr from './i18n/tr';
-import cn from './i18n/cn';
-import jp from './i18n/jp';
+import zh from './i18n/zh';
+import ja from './i18n/ja';
 import ar from './i18n/ar';
 import Error404Page from './Error404Page';
 
@@ -20,8 +20,8 @@ i18next.addResourceBundle('nl', 'error404Page', nl);
 i18next.addResourceBundle('ru', 'error404Page', ru);
 i18next.addResourceBundle('pt', 'error404Page', pt);
 i18next.addResourceBundle('tr', 'error404Page', tr);
-i18next.addResourceBundle('cn', 'error404Page', cn);
-i18next.addResourceBundle('jp', 'error404Page', jp);
+i18next.addResourceBundle('zh', 'error404Page', zh);
+i18next.addResourceBundle('ja', 'error404Page', ja);
 i18next.addResourceBundle('ar', 'error404Page', ar);
 
 const Error404Config = {

src/app/main/apps/network/NetworkConfig.js

@@ -7,8 +7,8 @@ import nl from './i18n/nl';
 import ru from './i18n/ru';
 import pt from './i18n/pt';
 import tr from './i18n/tr';
-import cn from './i18n/cn';
-import jp from './i18n/jp';
+import zh from './i18n/zh';
+import ja from './i18n/ja';
 import ar from './i18n/ar';
 import NetworkPage from './NetworkPage';
 import TickPage from './tick/TickPage';
@@ -24,8 +24,8 @@ i18next.addResourceBundle('nl', 'networkPage', nl);
 i18next.addResourceBundle('ru', 'networkPage', ru);
 i18next.addResourceBundle('pt', 'networkPage', pt);
 i18next.addResourceBundle('tr', 'networkPage', tr);
-i18next.addResourceBundle('cn', 'networkPage', cn);
-i18next.addResourceBundle('jp', 'networkPage', jp);
+i18next.addResourceBundle('zh', 'networkPage', zh);
+i18next.addResourceBundle('ja', 'networkPage', ja);
 i18next.addResourceBundle('ar', 'networkPage', ar);
 
 const NetworkConfig = {

src/app/store/i18nSlice.js

@@ -1,6 +1,7 @@
 import { createSelector, createSlice } from '@reduxjs/toolkit';
 import i18n from 'src/i18n';
 import { setDefaultSettings } from './fuse/settingsSlice';
+import suggestedLanguages from '../utils/constants';
 
 export const changeLanguage = (languageId) => (dispatch, getState) => {
   const { direction } = getState().fuse.settings.defaults;
@@ -20,19 +21,7 @@ const i18nSlice = createSlice({
   name: 'i18n',
   initialState: {
     language: i18n.options.lng, // Use the saved language from localStorage if available
-    languages: [
-      { id: 'en', title: 'English' },
-      { id: 'de', title: 'Deutsch' },
-      { id: 'es', title: 'Español' },
-      { id: 'fr', title: 'Français' },
-      { id: 'nl', title: 'Nederlands' },
-      { id: 'ru', title: 'Русский' },
-      { id: 'pt', title: 'Português' },
-      { id: 'tr', title: 'Türkçe' },
-      { id: 'cn', title: '中文' },
-      { id: 'jp', title: '日本語' },
-      { id: 'ar', title: 'العربية' },
-    ],
+    languages: suggestedLanguages,
   },
   reducers: {
     languageChanged: (state, action) => {

src/app/utils/constants.js

@@ -0,0 +1,15 @@
+const suggestedLanguages = [
+  { id: 'en', title: 'English' },
+  { id: 'de', title: 'Deutsch' },
+  { id: 'es', title: 'Español' },
+  { id: 'fr', title: 'Français' },
+  { id: 'nl', title: 'Nederlands' },
+  { id: 'ru', title: 'Русский' },
+  { id: 'pt', title: 'Português' },
+  { id: 'tr', title: 'Türkçe' },
+  { id: 'zh', title: '中文' },
+  { id: 'ja', title: '日本語' },
+  { id: 'ar', title: 'العربية' },
+];
+
+export default suggestedLanguages;

src/i18n.js

@@ -1,5 +1,6 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
+import suggestedLanguages from './app/utils/constants';
 
 // the translations
 // (tip move them in a JSON file and import them)
@@ -11,29 +12,31 @@ const resources = {
   },
 };
 
-// const getInitialLanguage = () => {
-//   // Check for a stored language in localStorage
-//   const storedLang = localStorage.getItem('lng');
-//   if (storedLang) {
-//     return storedLang;
-//   }
-
-//   // Get browser language
-//   const browserLang = navigator.language.split('-')[0]; // Extract base language, e.g., 'en' from 'en-US'
-//   if (browserLang) {
-//     return browserLang;
-//   }
-
-//   // Default to English if the browser language is not supported
-//   return 'en';
-// };
+const getInitialLanguage = () => {
+  // Check for a stored language in localStorage
+  const storedLang = localStorage.getItem('lng');
+  if (storedLang) {
+    return storedLang;
+  }
+
+  // Get browser language
+  const browserLang = navigator.language.split('-')[0]; // Extract base language, e.g., 'en' from 'en-US'
+
+  if (browserLang) {
+    const foundLang = suggestedLanguages.find((lng) => browserLang === lng.id);
+    if (foundLang) {
+      return browserLang;
+    }
+  }
+  // Default to English if the browser language is not supported
+  return 'en';
+};
 
 i18n
   .use(initReactI18next) // passes i18n down to react-i18next
   .init({
     resources,
-    lng: localStorage.getItem('lng') || 'en',
-    // lng: getInitialLanguage(),
+    lng: getInitialLanguage(),
 
     keySeparator: false, // we do not use keys in form messages.welcome