mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-02-15 07:28:59 +00:00
Load locale information only after application's 'ready' event
FREEBIE
This commit is contained in:
@@ -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
7
main.js
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user