safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 09:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1217: Use navigator.languages in preference to navigator.language (Chrome does not set navigator.language based on user preferences).

Browse Source
This commit is contained in:
Michael Jumper
2015-06-05 19:39:21 -07:00
parent a0bd737ac6
commit f711baefab
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole/src/main/webapp/app/settings/services/preferenceService.js
View File

@@ -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, '_');