Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: chrome/content/ui/composer.js

Issue 29329473: Issue 3222 - Don`t do localization in the contentPolicy module (Closed)
Patch Set: Addressed comments Created Nov. 5, 2015, 3:45 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/content/ui/sidebar.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/content/ui/composer.js
===================================================================
--- a/chrome/content/ui/composer.js
+++ b/chrome/content/ui/composer.js
@@ -113,19 +113,17 @@ function init()
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);
+ let types = Array.from(Policy.contentTypes);
types.sort();
let docDomain = item.docDomain;
let thirdParty = item.thirdParty;
if (docDomain)
docDomain = docDomain.replace(/^www\./i, "").replace(/\.+$/, "");
if (docDomain)
@@ -139,17 +137,17 @@ function init()
let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
for (let type 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", Utils.getString("type_label_" + type.toLowerCase()));
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");
« no previous file with comments | « no previous file | chrome/content/ui/sidebar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld