* fix android quirks (navigator.languages is empty on Android >= 5.0)

coderifous · Oct 13, 2016 · eaa980b · eaa980b
1 parent 0a57427
commit eaa980b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dist/jquery.localize.js b/dist/jquery.localize.js
@@ -16,7 +16,7 @@ http://keith-wood.name/localisation.html
     }
     return lang;
   };
-  $.defaultLanguage = normaliseLang(navigator.languages ? navigator.languages[0] : navigator.language || navigator.userLanguage);
+  $.defaultLanguage = normaliseLang(navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] : navigator.language || navigator.userLanguage);
   $.localize = function(pkg, options) {
     var defaultCallback, fileExtension, intermediateLangData, jsonCall, lang, loadLanguage, localizeElement, localizeForSpecialKeys, localizeImageElement, localizeInputElement, localizeOptgroupElement, notifyDelegateLanguageLoaded, regexify, setAttrFromValueForKey, setTextFromValueForKey, valueForKey, wrappedSet;
     if (options == null) {

diff --git a/dist/jquery.localize.min.js b/dist/jquery.localize.min.js
diff --git a/src/jquery.localize.coffee b/src/jquery.localize.coffee
@@ -17,7 +17,7 @@ do ($ = jQuery) ->
     lang
 
   # Mozilla uses .language, IE uses .userLanguage
-  $.defaultLanguage = normaliseLang(if navigator.languages then navigator.languages[0] else navigator.language or navigator.userLanguage)
+  $.defaultLanguage = normaliseLang(if navigator.languages and navigator.languages.length > 0 then navigator.languages[0] else navigator.language or navigator.userLanguage)
 
   $.localize = (pkg, options = {}) ->
     wrappedSet           = this