Merge branch 'develop' into noscript

This commit is contained in:
Travis Ralston 2020-02-28 13:34:39 -07:00
commit 22bc98c8bc
16 changed files with 1286 additions and 1340 deletions

File diff suppressed because one or more lines are too long

View file

@ -385,4 +385,11 @@ export default class ElectronPlatform extends VectorBasePlatform {
getEventIndexingManager(): BaseEventIndexManager | null {
return this.eventIndexManager;
}
setLanguage(preferredLangs: string[]) {
this._ipcCall('setLanguage', preferredLangs).catch(error => {
console.log("Failed to send setLanguage IPC to Electron");
console.error(error);
});
}
}