r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed angular missing for locale

Browse Source
This commit is contained in:
Igor Zhukov 2014-09-28 22:53:59 +04:00
parent 038c8f2fcc
commit d8143c3b2f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/js/init.js
View File

@ -78,7 +78,7 @@
defaultLocale = 'en-us', defaultLocale = 'en-us',
bootReady = { bootReady = {
dom: false, dom: false,
i18n_ng: locale == defaultLocale, // Already included i18n_ng: false,
i18n_messages: false, i18n_messages: false,
i18n_fallback: false i18n_fallback: false
}, },
@ -114,15 +114,7 @@
if (Config.I18n.supported.indexOf(locale) != -1) { if (Config.I18n.supported.indexOf(locale) != -1) {
Config.I18n.locale = locale; Config.I18n.locale = locale;
} }
bootReady.i18n_ng = Config.I18n.locale == defaultLocale; // Already included
if (!bootReady.i18n_ng) {
$('<script>').appendTo('head')
.on('load', function() {
bootReady.i18n_ng = true;
checkReady();
})
.attr('src', 'vendor/angular/i18n/angular-locale_' + Config.I18n.locale + '.js');
}
$.getJSON('js/locales/' + Config.I18n.locale + '.json').success(function (json) { $.getJSON('js/locales/' + Config.I18n.locale + '.json').success(function (json) {
Config.I18n.messages = json; Config.I18n.messages = json;
@ -143,7 +135,16 @@
$(document).ready(function() { $(document).ready(function() {
bootReady.dom = true; bootReady.dom = true;
if (!bootReady.i18n_ng) { // onDOMready because needs to be after angular
$('<script>').appendTo('body')
.on('load', function() {
bootReady.i18n_ng = true;
checkReady(); checkReady();
})
.attr('src', 'vendor/angular/i18n/angular-locale_' + Config.I18n.locale + '.js');
} else {
checkReady();
}
}); });
}); });
})(); })();