fix(locales): use standard lang code

crimx · May 16, 2018 · 7a901ec · 7a901ec
1 parent 701d0a1
commit 7a901ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/_helpers/i18n.ts b/src/_helpers/i18n.ts
@@ -21,26 +21,26 @@ export function i18nLoader (
   const namespaces = Object.keys(locales)
   const instance = i18n
     .init({
-      lng: browser.i18n.getUILanguage().replace('-', '_'),
+      lng: browser.i18n.getUILanguage(),
       fallbackLng: 'en',
       debug: process.env.NODE_ENV === 'development',
       saveMissing: false,
       load: 'currentOnly',
 
       defaultNS: defaultNS || namespaces[0] || 'translation',
 
-      whitelist: ['en', 'zh_CN', 'zh_TW'],
+      whitelist: ['en', 'zh-CN', 'zh-TW'],
 
       interpolation: {
         escapeValue: false, // not needed for react!!
       },
 
       resources: namespaces.reduce((res, ns) => {
-        res.zh_CN[ns] = mapValues(locales[ns], x => x.zh_CN)
-        res.zh_TW[ns] = mapValues(locales[ns], x => x.zh_TW)
+        res['zh-CN'][ns] = mapValues(locales[ns], x => x.zh_CN)
+        res['zh-TW'][ns] = mapValues(locales[ns], x => x.zh_TW)
         res.en[ns] = mapValues(locales[ns], x => x.en)
         return res
-      }, { zh_CN: {}, zh_TW: {}, en: {} }),
+      }, { 'zh-CN': {}, 'zh-TW': {}, en: {} }),
 
     }, cb)
 

diff --git a/src/app-config/index.ts b/src/app-config/index.ts
@@ -2,10 +2,10 @@ import { DeepReadonly } from '@/typings/helpers'
 import { getALlDicts } from './dicts'
 import { getAllContextMenus } from './context-menus'
 
-const langUI = (browser.i18n.getUILanguage() || 'en').replace('-', '_')
-const langCode = /^zh_CN|zh_TW|en$/.test(langUI)
-  ? langUI === 'zh_HK'
-    ? 'zh_TW'
+const langUI = (browser.i18n.getUILanguage() || 'en')
+const langCode = /^zh-CN|zh-TW|en$/.test(langUI)
+  ? langUI === 'zh-HK'
+    ? 'zh-TW'
     : langUI
   : 'en'