- Revision
- 214405
- Author
- bb...@apple.com
- Date
- 2017-03-25 16:08:37 -0700 (Sat, 25 Mar 2017)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (214404 => 214405)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-25 23:08:37 UTC (rev 214405)
@@ -1,3 +1,47 @@
+2017-03-24 Brian Burg <bb...@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 <nvasil...@apple.com>
Web Inspector: Adding a WebSocket message may change the currently selected resource
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -27,6 +27,7 @@
localizedStrings["%d Warnings"] = "%d Warnings";
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";
localizedStrings["%dpx²"] = "%dpx²";
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -27,6 +27,7 @@
var enDash = "\u2013";
var figureDash = "\u2012";
var ellipsis = "\u2026";
+var zeroWidthSpace = "\u200b";
Object.defineProperty(Object, "shallowCopy",
{
@@ -789,7 +790,7 @@
value: {
d: function(substitution)
{
- return parseInt(substitution);
+ return parseInt(substitution).toLocaleString();
},
f: function(substitution, token)
@@ -1091,7 +1092,7 @@
value: function(num)
{
if (num < 1000)
- return num;
+ return num.toLocaleString();
if (num < 1000000)
return WebInspector.UIString("%.1fK").format(Math.round(num / 100) / 10);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -146,7 +146,7 @@
this._element.insertBefore(this._repeatCountElement, this._element.firstChild);
}
- this._repeatCountElement.textContent = count;
+ this._repeatCountElement.textContent = Number.abbreviate(count);
}
get expandable()
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGridNode.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGridNode.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGridNode.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -1,5 +1,5 @@
/*
- * 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
* modification, are permitted provided that the following conditions
@@ -383,7 +383,11 @@
createCellContent(columnIdentifier)
{
- return this.data[columnIdentifier] || "\u200b"; // Zero width space to keep the cell from collapsing.
+ let data = ""
+ if (!data)
+ return zeroWidthSpace; // Zero width space to keep the cell from collapsing.
+
+ return (typeof data ="" "number") ? data.maxDecimals(2).toLocaleString() : data;
}
elementWithColumnIdentifier(columnIdentifier)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -54,7 +54,7 @@
{
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) => {
if (gcRootPath.length) {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseDetailsSidebarPanel.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -104,7 +104,7 @@
this._databaseSection.element.hidden = false;
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();
}
if (!this._objectStore)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -337,9 +337,9 @@
}
// 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));
}
_initializeCategoryViews(record)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -194,7 +194,7 @@
var label = document.createElement("div");
label.classList.add("label");
- label.innerText = framesPerSecond + " fps";
+ label.innerText = WebInspector.UIString("%d fps").format(framesPerSecond);
divider.appendChild(label);
this.element.appendChild(divider);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (214404 => 214405)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2017-03-25 21:19:54 UTC (rev 214404)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2017-03-25 23:08:37 UTC (rev 214405)
@@ -751,7 +751,7 @@
if (isRenderingFramesMode) {
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;
this._timelineRuler.snapInterval = NaN;
