Changeset 214405 in webkit

Timestamp:

Mar 25, 2017, 4:08:37 PM (8 years ago)

Author:

BJ Burg

Message:

Web Inspector: RTL: number scripts are used inconsistently throughout the UI
​https://bugs.webkit.org/show_bug.cgi?id=168290

Reviewed by Joseph Pecoraro.

Original patch by Devin Rousso.

• Localizations/en.lproj/localizedStrings.js: Add new string for FPS bars.
• UserInterface/Base/Utilities.js:

(value.d):
(value):
Localize %d formatted values by default. If that's not desired, then you need to stringify
the number outside of String.format and Number.abbreviate and pass it as %s instead.
Also add a global variable for zwsp (zero-width space) and use it in DataGridNode.

• UserInterface/Views/ConsoleMessageView.js:

(WebInspector.ConsoleMessageView.prototype._renderRepeatCount): Abbreviate the repeat count,
and cause it to be localized.

• UserInterface/Views/DataGridNode.js:

(WebInspector.DataGridNode.prototype.createCellContent):
If we don't know anything about a cell's data other than that it's a number,
run the number through toLocaleString().

• UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:

Don't localize @%d tags for snapshot objects since this is not done elsewhere in the UI.

• UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js: Localize integer version number.

(WebInspector.IndexedDatabaseDetailsSidebarPanel.prototype.layout):

• UserInterface/Views/MemoryTimelineView.js:

(WebInspector.MemoryTimelineView.prototype._updateMaxComparisonLegend): Use Number.percentageString().

• UserInterface/Views/RenderingFrameTimelineOverviewGraph.js:

(WebInspector.RenderingFrameTimelineOverviewGraph.prototype._updateDividers.createDividerAtPosition):
(WebInspector.RenderingFrameTimelineOverviewGraph.prototype._updateDividers):
Localize "%d fps" markers.

• UserInterface/Views/TimelineOverview.js:

(WebInspector.TimelineOverview.prototype._viewModeDidChange):
Localize frame label numbers.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Base/Utilities.js (modified) (3 diffs)
• UserInterface/Views/ConsoleMessageView.js (modified) (1 diff)
• UserInterface/Views/DataGridNode.js (modified) (2 diffs)
• UserInterface/Views/HeapSnapshotInstanceDataGridNode.js (modified) (1 diff)
• UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/MemoryTimelineView.js (modified) (1 diff)
• UserInterface/Views/RenderingFrameTimelineOverviewGraph.js (modified) (1 diff)
• UserInterface/Views/TimelineOverview.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-03-24  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: RTL: number scripts are used inconsistently throughout the UI
+        https://bugs.webkit.org/show_bug.cgi?id=168290
+
+        Reviewed by Joseph Pecoraro.
+
+        Original patch by Devin Rousso.
+
+        * Localizations/en.lproj/localizedStrings.js: Add new string for FPS bars.
+        * UserInterface/Base/Utilities.js:
+        (value.d):
+        (value):
+        Localize %d formatted values by default. If that's not desired, then you need to stringify
+        the number outside of String.format and Number.abbreviate and pass it as %s instead.
+        Also add a global variable for zwsp (zero-width space) and use it in DataGridNode.
+
+        * UserInterface/Views/ConsoleMessageView.js:
+        (WebInspector.ConsoleMessageView.prototype._renderRepeatCount): Abbreviate the repeat count,
+        and cause it to be localized.
+
+        * UserInterface/Views/DataGridNode.js:
+        (WebInspector.DataGridNode.prototype.createCellContent):
+        If we don't know anything about a cell's data other than that it's a number,
+        run the number through toLocaleString().
+
+        * UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
+        Don't localize @%d tags for snapshot objects since this is not done elsewhere in the UI.
+
+        * UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js: Localize integer version number.
+        (WebInspector.IndexedDatabaseDetailsSidebarPanel.prototype.layout):
+
+        * UserInterface/Views/MemoryTimelineView.js:
+        (WebInspector.MemoryTimelineView.prototype._updateMaxComparisonLegend): Use Number.percentageString().
+
+        * UserInterface/Views/RenderingFrameTimelineOverviewGraph.js:
+        (WebInspector.RenderingFrameTimelineOverviewGraph.prototype._updateDividers.createDividerAtPosition):
+        (WebInspector.RenderingFrameTimelineOverviewGraph.prototype._updateDividers):
+        Localize "%d fps" markers.
+
+        * UserInterface/Views/TimelineOverview.js:
+        (WebInspector.TimelineOverview.prototype._viewModeDidChange):
+        Localize frame label numbers.
+
 2017-03-24  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -28 +28 @@
 localizedStrings["%d \xd7 %d pixels"] = "%d \xd7 %d pixels";
 localizedStrings["%d \xd7 %d pixels (Natural: %d \xd7 %d pixels)"] = "%d \xd7 %d pixels (Natural: %d \xd7 %d pixels)";
