Skip to content

Commit 55ffe2f

Browse files
ktranDevtools-frontend LUCI CQ
authored andcommitted
Revert "Use Intl.NumberFormat for time and byte formatting"
This reverts commit 6b3449e. Reason for revert: currently failing the auto roller: https://ci.chromium.org/ui/p/devtools-internal/builders/try/devtools_frontend_linux_rel/b8731890377373202833/overview Original change's description: > Use Intl.NumberFormat for time and byte formatting > > TimeUtilities now uses Intl.NumberFormat (instead of UIStrings), > and bytesToString now uses Intl.NumberFormat (instead of non-locale > aware strings). Additionally, bytesToString is now under the i18n > module. > > Impacts of this change: > > * use Chrome ICU locale data to format, rather than human translators, > which allows us to be more accurate in regards to unit display style > (narrow vs short vs long) > * group separators (ex: thousands decimals in english) are now present > * slight change to rounding behavior - Intl.NumberFormat defaults to > "halfExpand", which rounds away from zeroes to break ties. Previously > we just truncated > > See go/cpq:i18n-units-design > > Bug: 372723536 > Change-Id: Iff05ca9ff01213660d64ca88fadb613296153fa9 > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5981156 > Reviewed-by: Simon Zünd <[email protected]> > Commit-Queue: Connor Clark <[email protected]> > Reviewed-by: Benedikt Meurer <[email protected]> > Reviewed-by: Paul Irish <[email protected]> Bug: 372723536 Change-Id: I82f74ae04729b9f6c514d7e186572a8ffade30cd Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6003765 Commit-Queue: Kim-Anh Tran <[email protected]> Bot-Commit: Rubber Stamper <[email protected]>
1 parent 7858d12 commit 55ffe2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+204
-391
lines changed

config/gni/devtools_grd_files.gni

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,7 @@ grd_files_debug_sources = [
779779
"front_end/core/host/Platform.js",
780780
"front_end/core/host/ResourceLoader.js",
781781
"front_end/core/host/UserMetrics.js",
782-
"front_end/core/i18n/ByteUtilities.js",
783782
"front_end/core/i18n/DevToolsLocale.js",
784-
"front_end/core/i18n/NumberFormatter.js",
785783
"front_end/core/i18n/i18nImpl.js",
786784
"front_end/core/i18n/i18nTypes.js",
787785
"front_end/core/i18n/locales.js",

front_end/core/i18n/BUILD.gn

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import("//$devtools_root_location/config/gni/i18n.gni")
1212

1313
devtools_module("i18n") {
1414
sources = [
15-
"ByteUtilities.ts",
1615
"DevToolsLocale.ts",
17-
"NumberFormatter.ts",
1816
"i18nImpl.ts",
1917
"i18nTypes.ts",
2018
"time-utilities.ts",
@@ -87,7 +85,6 @@ ts_library("unittests") {
8785
testonly = true
8886

8987
sources = [
90-
"ByteUtilities.test.ts",
9188
"DevToolsLocale.test.ts",
9289
"i18n.test.ts",
9390
"time-utilities.test.ts",

front_end/core/i18n/ByteUtilities.test.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

front_end/core/i18n/ByteUtilities.ts

Lines changed: 0 additions & 65 deletions
This file was deleted.

front_end/core/i18n/NumberFormatter.ts

Lines changed: 0 additions & 75 deletions
This file was deleted.

front_end/core/i18n/i18n.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import * as ByteUtilities from './ByteUtilities.js';
65
import * as DevToolsLocale from './DevToolsLocale.js';
76
import * as i18n from './i18nImpl.js';
8-
import * as NumberFormatter from './NumberFormatter.js';
97
import * as TimeUtilities from './time-utilities.js';
108

119
export {
12-
ByteUtilities,
1310
DevToolsLocale,
1411
i18n,
15-
NumberFormatter,
1612
TimeUtilities,
1713
};

front_end/core/i18n/time-utilities.test.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,12 @@ describeWithLocale('preciseMillisToString', () => {
1414
assert.strictEqual(outputString, '8\xA0ms');
1515
});
1616

17-
it('formats big number without a given precision', () => {
18-
const inputNumber = 723123;
19-
const outputString = i18n.TimeUtilities.preciseMillisToString(inputNumber);
20-
assert.strictEqual(outputString, '723,123\xA0ms');
21-
});
22-
23-
it('formats with a given precision', () => {
17+
it('formats without a given precision', () => {
2418
const inputNumber = 7.84;
2519
const precision = 2;
2620
const outputString = i18n.TimeUtilities.preciseMillisToString(inputNumber, precision);
2721
assert.strictEqual(outputString, '7.84\xA0ms');
2822
});
29-
30-
it('formats with a given precision, rounding as expected', () => {
31-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(5.55555, 2), '5.56\xA0ms');
32-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(-5.55555, 2), '-5.56\xA0ms');
33-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(5.555, 2), '5.56\xA0ms');
34-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(-5.55, 2), '-5.55\xA0ms'); // ties break towards zero!
35-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(9.99999, 1), '10.0\xA0ms');
36-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(9.95, 1), '10.0\xA0ms');
37-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(9.94, 1), '9.9\xA0ms');
38-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(1.001, 1), '1.0\xA0ms');
39-
assert.strictEqual(i18n.TimeUtilities.preciseMillisToString(1.001, 0), '1\xA0ms');
40-
});
4123
});
4224

4325
describeWithLocale('formatMicroSecondsTime', () => {
@@ -139,7 +121,7 @@ describeWithLocale('millisToString', () => {
139121
it('formats less than 24 hours', () => {
140122
const inputNumber = 20000000;
141123
const outputString = i18n.TimeUtilities.millisToString(inputNumber);
142-
assert.strictEqual(outputString, '5.6\xA0hr');
124+
assert.strictEqual(outputString, '5.6\xA0hrs');
143125
});
144126

145127
it('formats days', () => {

0 commit comments

Comments
 (0)