[fix]:init language

TankNee · Jul 7, 2021 · 0d90d5c · 0d90d5c
1 parent c73cb72
commit 0d90d5c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src-electron/main-process/electron-main.js b/src-electron/main-process/electron-main.js
@@ -66,7 +66,8 @@ function createWindow () {
       nodeIntegration: process.env.QUASAR_NODE_INTEGRATION,
       nodeIntegrationInWorker: process.env.QUASAR_NODE_INTEGRATION,
       webSecurity: false,
-      experimentalFeatures: false
+      experimentalFeatures: false,
+      enableRemoteModule: true
 
       // More info: /quasar-cli/developing-electron-apps/electron-preload-script
       // preload: path.resolve(__dirname, 'electron-preload.js')

diff --git a/src/ApiHandler.js b/src/ApiHandler.js
@@ -44,7 +44,7 @@ export default {
           icon: icon,
           actions: [
             {
-              label: 'open_in_new',
+              icon: 'open_in_new',
               textColor: 'white',
               handler: () => {
                 shell.showItemInFolder(filePath)

diff --git a/src/boot/i18n.js b/src/boot/i18n.js
@@ -2,7 +2,8 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import messages from 'src/i18n'
 import ClientFileStorage from 'src/utils/storage/ClientFileStorage'
-const local = ClientFileStorage.getItemFromStore('language') || 'en-us'
+const { app } = require('electron').remote
+const local = ClientFileStorage.getItemFromStore('language') || app.getLocale().toLocaleLowerCase()
 Vue.use(VueI18n)
 
 const i18n = new VueI18n({

diff --git a/src/store/client/state.js b/src/store/client/state.js
@@ -1,6 +1,7 @@
+const { app } = require('electron').remote
 export default function () {
   return {
-    language: 'en-us',
+    language: app.getLocale().toLocaleLowerCase(),
     autoLogin: false,
     rememberPassword: true,
     darkMode: false,