Bug 1493711 - Pref off downloading langpacks outside of release r=jaws

Differential Revision: https://phabricator.services.mozilla.com/D8909

--HG--
extra : moz-landing-system : lando

browser/app/profile/firefox.js

@@ -1764,6 +1764,12 @@ pref("app.shield.optoutstudies.enabled", false);
 
 // Multi-lingual preferences
 pref("intl.multilingual.enabled", false);
+// AMO only serves language packs for release versions, so this feature only works on release.
+#ifdef RELEASE
+pref("intl.multilingual.downloadEnabled", true);
+#else
+pref("intl.multilingual.downloadEnabled", false);
+#endif
 
 // Simulate conditions that will happen when the browser
 // is running with Fission enabled. This is meant to assist

browser/components/preferences/browserLanguages.js

@@ -293,6 +293,11 @@ var gBrowserLanguagesDialog = {
   _requestedLocales: null,
   requestedLocales: null,
 
+  get downloadEnabled() {
+    // Downloading langpacks isn't always supported, check the pref.
+    return Services.prefs.getBoolPref("intl.multilingual.downloadEnabled");
+  },
+
   beforeAccept() {
     this.requestedLocales = this.getRequestedLocales();
     return true;
@@ -352,6 +357,10 @@ var gBrowserLanguagesDialog = {
   },
 
   async loadLocalesFromAMO() {
+    if (!this.downloadEnabled) {
+      return;
+    }
+
     // Disable the dropdown while we hit the network.
     this._availableLocales.disableWithMessageId("browser-languages-searching");
 
@@ -404,10 +413,12 @@ var gBrowserLanguagesDialog = {
     } else {
       items = [];
     }
+    if (this.downloadEnabled) {
       items.push({
         label: await document.l10n.formatValue("browser-languages-search"),
         value: "search",
       });
+    }
     this._availableLocales.setItems(items);
   },
 

browser/components/preferences/in-content/main.js

@@ -755,15 +755,18 @@ var gMainPane = {
       fragment.appendChild(menuitem);
     }
 
-    // Add an option to search for more languages.
+    // Add an option to search for more languages if downloading is supported.
+    if (Services.prefs.getBoolPref("intl.multilingual.downloadEnabled")) {
       let menuitem = document.createXULElement("menuitem");
       menuitem.id = "defaultBrowserLanguageSearch";
       menuitem.setAttribute(
         "label", await document.l10n.formatValue("browser-languages-search"));
+      menuitem.setAttribute("value", "search");
       menuitem.addEventListener("command", () => {
         gMainPane.showBrowserLanguages({search: true});
       });
       fragment.appendChild(menuitem);
+    }
 
     let menulist = document.getElementById("defaultBrowserLanguage");
     let menupopup = menulist.querySelector("menupopup");

browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js

@@ -163,6 +163,7 @@ add_task(async function testReorderingBrowserLanguages() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["intl.multilingual.enabled", true],
+      ["intl.multilingual.downloadEnabled", true],
       ["intl.locale.requested", "pl,en-US"],
     ],
   });
@@ -219,6 +220,7 @@ add_task(async function testAddAndRemoveRequestedLanguages() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["intl.multilingual.enabled", true],
+      ["intl.multilingual.downloadEnabled", true],
       ["intl.locale.requested", "en-US"],
       ["extensions.langpacks.signatures.required", false],
     ],
@@ -292,6 +294,7 @@ add_task(async function testInstallFromAMO() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["intl.multilingual.enabled", true],
+      ["intl.multilingual.downloadEnabled", true],
       ["intl.locale.requested", "en-US"],
       ["extensions.getAddons.langpacks.url", langpacksUrl],
       ["extensions.langpacks.signatures.required", false],
@@ -360,3 +363,46 @@ add_task(async function testInstallFromAMO() {
 
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
+
+let hasSearchOption = popup => Array.from(popup.children).some(el => el.value == "search");
+
+add_task(async function testDownloadEnabled() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["intl.multilingual.enabled", true],
+      ["intl.multilingual.downloadEnabled", true],
+    ],
+  });
+
+  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
+  let doc = gBrowser.contentDocument;
+
+  let defaultMenulist = doc.getElementById("defaultBrowserLanguage");
+  ok(hasSearchOption(defaultMenulist.firstChild), "There's a search option in the General pane");
+
+  let { available } = await openDialog(doc, false);
+  ok(hasSearchOption(available.firstChild), "There's a search option in the dialog");
+
+  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
+
+
+add_task(async function testDownloadDisabled() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["intl.multilingual.enabled", true],
+      ["intl.multilingual.downloadEnabled", false],
+    ],
+  });
+
+  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
+  let doc = gBrowser.contentDocument;
+
+  let defaultMenulist = doc.getElementById("defaultBrowserLanguage");
+  ok(!hasSearchOption(defaultMenulist.firstChild), "There's no search option in the General pane");
+
+  let { available } = await openDialog(doc, false);
+  ok(!hasSearchOption(available.firstChild), "There's no search option in the dialog");
+
+  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});