Issue 3222 - Don`t do localization in the contentPolicy module

chrome/content/ui/composer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 101 matching lines @@
     // IOService returned nsIURI - not much we can do with it
     addSuggestion(item.location);
     E("patternGroup").value = "";
   }
   if (Prefs.composer_default == 0)
     E("customPattern").focus();
   else
     E("patternGroup").focus();
 
   let types = [];
-  for (let type of Policy.localizedDescr.keys())
-    types.push(type);
+  for (let type of Policy.contentTypes)
+    types.push([type, Utils.getString("type_label_" + type.toLowerCase())]);
   types.sort();

[tschuster, 2015/11/05 15:06:15]

Seems like sorting [type, label] could be different from just type.

[Wladimir Palant, 2015/11/05 15:47:11]

It actually is the same, due to the way arrays are stringified. Then again, I
think that this isn't a good way to solve this so I reworked this part.

 
   let docDomain = item.docDomain;
   let thirdParty = item.thirdParty;
 
   if (docDomain)
     docDomain = docDomain.replace(/^www\./i, "").replace(/\.+$/, "");
   if (docDomain)
     E("domainRestriction").value = docDomain;
 
   E("thirdParty").hidden = !thirdParty;
   E("firstParty").hidden = thirdParty;
 
   let typeGroup = E("typeGroup");
   let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
   let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
-  for (let type of types)
+  for (let [type, label] of types)
   {
     if (type == "ELEMHIDE")
       continue;
 
     let typeNode = document.createElement("checkbox");
     typeNode.setAttribute("value", type.toLowerCase().replace(/\_/g, "-"));
-    typeNode.setAttribute("label", Policy.localizedDescr.get(type).toLowerCase());
+    typeNode.setAttribute("label", label);
 
     let typeMask = RegExpFilter.typeMap[type];
     typeNode._defaultType = (typeMask & defaultTypes) != 0;
     if ((isDefaultType && typeNode._defaultType) || (!isDefaultType && item.type == type))
       typeNode.setAttribute("checked", "true");
 
     if (item.type == type)
       typeNode.setAttribute("disabled", "true");
     typeNode.addEventListener("command", () => checkboxUpdated(typeNode), false);
     typeGroup.appendChild(typeNode);
@@ skipping 236 matching lines @@
  * Selects or unselects all type checkboxes except those
  * that are disabled.
  */
 function selectAllTypes(/**Boolean*/ select)
 {
   for (let typeNode = E("typeGroup").firstChild; typeNode; typeNode = typeNode.nextSibling)
     if (typeNode.getAttribute("disabled") != "true")
       typeNode.checked = select;
   updateFilter();
 }