itizawa 4 лет назад
Родитель
Сommit
19a13fa307
2 измененных файлов с 7 добавлено и 8 удалено
  1. 3 3
      src/client/js/util/LanguageDetectorWrapper.js
  2. 4 5
      src/client/js/util/i18n.js

+ 3 - 3
src/client/js/util/LanguageConverter.js → src/client/js/util/LanguageDetectorWrapper.js

@@ -1,9 +1,9 @@
 import locales from '@root/resource/locales';
 
-class LanguageConverter {
+class LanguageDetectorWrapper {
 
   constructor(langDetector) {
-    this.name = 'languageConverter';
+    this.name = 'languageDetectorWrapper';
     this.type = 'languageDetector';
 
     this.langDetector = langDetector;
@@ -39,4 +39,4 @@ class LanguageConverter {
 
 }
 
-export default LanguageConverter;
+export default LanguageDetectorWrapper;

+ 4 - 5
src/client/js/util/i18n.js

@@ -2,7 +2,7 @@ import i18n from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
 import locales from '@root/resource/locales';
-import LanguageConverter from './LanguageConverter';
+import LanguageDetectorWrapper from './LanguageDetectorWrapper';
 
 // extract metadata list from 'resource/locales/${locale}/meta.json'
 export const localeMetadatas = Object.values(locales).map(locale => locale.meta);
@@ -17,11 +17,10 @@ export const i18nFactory = (userLocaleId) => {
     },
   });
   // Defined detection from the browser to convert id
-  // See Reference: https://github.com/i18next/i18next-browser-languageDetector/blob/master/src/browserLookups/navigator.js
-  const languageConverter = new LanguageConverter(langDetector);
+  const languageDetectorWrapper = new LanguageDetectorWrapper(langDetector);
 
   i18n
-    .use(languageConverter)
+    .use(languageDetectorWrapper)
     .use(initReactI18next) // if not using I18nextProvider
     .init({
       debug: (process.env.NODE_ENV !== 'production'),
@@ -29,7 +28,7 @@ export const i18nFactory = (userLocaleId) => {
       load: 'currentOnly',
 
       fallbackLng: 'en_US',
-      detection: 'languageConverter',
+      detection: 'languageDetectorWrapper',
 
       interpolation: {
         escapeValue: false, // not needed for react!!