OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert local settings to granular settings 

Signed-off-by: Travis Ralston <travpc@gmail.com>
pull/5468/head
Travis Ralston 2017-10-29 17:05:27 -06:00
parent f6177cd7b5
commit ccf52b2a69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vector/index.js
View File

@ -67,7 +67,6 @@ sdk.loadSkin(require('../component-index'));
var VectorConferenceHandler = require('../VectorConferenceHandler'); var VectorConferenceHandler = require('../VectorConferenceHandler');
import Promise from 'bluebird'; import Promise from 'bluebird';
var request = require('browser-request'); var request = require('browser-request');
import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
import * as languageHandler from 'matrix-react-sdk/lib/languageHandler'; import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
// Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects // Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects
import { _t } from 'matrix-react-sdk/lib/languageHandler'; import { _t } from 'matrix-react-sdk/lib/languageHandler';
@ -78,6 +77,7 @@ import {parseQs, parseQsFromFragment} from './url_utils';
import Platform from './platform'; import Platform from './platform';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import SettingsStore from "../../../matrix-react-sdk/src/settings/SettingsStore";
var lastLocationHashSet = null; var lastLocationHashSet = null;
@ -328,7 +328,7 @@ async function loadApp() {
} }
async function loadLanguage() { async function loadLanguage() {
const prefLang = UserSettingsStore.getLocalSetting('language'); const prefLang = SettingsStore.getValue("language");
let langs = []; let langs = [];
if (!prefLang) { if (!prefLang) {