From 0aa5342aac849ed7958a4beed3bbac2ad4fdc85e Mon Sep 17 00:00:00 2001 From: "karl.hudgell" Date: Tue, 15 Sep 2020 10:58:04 +0100 Subject: [PATCH] working multi lang settings store --- app.js | 8 ++++++++ lib/common.js | 3 ++- lib/globalVars.js | 1 - pages/pages.js | 16 +++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 3d797e8..efaf6af 100644 --- a/app.js +++ b/app.js @@ -1,3 +1,11 @@ +const settings = require("settings-store") + +settings.init({ + appName: "MiWatchKleaner", //required, + // publisherName: "Bar", //optional + // reverseDNS: "com.bar.foo" //required for macOS +}) + const pages = require('./pages/pages') pages.selectLanguage() diff --git a/lib/common.js b/lib/common.js index 57cef39..378eddb 100644 --- a/lib/common.js +++ b/lib/common.js @@ -8,11 +8,12 @@ var shell = require('shelljs'); const logger = require('perfect-logger'); const Language = require("@shypes/language-translator"); const globalVariables = require('../lib/globalVars'); +const settings = require("settings-store"); var chalkRainbow = require('chalk-rainbow') module.exports = { header: async (page) => { - Language.setActiveLang(globalVariables.language) + Language.setActiveLang(await settings.value("Lang")) clear(); console.log( chalkRainbow( diff --git a/lib/globalVars.js b/lib/globalVars.js index 6551469..5cce1ae 100644 --- a/lib/globalVars.js +++ b/lib/globalVars.js @@ -1,7 +1,6 @@ class globalVariables { localUSB = ""; miWatchIpaddress = ""; - language = ""; usersList=[]; } diff --git a/pages/pages.js b/pages/pages.js index 4657f38..f88175b 100644 --- a/pages/pages.js +++ b/pages/pages.js @@ -6,6 +6,8 @@ const logger = require('perfect-logger'); const Language = require("@shypes/language-translator"); const globalVariables = require('../lib/globalVars'); const adb = require('../lib/adb'); +const settings = require("settings-store"); + logger.info(process.platform + " detected") if (process.platform === 'win32' || process.platform === 'win64') { @@ -215,11 +217,15 @@ module.exports = { }, selectLanguage: async () => { - common.header('Select Language') - common.log('Select Language') - const v = await inquirer.LanguageSelect() - globalVariables.language = v.selection - module.exports.connectWatch() + if (await settings.value("Lang") != undefined) { + common.log(await settings.value("Lang") + " Selected") + module.exports.connectWatch() + } else { + common.header('Select Language') + common.log('Select Language') + const v = await inquirer.LanguageSelect() + settings.setValue("Lang", v.selection) + } }, mainMenu: async () => {