Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

i18n locale can now be specified with only the language code

Browse Source
This commit is contained in:
JC Brand 2017-02-13 15:16:16 +00:00
parent fddcd1c6cf
commit 48a3c30e75
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/converse-core.js
View File

@ -188,6 +188,9 @@
moment.locale = moment.lang; moment.locale = moment.lang;
} }
moment.locale(utils.detectLocale(this.isMomentLocale)); moment.locale(utils.detectLocale(this.isMomentLocale));
if (_.includes(_.keys(locales), settings.i18n)) {
settings.i18n = locales[settings.i18n];
}
this.i18n = settings.i18n ? settings.i18n : locales[utils.detectLocale(this.isConverseLocale)] || {}; this.i18n = settings.i18n ? settings.i18n : locales[utils.detectLocale(this.isConverseLocale)] || {};
// Translation machinery // Translation machinery