mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Load locale information only after application's 'ready' event

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-20 10:18:50 -07:00
parent 5526958c52
commit 53d1e7e6c7
No known key found for this signature in database
GPG key ID: A4931C09644C654B
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/locale.js
View file

@ -24,25 +24,31 @@ function getLocaleMessages(locale) {
return JSON.parse(fs.readFileSync(targetFile, 'utf-8'));
}
// Load locale - if we can't load messages for the current locale, we
// default to 'en'
//
// possible locales:
// https://github.com/electron/electron/blob/master/docs/api/locales.md
let localeName = normalizeLocaleName(app.getLocale());
let messages;
function load() {
// Load locale - if we can't load messages for the current locale, we
// default to 'en'
//
// possible locales:
// https://github.com/electron/electron/blob/master/docs/api/locales.md
let localeName = normalizeLocaleName(app.getLocale());
let messages;
try {
messages = getLocaleMessages(localeName);
} catch (e) {
console.log('Problem loading messages for locale ', localeName, e.stack);
console.log('Falling back to en locale');
try {
messages = getLocaleMessages(localeName);
} catch (e) {
console.log('Problem loading messages for locale ', localeName, e.stack);
console.log('Falling back to en locale');
localeName = 'en';
messages = getLocaleMessages(localeName);
localeName = 'en';
messages = getLocaleMessages(localeName);
}
return {
name: localeName,
messages
};
}
module.exports = {
name: localeName,
messages
}
load: load
};

7
main.js
View file

@ -40,9 +40,14 @@ if (config.environment === 'production' && !process.mas) {
const userConfig = require('./app/user_config');
let windowConfig = userConfig.get('window');
const locale = require('./app/locale');
const loadLocale = require('./app/locale').load;
let locale;
function createWindow () {
if (!locale) {
locale = loadLocale();
}
const windowOptions = Object.assign({
width: 800,
height: 610,