TAS-4086/Default-Browser-Language

src/constants/constants.ts

@@ -1,6 +1,5 @@
 import { NotificationType as CoreNotificationType } from 'src/core/api';
 import { LanguageOption } from 'src/core/api/settings/settings.types';
-import { translate } from 'src/core/utils';
 
 export const SocialCauses = {
   SOCIAL: 'SOCIAL',
@@ -890,15 +889,15 @@ export const supportedLanguages: LanguageOption[] = [
     label: 'English (US)',
   },
   {
-    value: 'jp',
+    value: 'ja',
     label: 'Japanese 日本語',
   },
   {
     value: 'es',
     label: 'Spanish Español',
   },
   {
-    value: 'kr',
+    value: 'ko',
     label: 'Korean 한국어',
   },
 ];

src/core/hooks/useSwitchLanguage.tsx

@@ -4,14 +4,13 @@ import { supportedLanguages } from 'src/constants/constants';
 
 const useSwitchLanguage = (defaultLanguage = 'en') => {
   const [selectedLanguage, setSelectedLanguage] = useState(() => {
-    return localStorage.getItem('language') || defaultLanguage;
+    return localStorage.getItem('i18nextLng') || defaultLanguage;
   });
 
   const switchLanguage = language => {
     if (supportedLanguages.map(lang => lang.value).includes(language)) {
       setSelectedLanguage(language);
       i18next.changeLanguage(language);
-      localStorage.setItem('language', language);
       window.location.reload();
     } else {
       console.warn(`Language '${language}' is not supported.`);

src/core/translation/i18n.ts

@@ -11,13 +11,13 @@ const resources = {
   en: {
     translation: generateTranslationFile(),
   },
-  jp: {
+  ja: {
     translation: generateJPTranslationFile(),
   },
   es: {
     translation: generateESTranslationFile(),
   },
-  kr: {
+  ko: {
     translation: generateKRTranslationFile(),
   },
 };
@@ -27,7 +27,7 @@ i18next
   .use(initReactI18next)
   .init({
     resources,
-    lng: localStorage.getItem('language') || 'en',
+    lng: localStorage.getItem('i18nextLng') || navigator.language || 'en',
     fallbackLng: 'en',
     interpolation: {
       escapeValue: false,

src/modules/settings/components/Language/useLanguage.tsx

@@ -2,7 +2,6 @@ import i18next from 'i18next';
 import { useState } from 'react';
 import { supportedLanguages } from 'src/constants/constants';
 import useSwitchLanguage from 'src/core/hooks/useSwitchLanguage';
-import { translate } from 'src/core/utils';
 
 export const useLanguage = () => {
   const { switchLanguage, selectedLanguage: initialLanguage } = useSwitchLanguage();