diff --git a/modules/settings/Settings.js b/modules/settings/Settings.js index a08e5c30a..4d8481a2f 100644 --- a/modules/settings/Settings.js +++ b/modules/settings/Settings.js @@ -24,7 +24,6 @@ if (!avatarId) { let localFlipX = JSON.parse(jitsiLocalStorage.getItem("localFlipX") || true); let displayName = UIUtil.unescapeHtml( jitsiLocalStorage.getItem("displayname") || ''); -let language = jitsiLocalStorage.getItem("language"); let cameraDeviceId = jitsiLocalStorage.getItem("cameraDeviceId") || ''; let micDeviceId = jitsiLocalStorage.getItem("micDeviceId") || ''; let welcomePageDisabled = JSON.parse( @@ -113,13 +112,6 @@ export default { return avatarUrl; }, - getLanguage () { - return language; - }, - setLanguage: function (lang) { - language = lang; - }, - /** * Sets new flipX state of local video and saves it to the local storage. * @param {string} val flipX state of local video diff --git a/react/features/app/functions.web.js b/react/features/app/functions.web.js index a8204884e..835620358 100644 --- a/react/features/app/functions.web.js +++ b/react/features/app/functions.web.js @@ -10,7 +10,6 @@ import { WelcomePage } from '../welcome'; import URLProcessor from '../../../modules/config/URLProcessor'; import KeyboardShortcut from '../../../modules/keyboardshortcut/keyboardshortcut'; -import settings from '../../../modules/settings/Settings'; import getTokenData from '../../../modules/tokendata/TokenData'; import JitsiMeetLogStorage from '../../../modules/util/JitsiMeetLogStorage'; @@ -62,7 +61,7 @@ export function init() { // with jitsi meet. APP.API.init(APP.tokenData.jwt ? { forceEnable: true } : undefined); - APP.translation.init(settings.getLanguage()); + APP.translation.init(); } /** diff --git a/react/features/base/connection/actions.web.js b/react/features/base/connection/actions.web.js index da4339781..4a1e65c42 100644 --- a/react/features/base/connection/actions.web.js +++ b/react/features/base/connection/actions.web.js @@ -68,10 +68,9 @@ export function connect() { APP.UI.initConference(); - APP.UI.addListener(UIEvents.LANG_CHANGED, language => { - APP.translation.setLanguage(language); - APP.settings.setLanguage(language); - }); + APP.UI.addListener( + UIEvents.LANG_CHANGED, + language => APP.translation.setLanguage(language)); APP.keyboardshortcut.init();