DB-2342: bring back preferred language box (#1394)

Author: tsl143

mozilla-release/browser/components/preferences/in-content/main.inc.xul

@@ -291,36 +291,35 @@
 </groupbox>
 
 <!-- Languages -->
-<!-- CLIQZ-SPECIAL, DB-2146: temporarily hide Language section
-		  until we know how to run the browser with different locales (>= 2) -->
-<groupbox id="languagesGroup" data-category="paneGeneral" hidden="true" data-hidden-from-search="true">
+<groupbox id="languagesGroup" data-category="paneGeneral">
   <label><html:h2 data-l10n-id="language-header"/></label>
 
+<!-- CLIQZ-SPECIAL, DB-2146: temporarily hide Language section
+		  until we know how to run the browser with different locales (>= 2)
   <vbox id="browserLanguagesBox" align="start" hidden="true">
     <description flex="1" controls="chooseBrowserLanguage" data-l10n-id="choose-browser-language-description"/>
     <hbox>
       <menulist id="defaultBrowserLanguage">
         <menupopup/>
       </menulist>
-      <!-- CLIQZ-SPECIAL, DB-2015: Remove option to download language packs from AMO
       <button id="manageBrowserLanguagesButton"
               is="highlightable-button"
               class="accessory-button"
               data-l10n-id="manage-browser-languages-button"
               oncommand="gMainPane.showBrowserLanguages({search: false})"/>
-      -->
     </hbox>
   </vbox>
   <hbox id="confirmBrowserLanguage" class="message-bar" align="center" hidden="true">
     <image class="message-bar-icon"/>
     <vbox class="message-bar-content-container" align="stretch" flex="1"/>
   </hbox>
-<!-- CLIQZ-SPECIAL, DB-2015: Remove option to choose language packs from AMO
+-->
+
   <hbox id="languagesBox" align="center">
     <description flex="1" control="chooseLanguage" data-l10n-id="choose-language-description"/>
--->
+
     <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
-<!--
+
     <hbox>
       <button id="chooseLanguage"
               is="highlightable-button"
@@ -337,7 +336,6 @@
               " />
     </hbox>
   </hbox>
--->
 
   <hbox id="translationBox" hidden="true">
     <hbox align="center" flex="1">

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

@@ -482,10 +482,7 @@ var gMainPane = {
       "command",
       makeDisableControllingExtension(PREF_SETTING_TYPE, CONTAINERS_KEY)
     );
-    // CLIQZ-SPECIAL: DB-2015, Remove option to choose language packs from AMO
-#if 0
     setEventListener("chooseLanguage", "command", gMainPane.showLanguages);
-#endif
     setEventListener(
       "translationAttributionImage",
       "click",
@@ -1130,12 +1127,14 @@ var gMainPane = {
       true
     );
 
+#if 0
+    // CLIQZ-SPECIAL, DB-2146: temporarily hide Language section
     // This will register the "command" listener.
     let menulist = document.getElementById("defaultBrowserLanguage");
     new SelectionChangedMenulist(menulist, event => {
       gMainPane.onBrowserLanguageChange(event);
     });
-
+#endif
     gMainPane.setBrowserLocales(Services.locale.appLocaleAsBCP47);
   },
 
@@ -1159,6 +1158,7 @@ var gMainPane = {
     }
 
 #if 0
+    // CLIQZ-SPECIAL: DB-2146: temporarily hide Language section
     // Add an option to search for more languages if downloading is supported.
     if (Services.prefs.getBoolPref("intl.multilingual.downloadEnabled")) {
       let menuitem = document.createXULElement("menuitem");
@@ -1170,7 +1170,6 @@ var gMainPane = {
       menuitem.setAttribute("value", "search");
       fragment.appendChild(menuitem);
     }
-#endif
 
     let menulist = document.getElementById("defaultBrowserLanguage");
     let menupopup = menulist.querySelector("menupopup");
@@ -1179,6 +1178,8 @@ var gMainPane = {
     menulist.value = selected;
 
     document.getElementById("browserLanguagesBox").hidden = false;
+
+#endif
   },
 
   /* Show the confirmation message bar to allow a restart into the new locales. */