Merge branch 'shaolin405mi16-devel/fix-android-quirks'

coderifous · coderifous · commit 0e493bd984b1 · 2016-10-13T08:25:08.000-04:00
* shaolin405mi16-devel/fix-android-quirks:
  * fix android quirks (navigator.languages is empty on Android &gt;= 5.0)
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

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ http://keith-wood.name/localisation.html`
`16`	`16`	`}`
`17`	`17`	`return lang;`
`18`	`18`	`};`
`19`		`- $.defaultLanguage = normaliseLang(navigator.languages ? navigator.languages[0] : navigator.language \|\| navigator.userLanguage);`
	`19`	`+ $.defaultLanguage = normaliseLang(navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] : navigator.language \|\| navigator.userLanguage);`
`20`	`20`	`$.localize = function(pkg, options) {`
`21`	`21`	`var defaultCallback, fileExtension, intermediateLangData, jsonCall, lang, loadLanguage, localizeElement, localizeForSpecialKeys, localizeImageElement, localizeInputElement, localizeOptgroupElement, notifyDelegateLanguageLoaded, regexify, setAttrFromValueForKey, setTextFromValueForKey, valueForKey, wrappedSet;`
`22`	`22`	`if (options == null) {`