From 2baa4b528202e09552469dbb4c90bbb783a43e59 Mon Sep 17 00:00:00 2001 From: csett86 Date: Sun, 27 Jun 2021 20:57:25 +0200 Subject: [PATCH] refactor: remove dependency to deprected remote module (#593) the remote module will be removed from electron 14 onwards, so replace the locale detection with native browser api that is available in the renderer. Signed-off-by: Christoph Settgast --- app/i18n/index.js | 2 +- app/preload/preload.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/i18n/index.js b/app/i18n/index.js index 43ae7ed..50405b6 100644 --- a/app/i18n/index.js +++ b/app/i18n/index.js @@ -16,7 +16,7 @@ const languages = { sq: { translation: require('./lang/sq.json') } }; -const detectedLocale = window.jitsiNodeAPI.getLocale(); +const detectedLocale = navigator.language; i18n .use(initReactI18next) diff --git a/app/preload/preload.js b/app/preload/preload.js index e8d8020..54bf79b 100644 --- a/app/preload/preload.js +++ b/app/preload/preload.js @@ -1,7 +1,7 @@ /* global process */ const createElectronStorage = require('redux-persist-electron-storage'); -const { ipcRenderer, remote } = require('electron'); +const { ipcRenderer } = require('electron'); const os = require('os'); const jitsiMeetElectronUtils = require('jitsi-meet-electron-utils'); const { openExternalLink } = require('../features/utils/openExternalLink'); @@ -15,7 +15,6 @@ window.jitsiNodeAPI = { openExternalLink, platform: process.platform, jitsiMeetElectronUtils, - getLocale: remote.app.getLocale, ipc: { on: (channel, listener) => { if (!whitelistedIpcChannels.includes(channel)) {