+localizedStrings["%d fps"] = "%d fps";
 localizedStrings["%d matches"] = "%d matches";
 localizedStrings["%dpx"] = "%dpx";

trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js

@@ -28 +28 @@
 var figureDash = "\u2012";
 var ellipsis = "\u2026";
+var zeroWidthSpace = "\u200b";
 
 Object.defineProperty(Object, "shallowCopy",
@@ -790 +791 @@
         d: function(substitution)
         {
-            return parseInt(substitution);
+            return parseInt(substitution).toLocaleString();
         },
 
@@ -1092 +1093 @@
     {
         if (num < 1000)
-            return num;
+            return num.toLocaleString();
 
         if (num < 1000000)

trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js

@@ -147 +147 @@
         }
 
-        this._repeatCountElement.textContent = count;
+        this._repeatCountElement.textContent = Number.abbreviate(count);
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/DataGridNode.js

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2013-2016 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2013-2017 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -384 +384 @@
     createCellContent(columnIdentifier)
     {
-        return this.data[columnIdentifier] || "\u200b"; // Zero width space to keep the cell from collapsing.
+        let data = this.data[columnIdentifier];
+        if (!data)
+            return zeroWidthSpace; // Zero width space to keep the cell from collapsing.
+
+        return (typeof data === "number") ? data.maxDecimals(2).toLocaleString() : data;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js

@@ -55 +55 @@
         let heapObjectIdentifier = node.id;
         let shouldRevealConsole = true;
-        let text = WebInspector.UIString("Heap Snapshot Object (@%d)").format(heapObjectIdentifier);
+        let text = WebInspector.UIString("Heap Snapshot Object (%s)").format("@" + heapObjectIdentifier);
 
         node.shortestGCRootPath((gcRootPath) => {

trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js

@@ -105 +105 @@
             this._databaseSecurityOriginRow.value = this._database.securityOrigin;
             this._databaseNameRow.value = this._database.name;
-            this._databaseVersionRow.value = this._database.version;
+            this._databaseVersionRow.value = this._database.version.toLocaleString();
         }
 

trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js

@@ -338 +338 @@
 
         // The chart will only show a perfect circle if the current and max are really the same value.
-        // So do a little massaging to ensure 99.95 doesn't get rounded up to 100.
-        let percent = ((currentSize / this._maxSize) * 100);
-        totalElement.textContent = (percent === 100 ? percent : (percent - 0.05).toFixed(1)) + "%";
+        // So do a little massaging to ensure 0.9995 doesn't get rounded up to 1.
+        let percent = currentSize / this._maxSize;
+        totalElement.textContent = Number.percentageString(percent === 1 ? percent : (percent - 0.0005));
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js

@@ -195 +195 @@
                 var label = document.createElement("div");
                 label.classList.add("label");
-                label.innerText = framesPerSecond + " fps";
+                label.innerText = WebInspector.UIString("%d fps").format(framesPerSecond);
                 divider.appendChild(label);
 

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js

@@ -752 +752 @@
             this._timelineRuler.minimumSelectionDuration = 1;
             this._timelineRuler.snapInterval = 1;
-            this._timelineRuler.formatLabelCallback = (value) => value.toFixed(0);
+            this._timelineRuler.formatLabelCallback = (value) => value.maxDecimals(0).toLocaleString();
         } else {
             this._timelineRuler.minimumSelectionDuration = 0.01;