diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index 302fb5a2f..926197eb9 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -21,7 +21,8 @@ }, "view": { "label": "View", - "fullscreen": "Toggle Fullscreen" + "fullscreen": "Toggle Fullscreen", + "languages": "Languages" }, "accounts": { "label": "Accounts", @@ -51,10 +52,6 @@ "close": "Close", "toFront": "Bring All to Front" }, - "settings": { - "label": "Settings", - "languages": "Languages" - }, "help": { "label": "Help" } diff --git a/interface/i18n/mist.zh-TW.i18n.json b/interface/i18n/mist.zh-TW.i18n.json index 7d04b9a0f..3c579c947 100644 --- a/interface/i18n/mist.zh-TW.i18n.json +++ b/interface/i18n/mist.zh-TW.i18n.json @@ -17,7 +17,8 @@ }, "view": { "label": "檢視", - "fullscreen": "全螢幕" + "fullscreen": "全螢幕", + "languages": "語言" }, "accounts": { "label": "帳號", @@ -47,10 +48,6 @@ "close": "關閉", "toFront": "全部前置" }, - "settings": { - "label": "設定", - "languages": "語言" - }, "help": { "label": "幫助" } diff --git a/modules/menuItems.js b/modules/menuItems.js index 431808e2f..95993d3ac 100644 --- a/modules/menuItems.js +++ b/modules/menuItems.js @@ -218,6 +218,21 @@ var menuTempl = function(webviews) { ] }) + let languageMenu = + Object.keys(i18n.options.resources).map(lang_code => { + menuItem = { + label: lang_code, + click: function(){ + let mainWindow = Windows.getByType('main'); + mainWindow.webContents.executeJavaScript( + `TAPi18n.setLanguage("${lang_code}");` + ); + } + } + return menuItem + } + ) + // VIEW menu.push({ label: i18n.t('mist.applicationMenu.view.label'), @@ -230,6 +245,10 @@ var menuTempl = function(webviews) { mainWindow.window.setFullScreen(!mainWindow.window.isFullScreen()); } + }, + { + label: i18n.t('mist.applicationMenu.view.languages'), + submenu: languageMenu } ] }) @@ -432,32 +451,6 @@ var menuTempl = function(webviews) { ] }) - let languageMenu = - Object.keys(i18n.options.resources).map(lang_code => { - menuItem = { - label: lang_code, - click: function(){ - let mainWindow = Windows.getByType('main'); - mainWindow.webContents.executeJavaScript( - `TAPi18n.setLanguage("${lang_code}");` - ); - } - } - return menuItem - } - ) - - // SETTINGS - menu.push({ - label: i18n.t('mist.applicationMenu.settings.label'), - submenu: [ - { - label: i18n.t('mist.applicationMenu.settings.languages'), - submenu: languageMenu - } - ] - }) - // HELP if(process.platform === 'darwin') { menu.push({