Commit 48a3c30e authored by JC Brand's avatar JC Brand

i18n locale can now be specified with only the language code

parent fddcd1c6
......@@ -188,6 +188,9 @@
moment.locale = moment.lang;
}
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)] || {};
// Translation machinery
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment