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

Don't try to parse non-strings

Browse Source
This commit is contained in:
JC Brand 2017-04-23 17:18:00 +00:00
parent c7d66377d0
commit 41edd0567d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/utils.js
View File

@ -457,14 +457,16 @@
}
utils.getLocale = function (preferred_locale, isSupportedByLibrary) {
if (preferred_locale === 'en' || isSupportedByLibrary(preferred_locale)) {
return preferred_locale;
}
try {
var obj = window.JSON.parse(preferred_locale);
return obj.locale_data.converse[""].lang;
} catch (e) {
console.log(e);
if (_.isString(preferred_locale)) {
if (preferred_locale === 'en' || isSupportedByLibrary(preferred_locale)) {
return preferred_locale;
}
try {
var obj = window.JSON.parse(preferred_locale);
return obj.locale_data.converse[""].lang;
} catch (e) {
console.log(e);
}
}
return utils.detectLocale(isSupportedByLibrary) || 'en';
};