瀏覽代碼

Don't try to parse non-strings

JC Brand 8 年之前
父節點
當前提交
41edd0567d
共有 1 個文件被更改,包括 10 次插入8 次删除
  1. 10 8
      src/utils.js

+ 10 - 8
src/utils.js

@@ -457,14 +457,16 @@
     }
     }
 
 
     utils.getLocale = function (preferred_locale, isSupportedByLibrary) {
     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';
         return utils.detectLocale(isSupportedByLibrary) || 'en';
     };
     };