[tbb-commits] [torbutton/master] Bug 16887: Update intl.accept_languages value

[gk at torproject.org]

commit c39a9540dc693d8f5b14636c643530f29e1c0ead
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 7 14:01:53 2015 +0000

    Bug 16887: Update intl.accept_languages value
    
    We previously spoofed the `intl.accept_languages` value to "en-us, en"
    but with the update to ESR 38 Firefox does not like the lower case
    country code anymore. See: https://html5.org/r/8458 and
    https://bugzilla.mozilla.org/show_bug.cgi?id=889335 for the reasons
    behind that.
    
    We adapt our code accordingly and set the default value to "en-US, en"
    now. This fixes #13277 as well.
    
    Thanks for this patch, cypherpunk.
---
 src/chrome/content/torbutton.js |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 28da420..11591dc 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2207,10 +2207,10 @@ function torbutton_update_fingerprinting_prefs() {
           m_tb_prefs.clearUserPref("browser.display.max_font_attempts");
         if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count"))
           m_tb_prefs.clearUserPref("browser.display.max_font_count");
- 
-        // Governed also by the spoof_english dialog..       
+
+        // Governed also by the spoof_english dialog..
         if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) {
-          m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en");
+          m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en");
           m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8");
           m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8");
           m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true);