Commit 472b5456 authored by henry's avatar henry Committed by morgan
Browse files

fixup! BB 41930: Remove the UI to customize accept_languages.

BB 45176: Add "Request English" checkbox to Website langauges.
parent 7d1427b6
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -899,7 +899,9 @@ SettingGroupManager.registerGroups({
  },
  websiteLanguage: {
    inProgress: true,
    l10nId: "website-language-heading",
    // Modify the description to remove any mention of choosing the order of
    // languages. tor-browser#45176.
    l10nId: "website-language-heading-no-preferred-order",
    headingLevel: 2,
    iconSrc: "chrome://global/skin/icons/defaultFavicon.svg",
    items: [
@@ -942,9 +944,14 @@ SettingGroupManager.registerGroups({
          },
        ],
      },
      {
        id: "websiteSpoofEnglish",
        l10nId: "languages-customize-spoof-english",
      },
    ],
  },
  websiteSpoofEnglish: {
  // TODO: Remove once we switch to the new settings redesign. tor-browser#45177
  websiteSpoofEnglishControl: {
    items: [
      {
        id: "websiteSpoofEnglish",
+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@
  </hbox>
  <!-- TODO: Integrate into the "Languages" setting-group after bugzilla bug
     - 1972081. -->
  <html:setting-group groupid="websiteSpoofEnglish"></html:setting-group>
  <html:setting-group groupid="websiteSpoofEnglishControl"></html:setting-group>

  <checkbox id="useSystemLocale" hidden="true"
            data-l10n-id="use-system-locale"
+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ var gMainPane = {
    initSettingGroup("fonts");
    initSettingGroup("browserLanguage");
    initSettingGroup("websiteLanguage");
    initSettingGroup("websiteSpoofEnglish");
    initSettingGroup("websiteSpoofEnglishControl");
    initSettingGroup("browsing");
    initSettingGroup("keyboardAndScrolling");
    initSettingGroup("motionAndLink");