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

Bug 41930: Remove the UI to customize accept_languages.

parent ea33fa7e

browser/components/preferences/main.inc.xhtml

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



  <hbox id="languagesBox" align="center">

    <!--

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

    <button id="chooseLanguage"

            is="highlightable-button"
@@ -368,6 +369,9 @@ 
              languages-customize-select-language.placeholder,

              languages-customize-add.label,

            " />

    -->

    <checkbox id="spoofEnglish"

              data-l10n-id="languages-customize-spoof-english"/>

  </hbox>



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

browser/components/preferences/main.js

+17 −1
Original line number Diff line number Diff line
@@ -483,7 +483,23 @@ var gMainPane = { 
      "command",

      makeDisableControllingExtension(PREF_SETTING_TYPE, CONTAINERS_KEY)

    );

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

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

    {

      const spoofEnglish = document.getElementById("spoofEnglish");

      const kPrefSpoofEnglish = "privacy.spoof_english";

      const preference = Preferences.add({

        id: kPrefSpoofEnglish,

        type: "int",

      });

      const spoofEnglishChanged = () => {

        spoofEnglish.checked = preference.value == 2;

      };

      spoofEnglishChanged();

      preference.on("change", spoofEnglishChanged);

      setEventListener("spoofEnglish", "command", () => {

        preference.value = spoofEnglish.checked ? 2 : 1;

      });

    }

    // TODO (Bug 1817084) Remove this code when we disable the extension

    setEventListener(

      "fxtranslateButton",

toolkit/components/resistfingerprinting/RFPHelper.sys.mjs

+7 −3
Original line number Diff line number Diff line
@@ -203,9 +203,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");