From f711baefab7471d7503afe20438ea26a2d2bc879 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 5 Jun 2015 19:39:21 -0700
Subject: [PATCH] GUAC-1217: Use navigator.languages in preference to
 navigator.language (Chrome does not set navigator.language based on user
 preferences).

---
 .../main/webapp/app/settings/services/preferenceService.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guacamole/src/main/webapp/app/settings/services/preferenceService.js b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
index 3c20aa179..f02270d38 100644
--- a/guacamole/src/main/webapp/app/settings/services/preferenceService.js
+++ b/guacamole/src/main/webapp/app/settings/services/preferenceService.js
@@ -88,7 +88,10 @@ angular.module('settings').provider('preferenceService', function preferenceServ
     var getDefaultLanguageKey = function getDefaultLanguageKey() {
 
         // Pull browser language, falling back to US English
-        var language = navigator.language || navigator.browserLanguage || 'en_US';
+        var language = (navigator.languages && navigator.languages[0])
+                     || navigator.language
+                     || navigator.browserLanguage
+                     || 'en';
 
         // Convert to format used internally
         return language.replace(/-/g, '_');