Load locale information only after application's 'ready' event
FREEBIE
This commit is contained in:
parent
5526958c52
commit
53d1e7e6c7
2 changed files with 29 additions and 18 deletions
|
@ -24,6 +24,7 @@ function getLocaleMessages(locale) {
|
||||||
return JSON.parse(fs.readFileSync(targetFile, 'utf-8'));
|
return JSON.parse(fs.readFileSync(targetFile, 'utf-8'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function load() {
|
||||||
// Load locale - if we can't load messages for the current locale, we
|
// Load locale - if we can't load messages for the current locale, we
|
||||||
// default to 'en'
|
// default to 'en'
|
||||||
//
|
//
|
||||||
|
@ -42,7 +43,12 @@ try {
|
||||||
messages = getLocaleMessages(localeName);
|
messages = getLocaleMessages(localeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
return {
|
||||||
name: localeName,
|
name: localeName,
|
||||||
messages
|
messages
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
load: load
|
||||||
|
};
|
||||||
|
|
7
main.js
7
main.js
|
@ -40,9 +40,14 @@ if (config.environment === 'production' && !process.mas) {
|
||||||
const userConfig = require('./app/user_config');
|
const userConfig = require('./app/user_config');
|
||||||
let windowConfig = userConfig.get('window');
|
let windowConfig = userConfig.get('window');
|
||||||
|
|
||||||
const locale = require('./app/locale');
|
const loadLocale = require('./app/locale').load;
|
||||||
|
let locale;
|
||||||
|
|
||||||
function createWindow () {
|
function createWindow () {
|
||||||
|
if (!locale) {
|
||||||
|
locale = loadLocale();
|
||||||
|
}
|
||||||
|
|
||||||
const windowOptions = Object.assign({
|
const windowOptions = Object.assign({
|
||||||
width: 800,
|
width: 800,
|
||||||
height: 610,
|
height: 610,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue