Changed usages of Number.secondsToString to use i18n.i18n.secondsToString
Bug: 1213479
Change-Id: I9f5e14d74b68af0572a0986fcf2a2c1e25dbfea7
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2940068
Reviewed-by: Jack Franklin <jacktfranklin@chromium.org>
Commit-Queue: Kriti Sapra <kritisapra@google.com>
diff --git a/front_end/legacy/legacy-defs.d.ts b/front_end/legacy/legacy-defs.d.ts
index 26e8d57..1e35ee2 100644
--- a/front_end/legacy/legacy-defs.d.ts
+++ b/front_end/legacy/legacy-defs.d.ts
@@ -17,10 +17,6 @@
__fromRegExpQuery: boolean;
}
-interface NumberConstructor {
- secondsToString(seconds: number, higherResolution?: boolean): string;
-}
-
declare class AnchorBox {
x: number;
y: number;
diff --git a/front_end/panels/network/NetworkDataGridNode.ts b/front_end/panels/network/NetworkDataGridNode.ts
index 039dfc7..1656da4 100644
--- a/front_end/panels/network/NetworkDataGridNode.ts
+++ b/front_end/panels/network/NetworkDataGridNode.ts
@@ -1287,8 +1287,8 @@
_renderTimeCell(cell: HTMLElement): void {
if (this._request.duration > 0) {
- this._setTextAndTitle(cell, Number.secondsToString(this._request.duration));
- this._appendSubtitle(cell, Number.secondsToString(this._request.latency));
+ this._setTextAndTitle(cell, i18n.i18n.secondsToString(this._request.duration));
+ this._appendSubtitle(cell, i18n.i18n.secondsToString(this._request.latency));
} else {
cell.classList.add('network-dim-cell');
this._setTextAndTitle(cell, i18nString(UIStrings.pending));
diff --git a/front_end/panels/network/NetworkLogView.ts b/front_end/panels/network/NetworkLogView.ts
index 0535df8..0f8045e 100644
--- a/front_end/panels/network/NetworkLogView.ts
+++ b/front_end/panels/network/NetworkLogView.ts
@@ -1042,18 +1042,18 @@
if (baseTime !== -1 && maxTime !== -1) {
this._summaryToolbar.appendSeparator();
- appendChunk(i18nString(UIStrings.finishS, {PH1: Number.secondsToString(maxTime - baseTime)}));
+ appendChunk(i18nString(UIStrings.finishS, {PH1: i18n.i18n.secondsToString(maxTime - baseTime)}));
if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMContentLoadedTime > baseTime) {
this._summaryToolbar.appendSeparator();
const domContentLoadedText = i18nString(
UIStrings.domcontentloadedS,
- {PH1: Number.secondsToString(this._mainRequestDOMContentLoadedTime - baseTime)});
+ {PH1: i18n.i18n.secondsToString(this._mainRequestDOMContentLoadedTime - baseTime)});
appendChunk(domContentLoadedText).style.color = NetworkLogView.getDCLEventColor();
}
if (this._mainRequestLoadTime !== -1) {
this._summaryToolbar.appendSeparator();
const loadText =
- i18nString(UIStrings.loadS, {PH1: Number.secondsToString(this._mainRequestLoadTime - baseTime)});
+ i18nString(UIStrings.loadS, {PH1: i18n.i18n.secondsToString(this._mainRequestLoadTime - baseTime)});
appendChunk(loadText).style.color = NetworkLogView.getLoadEventColor();
}
}
diff --git a/front_end/panels/network/NetworkTimeCalculator.ts b/front_end/panels/network/NetworkTimeCalculator.ts
index 62f74cc..94b5eea 100644
--- a/front_end/panels/network/NetworkTimeCalculator.ts
+++ b/front_end/panels/network/NetworkTimeCalculator.ts
@@ -123,7 +123,7 @@
}
formatValue(value: number, precision?: number): string {
- return Number.secondsToString(value, Boolean(precision));
+ return i18n.i18n.secondsToString(value, Boolean(precision));
}
minimumBoundary(): number {
@@ -230,11 +230,11 @@
computeBarGraphLabels(request: SDK.NetworkRequest.NetworkRequest): Label {
let rightLabel = '';
if (request.responseReceivedTime !== -1 && request.endTime !== -1) {
- rightLabel = Number.secondsToString(request.endTime - request.responseReceivedTime);
+ rightLabel = i18n.i18n.secondsToString(request.endTime - request.responseReceivedTime);
}
const hasLatency = request.latency > 0;
- const leftLabel = hasLatency ? Number.secondsToString(request.latency) : rightLabel;
+ const leftLabel = hasLatency ? i18n.i18n.secondsToString(request.latency) : rightLabel;
if (request.timing) {
return {left: leftLabel, right: rightLabel, tooltip: undefined};
@@ -242,7 +242,7 @@
let tooltip;
if (hasLatency && rightLabel) {
- const total = Number.secondsToString(request.duration);
+ const total = i18n.i18n.secondsToString(request.duration);
tooltip = i18nString(UIStrings.sLatencySDownloadSTotal, {PH1: leftLabel, PH2: rightLabel, PH3: total});
} else if (hasLatency) {
tooltip = i18nString(UIStrings.sLatency, {PH1: leftLabel});
@@ -312,7 +312,7 @@
}
formatValue(value: number, precision?: number): string {
- return Number.secondsToString(value - this.zeroTime(), Boolean(precision));
+ return i18n.i18n.secondsToString(value - this.zeroTime(), Boolean(precision));
}
_lowerBound(request: SDK.NetworkRequest.NetworkRequest): number {
@@ -330,7 +330,7 @@
}
formatValue(value: number, precision?: number): string {
- return Number.secondsToString(value, Boolean(precision));
+ return i18n.i18n.secondsToString(value, Boolean(precision));
}
_upperBound(request: SDK.NetworkRequest.NetworkRequest): number {
diff --git a/front_end/panels/network/RequestTimingView.ts b/front_end/panels/network/RequestTimingView.ts
index d555bed..c8d5107 100644
--- a/front_end/panels/network/RequestTimingView.ts
+++ b/front_end/panels/network/RequestTimingView.ts
@@ -438,7 +438,7 @@
UI.ARIAUtils.setAccessibleName(
row, i18nString(UIStrings.startedAtS, {PH1: calculator.formatValue(range.start, 2)}));
const label = tr.createChild('td').createChild('div', 'network-timing-bar-title');
- label.textContent = Number.secondsToString(duration, true);
+ label.textContent = i18n.i18n.secondsToString(duration, true);
if (range.name === 'serviceworker-respondwith') {
timingBarTitleEement.classList.add('network-fetch-timing-bar-clickable');
@@ -463,7 +463,7 @@
'https://developer.chrome.com/docs/devtools/network/reference#timing-explanation',
i18nString(UIStrings.explanation)));
footer.createChild('td');
- UI.UIUtils.createTextChild(footer.createChild('td'), Number.secondsToString(totalDuration, true));
+ UI.UIUtils.createTextChild(footer.createChild('td'), i18n.i18n.secondsToString(totalDuration, true));
const serverTimings = request.serverTimings;
diff --git a/front_end/panels/profiler/CPUProfileView.ts b/front_end/panels/profiler/CPUProfileView.ts
index 4bb8859..e352c4e 100644
--- a/front_end/panels/profiler/CPUProfileView.ts
+++ b/front_end/panels/profiler/CPUProfileView.ts
@@ -406,7 +406,7 @@
if (ms < 1000) {
return i18nString(UIStrings.fms, {PH1: ms.toFixed(1)});
}
- return Number.secondsToString(ms / 1000, true);
+ return i18n.i18n.secondsToString(ms / 1000, true);
}
const name = UI.UIUtils.beautifyFunctionName(node.functionName);
pushEntryInfoRow(i18nString(UIStrings.name), name);
@@ -422,8 +422,8 @@
pushEntryInfoRow(i18nString(UIStrings.url), link.textContent || '');
}
linkifier.dispose();
- pushEntryInfoRow(i18nString(UIStrings.aggregatedSelfTime), Number.secondsToString(node.self / 1000, true));
- pushEntryInfoRow(i18nString(UIStrings.aggregatedTotalTime), Number.secondsToString(node.total / 1000, true));
+ pushEntryInfoRow(i18nString(UIStrings.aggregatedSelfTime), i18n.i18n.secondsToString(node.self / 1000, true));
+ pushEntryInfoRow(i18nString(UIStrings.aggregatedTotalTime), i18n.i18n.secondsToString(node.total / 1000, true));
const deoptReason = (node as SDK.CPUProfileDataModel.CPUProfileNode).deoptReason;
if (deoptReason) {
pushEntryInfoRow(i18nString(UIStrings.notOptimized), deoptReason);
diff --git a/front_end/panels/profiler/HeapTimelineOverview.ts b/front_end/panels/profiler/HeapTimelineOverview.ts
index 80491df..59230ad 100644
--- a/front_end/panels/profiler/HeapTimelineOverview.ts
+++ b/front_end/panels/profiler/HeapTimelineOverview.ts
@@ -4,6 +4,7 @@
/* eslint-disable rulesdir/no_underscored_properties */
+import * as i18n from '../../core/i18n/i18n.js';
import * as Platform from '../../core/platform/platform.js';
import * as PerfUI from '../../ui/legacy/components/perf_ui/perf_ui.js';
import * as UI from '../../ui/legacy/legacy.js';
@@ -314,7 +315,7 @@
}
formatValue(value: number, precision?: number): string {
- return Number.secondsToString(value / 1000, Boolean(precision));
+ return i18n.i18n.secondsToString(value / 1000, Boolean(precision));
}
maximumBoundary(): number {
diff --git a/front_end/ui/legacy/UIUtils.ts b/front_end/ui/legacy/UIUtils.ts
index c88b191..1de0e93 100644
--- a/front_end/ui/legacy/UIUtils.ts
+++ b/front_end/ui/legacy/UIUtils.ts
@@ -585,13 +585,6 @@
return false;
}
-Number.secondsToString = function(seconds: number, higherResolution?: boolean): string {
- if (!isFinite(seconds)) {
- return '-';
- }
- return i18n.i18n.millisToString(seconds * 1000, higherResolution);
-};
-
// TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function formatLocalized(format: string, substitutions: ArrayLike<any>|null): Element {
diff --git a/front_end/ui/legacy/components/cookie_table/CookiesTable.ts b/front_end/ui/legacy/components/cookie_table/CookiesTable.ts
index 6d9b694..87e46a6 100644
--- a/front_end/ui/legacy/components/cookie_table/CookiesTable.ts
+++ b/front_end/ui/legacy/components/cookie_table/CookiesTable.ts
@@ -525,7 +525,7 @@
}
if (cookie.maxAge()) {
- data[SDK.Cookie.Attributes.Expires] = Number.secondsToString(Math.floor(cookie.maxAge()));
+ data[SDK.Cookie.Attributes.Expires] = i18n.i18n.secondsToString(Math.floor(cookie.maxAge()));
} else if (cookie.expires()) {
if (cookie.expires() < 0) {
data[SDK.Cookie.Attributes.Expires] = expiresSessionValue();