Bug 1491676 - Moves permissions strings r=flod,Gijs,zbraniecki

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

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

browser/components/preferences/permissions.js

@@ -51,7 +51,6 @@ var gPermissionManager = {
   _removeAllButton: null,
 
   onLoad() {
-    this._bundle = document.getElementById("bundlePreferences");
     let params = window.arguments[0];
     document.mozSubdialogReady = this.init(params);
   },
@@ -63,7 +62,6 @@ var gPermissionManager = {
     }
 
     this._type = params.permissionType;
-    this._manageCapability = params.manageCapability;
     this._list = document.getElementById("permissionsBox");
     this._removeButton = document.getElementById("removePermission");
     this._removeAllButton = document.getElementById("removeAllPermissions");
@@ -134,7 +132,6 @@ var gPermissionManager = {
     } else if (data == "changed") {
       let p = this._permissions.get(permission.principal.origin);
       p.capability = permission.capability;
-      p.l10nId = this._getCapabilityString(permission.capability);
       this._handleCapabilityChange(p);
       this.buildPermissionsList();
     } else if (data == "deleted") {
@@ -144,37 +141,32 @@ var gPermissionManager = {
 
   _handleCapabilityChange(perm) {
     let permissionlistitem = document.getElementsByAttribute("origin", perm.origin)[0];
-    permissionlistitem.querySelector(".website-capability-value").setAttribute("value", perm.capability);
+    document.l10n.setAttributes(permissionlistitem.querySelector(".website-capability-value"), this._getCapabilityL10nId(perm.capability));
   },
 
-  _getCapabilityString(capability) {
+  _getCapabilityL10nId(capability) {
     let stringKey = null;
     switch (capability) {
     case Ci.nsIPermissionManager.ALLOW_ACTION:
-      stringKey = "can";
+      stringKey = "permissions-capabilities-listitem-allow";
       break;
     case Ci.nsIPermissionManager.DENY_ACTION:
-      stringKey = "cannot";
+      stringKey = "permissions-capabilities-listitem-block";
       break;
     case Ci.nsICookiePermission.ACCESS_ALLOW_FIRST_PARTY_ONLY:
-      stringKey = "canAccessFirstParty";
+      stringKey = "permissions-capabilities-listitem-allow-first-party";
       break;
     case Ci.nsICookiePermission.ACCESS_SESSION:
-      stringKey = "canSession";
+      stringKey = "permissions-capabilities-listitem-allow-session";
       break;
     default:
       throw new Error(`Unknown capability: ${capability}`);
     }
-    return this._bundle.getString(stringKey);
+    return stringKey;
   },
 
   _addPermissionToList(perm) {
-    // Ignore unrelated permission types and excluded capabilities.
-    if (perm.type !== this._type ||
-        (this._manageCapability && perm.capability != this._manageCapability))
-      return;
-    let capabilityString = this._getCapabilityString(perm.capability);
-    let p = new Permission(perm.principal, perm.type, capabilityString);
+    let p = new Permission(perm.principal, perm.type, perm.capability);
     this._permissions.set(p.origin, p);
   },
 
@@ -213,8 +205,6 @@ var gPermissionManager = {
       return;
     }
 
-    let capabilityString = this._getCapabilityString(capability);
-
     // check whether the permission already exists, if not, add it
     let permissionParams = {principal, type: this._type, capability};
     let existingPermission = this._permissions.get(principal.origin);
@@ -222,8 +212,8 @@ var gPermissionManager = {
       this._permissionsToAdd.set(principal.origin, permissionParams);
       this._addPermissionToList(permissionParams);
       this.buildPermissionsList();
-    } else if (existingPermission.capability != capabilityString) {
-      existingPermission.capability = capabilityString;
+    } else if (existingPermission.capability != capability) {
+      existingPermission.capability = capability;
       this._permissionsToAdd.set(principal.origin, permissionParams);
       this._handleCapabilityChange(existingPermission);
     }
@@ -284,7 +274,7 @@ var gPermissionManager = {
       hbox = document.createXULElement("hbox");
       let capability = document.createXULElement("label");
       capability.setAttribute("class", "website-capability-value");
-      capability.setAttribute("value", permission.capability);
+      document.l10n.setAttributes(capability, this._getCapabilityL10nId(permission.capability));
       hbox.setAttribute("width", "0");
       hbox.setAttribute("class", "website-name");
       hbox.setAttribute("flex", "1");

browser/locales/en-US/browser/preferences/permissions.ftl

@@ -56,6 +56,11 @@ permissions-capabilities-block =
 permissions-capabilities-prompt =
     .label = Always Ask
 
+permissions-capabilities-listitem-allow = Allow
+permissions-capabilities-listitem-block = Block
+permissions-capabilities-listitem-allow-first-party = Allow first party only
+permissions-capabilities-listitem-allow-session = Allow for Session
+
 ## Invalid Hostname Dialog
 
 permissions-invalid-uri-title = Invalid Hostname Entered

browser/locales/en-US/chrome/browser/preferences/preferences.properties

@@ -34,11 +34,3 @@ previewInApp=Preview in %S
 # %1$S = type description (for example "Portable Document Format")
 # %2$S = type (for example "application/pdf")
 typeDescriptionWithType=%S (%S)
-
-#### Permission labels
-
-can=Allow
-canAccessFirstParty=Allow first party only
-canSession=Allow for Session
-cannot=Block
-prompt=Always Ask

python/l10n/fluent_migrations/bug_1491676_preferences_properties.py

@@ -178,3 +178,14 @@ choose-download-folder-title = { COPY(from_path, "chooseDownloadFolderTitle")}
             ),
         ],
     )
+
+    ctx.add_transforms(
+        "browser/browser/preferences/permissions.ftl",
+        "browser/browser/preferences/permissions.ftl",
+        transforms_from(
+            """
+permissions-capabilities-listitem-allow = { COPY(from_path, "can")}
+permissions-capabilities-listitem-allow-first-party = { COPY(from_path, "canAccessFirstParty")}
+permissions-capabilities-listitem-allow-session = { COPY(from_path, "canSession")}
+permissions-capabilities-listitem-block = { COPY(from_path, "cannot")}
+""", from_path="browser/chrome/browser/preferences/preferences.properties"))