Don't try to parse non-strings

41edd056 · JC Brand · c7d66377 · 41edd056
Commit 41edd056 authored Apr 23, 2017 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

src/utils.js src/utils.js +10 -8

No files found.
--- a/src/utils.js
+++ b/src/utils.js
@@ -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';
    };