fix(neuron-wallet): enable the i18n and update the wallet label of th…

…e application menu
nervosnetwork · Aug 7, 2019 · 664ccc8 · 664ccc8
1 parent 5b20d64
commit 664ccc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
@@ -2,7 +2,6 @@ import { app } from 'electron'
 import 'reflect-metadata'
 import { debounceTime } from 'rxjs/operators'
 
-import i18n from 'utils/i18n'
 import { updateApplicationMenu } from 'utils/application-menu'
 import WindowManager from 'models/window-manager'
 import createMainWindow from 'startup/create-main-window'
@@ -44,7 +43,6 @@ app.on('ready', async () => {
     }
   })
 
-  i18n.changeLanguage(['zh', 'zh-CN'].includes(app.getLocale()) ? 'zh' : 'en')
   const wallets = walletsService.getAll()
   const currentWallet = walletsService.getCurrent()
 

diff --git a/packages/neuron-wallet/src/utils/application-menu.ts b/packages/neuron-wallet/src/utils/application-menu.ts
@@ -58,7 +58,7 @@ export const appMenuItem: MenuItemConstructorOptions = {
 
 export const walletMenuItem: MenuItemConstructorOptions = {
   id: 'wallet',
-  label: 'Wallet',
+  label: i18n.t('application-menu.wallet.label'),
   submenu: [
     { id: 'select', label: i18n.t('application-menu.wallet.select'), submenu: [] },
     {

diff --git a/packages/neuron-wallet/src/utils/i18n.ts b/packages/neuron-wallet/src/utils/i18n.ts
@@ -1,14 +1,16 @@
 import i18n from 'i18next'
 import zh from 'locales/zh'
 import en from 'locales/en'
+import app from 'app'
 
 if (!i18n.isInitialized) {
+  const fallbackLng = ['zh', 'zh-CN'].includes(app.getLocale()) ? 'zh' : 'en'
   i18n.init({
     resources: {
       en,
       zh,
     },
-    fallbackLng: 'en',
+    fallbackLng,
     interpolation: {
       escapeValue: false,
     },