`preferred_locale` might be a JSON string, not an object

9f975c79 · JC Brand · 9faf9c3d · 9f975c79
Commit 9f975c79 authored Apr 22, 2017 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

src/utils.js src/utils.js +6 -6

No files found.
--- a/src/utils.js
+++ b/src/utils.js
@@ -459,12 +459,12 @@
    utils.getLocale = function (preferred_locale, isSupportedByLibrary) {
        if (isSupportedByLibrary(preferred_locale)) {
            return preferred_locale;
-        } else if (_.isObject(preferred_locale)) {
+        }
-            try {
+        try {
-                return preferred_locale.locale_data.converse[""].lang;
+            var obj = window.JSON.parse(preferred_locale);
-            } catch (e) {
+            return obj.locale_data.converse[""].lang;
-                console.log(e);
+        } catch (e) {
-            }
+            console.log(e);
        }
        return utils.detectLocale(isSupportedByLibrary) || 'en';
    };