Commit b03abee2 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

BB 41930: Remove the UI to customize accept_languages.

parent 7de8af98

browser/components/preferences/config/languages.mjs

+21 −0
Original line number Diff line number Diff line
@@ -658,9 +658,22 @@ Preferences.addSetting({ 
  },

});



Preferences.addSetting({

  id: "websiteSpoofEnglish",

  pref: "privacy.spoof_english",

  get: val => {

    return val == 2;

  },

  set: val => {

    return val ? 2 : 1;

  },

});



Preferences.addSetting({

  id: "websiteLanguageWrapper",

  deps: ["acceptLanguages"],

  // Hide website language settings. tor-browser#41930.

  visible: () => false,

  onUserReorder(event, deps) {

    let re = /\s*(?:,|$)\s*/;

    let languages = /**@type {string} */ (deps.acceptLanguages.value)
@@ -931,6 +944,14 @@ SettingGroupManager.registerGroups({ 
      },

    ],

  },

  websiteSpoofEnglish: {

    items: [

      {

        id: "websiteSpoofEnglish",

        l10nId: "languages-customize-spoof-english",

      },

    ],

  },

  translations: {

    inProgress: true,

    subcategory: "translations",

browser/components/preferences/main.inc.xhtml

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
  </hbox>



  <hbox id="languagesBox" align="center" data-srd-groupid="websiteLanguage">

    <!--

    <description flex="1" control="chooseLanguage" data-l10n-id="choose-language-description"/>

    <button id="chooseLanguage"

            is="highlightable-button"
@@ -97,7 +98,11 @@ 
              languages-customize-select-language.placeholder,

              languages-customize-add.label,

            " />

    -->

  </hbox>

  <!-- TODO: Integrate into the "Languages" setting-group after bugzilla bug

     - 1972081. -->

  <html:setting-group groupid="websiteSpoofEnglish"></html:setting-group>



  <checkbox id="useSystemLocale" hidden="true"

            data-l10n-id="use-system-locale"

browser/components/preferences/main.js

+2 −1
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ var gMainPane = { 
    initSettingGroup("fonts");

    initSettingGroup("browserLanguage");

    initSettingGroup("websiteLanguage");

    initSettingGroup("websiteSpoofEnglish");

    initSettingGroup("browsing");

    initSettingGroup("keyboardAndScrolling");

    initSettingGroup("motionAndLink");
@@ -693,7 +694,7 @@ var gMainPane = { 
      gMainPane.showBrowserLanguagesSubDialog({ search: false });

    });



    setEventListener("chooseLanguage", "command", gMainPane.showLanguages);

    // setEventListener("chooseLanguage", "command", gMainPane.showLanguages);



    // Initilize Application section.

toolkit/components/resistfingerprinting/RFPHelper.sys.mjs

+7 −3
Original line number Diff line number Diff line
@@ -184,9 +184,13 @@ class _RFPHelper { 
      // Works like disabling accept-language spoofing.

      // fall through

      case 1: // don't spoof

        // We don't reset intl.accept_languages. Instead, setting

        // privacy.spoof_english to 1 allows user to change preferred language

        // settings through Preferences UI.

        if (this.rfpEnabled) {

          // When RFP is enabled, we force intl.accept_languages to be the

          // default, or en-US, en when spoof English is enabled.

          // See tor-browser#41930.

          Services.prefs.clearUserPref("intl.accept_languages");

          Services.prefs.addObserver("intl.accept_languages", this);

        }

        break;

      case 2: // spoof

        Services.prefs.setCharPref("intl.accept_languages", "en-US, en");