From 3cda5e1f7c79e4c841255830cc6929a9771a1438 Mon Sep 17 00:00:00 2001 From: Kris Carle Date: Mon, 19 Oct 2015 16:47:48 -0400 Subject: [PATCH] better support for browser language preferences Use navigator.languages preferences when available. This allows a preferred language to be set in Chrome without needing to change the primary language of the OS. This appears to only apply when iD is running outside of openstreetmap.org, as we are doing for the loggingroads.org project. When it is framed inside osm, the osm user profile language settings appear to override the browser settings. also see: https://alicoding.com/detect-browser-language-preference-in-firefox-and-chrome-using-javascript/ and http://www.w3.org/html/wg/drafts/html/master/webappapis.html#dom-navigator-languages --- js/id/id.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/id/id.js b/js/id/id.js index 06929472c..f861ebfca 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -380,7 +380,7 @@ iD.version = '1.7.4'; // Added due to incomplete svg style support. See #715 detected.opera = (detected.browser.toLowerCase() === 'opera' && parseFloat(detected.version) < 15 ); - detected.locale = navigator.language || navigator.userLanguage || 'en-US'; + detected.locale = navigator.languages ? navigator.languages[0] : (navigator.language || navigator.userLanguage || 'en-US'); detected.filedrop = (window.FileReader && 'ondrop' in window);