Use new translation strings for GPU properties. (bug 1265496, r=milan)
authorDavid Anderson <danderson@mozilla.com>
Tue, 19 Apr 2016 18:21:33 -0400
changeset 317712 27b5119d82e01dded303cd795021483480ecd2e4
parent 317711 8dbe34ec0786f8f8df51a47249c6fd19766fb630
child 317713 bb60c7a0b0c54ae0be1316d44b7a84098b2985bd
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmilan
bugs1265496
milestone48.0a1
Use new translation strings for GPU properties. (bug 1265496, r=milan)
toolkit/content/aboutSupport.js
toolkit/locales/en-US/chrome/global/aboutSupport.properties
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -369,58 +369,58 @@ var snapshotFormatters = {
         message += " (" + data.directWriteVersion + ")";
       addRow("features", "#DirectWrite", message);
       delete data.directWriteEnabled;
       delete data.directWriteVersion;
     }
 
     // Adapter tbodies.
     let adapterKeys = [
-      ["adapterDescription"],
-      ["adapterVendorID"],
-      ["adapterDeviceID"],
-      ["driverVersion"],
-      ["driverDate"],
-      ["adapterDrivers"],
-      ["adapterSubsysID"],
-      ["adapterRAM"],
+      ["adapterDescription", "gpuDescription"],
+      ["adapterVendorID", "gpuVendorID"],
+      ["adapterDeviceID", "gpuDeviceID"],
+      ["driverVersion", "gpuDriverVersion"],
+      ["driverDate", "gpuDriverDate"],
+      ["adapterDrivers", "gpuDrivers"],
+      ["adapterSubsysID", "gpuSubsysID"],
+      ["adapterRAM", "gpuRAM"],
     ];
 
     function showGpu(id, suffix) {
       function get(prop) {
         return data[prop + suffix];
       }
 
       let trs = [];
-      for (let key of adapterKeys) {
-        let value = get(key);
+      for (let [prop, key] of adapterKeys) {
+        let value = get(prop);
         if (value === undefined || value === "")
           continue;
         trs.push(buildRow(key, value));
       }
 
       if (trs.length == 0) {
         $("graphics-" + id + "-tbody").style.display = "none";
         return;
       }
 
       let active = "yes";
       if ("isGPU2Active" in data && ((suffix == "2") != data.isGPU2Active)) {
         active = "no";
       }
-      addRow(id, "active", strings.GetStringFromName(active));
+      addRow(id, "gpuActive", strings.GetStringFromName(active));
       addRows(id, trs);
     }
     showGpu("gpu-1", "");
     showGpu("gpu-2", "2");
 
     // Remove adapter keys.
-    for (let key of adapterKeys) {
-      delete data[key];
-      delete data[key + "2"];
+    for (let [prop, key] of adapterKeys) {
+      delete data[prop];
+      delete data[prop + "2"];
     }
     delete data.isGPU2Active;
 
     // Now that we're done, grab any remaining keys in data and drop them into
     // the diagnostics section.
     for (let key in data) {
       addRow("diagnostics", key, data[key]);
     }
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -56,25 +56,25 @@ blockedMismatchedVersion = Blocked for y
 clearTypeParameters = ClearType Parameters
 
 compositing = Compositing
 hardwareH264 = Hardware H264 Decoding
 mainThreadNoOMTC = main thread, no OMTC
 yes = Yes
 no = No
 
-adapterDescription = Description
-adapterVendorID = Vendor ID
-adapterDeviceID = Device ID
-adapterSubsysID = Subsys ID
-adapterDrivers = Drivers
-adapterRAM = RAM
-driverVersion = Driver Version
-driverDate = Driver Date
-active = Active
+gpuDescription = Description
+gpuVendorID = Vendor ID
+gpuDeviceID = Device ID
+gpuSubsysID = Subsys ID
+gpuDrivers = Drivers
+gpuRAM = RAM
+gpuDriverVersion = Driver Version
+gpuDriverDate = Driver Date
+gpuActive = Active
 webglRenderer = WebGL Renderer
 GPU1 = GPU #1
 GPU2 = GPU #2
 
 minLibVersions = Expected minimum version
 loadedLibVersions = Version in use
 
 hasSeccompBPF = Seccomp-BPF (System Call Filtering)