DevTools: Avoid concatenations of Console sidebar messages for localization
In the Console sidebar, the message titles are using concatenation depending
on the number of the messages. This would cause the issue where the strings
can not be properly translated since concatenation assumes word order,
which can vary depending on the language, and the white spaces between words
might not be needed in other languages.
https://imgur.com/a/nC1Dbmt
This change creates string maps for different cases (No message, 1 message, or
more than one messages) to avoid concatenations.
Grdp changes are generated automatically, with manually written descriptions
Bug: 941561
Change-Id: Iad1803c3d3fadd76e9af3f7407a609e17cd708ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819648
Commit-Queue: Lorne Mitchell <[email protected]>
Commit-Queue: Christy Chen <[email protected]>
Reviewed-by: Lorne Mitchell <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#703979}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 40f5d8ca8a069ebf1633665535b61819a706431d
diff --git a/front_end/console/ConsoleSidebar.js b/front_end/console/ConsoleSidebar.js
index d3292fc..dfd1b38 100644
--- a/front_end/console/ConsoleSidebar.js
+++ b/front_end/console/ConsoleSidebar.js
@@ -27,23 +27,23 @@
negative: false
}];
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.All, [], Console.ConsoleFilter.allLevelsFilterValue(),
+ Console.ConsoleSidebar._groupName.All, [], Console.ConsoleFilter.allLevelsFilterValue(),
UI.Icon.create('mediumicon-list'), badgePool, selectedFilterSetting);
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.ConsoleAPI, consoleAPIParsedFilters,
+ Console.ConsoleSidebar._groupName.ConsoleAPI, consoleAPIParsedFilters,
Console.ConsoleFilter.allLevelsFilterValue(), UI.Icon.create('mediumicon-account-circle'), badgePool,
selectedFilterSetting);
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.Error, [], Console.ConsoleFilter.singleLevelMask(Levels.Error),
+ Console.ConsoleSidebar._groupName.Error, [], Console.ConsoleFilter.singleLevelMask(Levels.Error),
UI.Icon.create('mediumicon-error-circle'), badgePool, selectedFilterSetting);
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.Warning, [], Console.ConsoleFilter.singleLevelMask(Levels.Warning),
+ Console.ConsoleSidebar._groupName.Warning, [], Console.ConsoleFilter.singleLevelMask(Levels.Warning),
UI.Icon.create('mediumicon-warning-triangle'), badgePool, selectedFilterSetting);
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.Info, [], Console.ConsoleFilter.singleLevelMask(Levels.Info),
+ Console.ConsoleSidebar._groupName.Info, [], Console.ConsoleFilter.singleLevelMask(Levels.Info),
UI.Icon.create('mediumicon-info-circle'), badgePool, selectedFilterSetting);
this._appendGroup(
- Console.ConsoleSidebar._groupSingularName.Verbose, [], Console.ConsoleFilter.singleLevelMask(Levels.Verbose),
+ Console.ConsoleSidebar._groupName.Verbose, [], Console.ConsoleFilter.singleLevelMask(Levels.Verbose),
UI.Icon.create('mediumicon-bug'), badgePool, selectedFilterSetting);
const selectedTreeElementName = selectedFilterSetting.get();
const defaultTreeElement =
@@ -173,10 +173,15 @@
}
_updateCounter() {
- const prefix = this._messageCount ? this._messageCount : Common.UIString('No');
- const pluralizedName = this._messageCount === 1 ? this._filter.name :
- Console.ConsoleSidebar._groupPluralNameMap.get(this._filter.name);
- this.title = `${prefix} ${pluralizedName}`;
+ if (!this._messageCount) {
+ this.title = Console.ConsoleSidebar._groupNoMessageTitleMap.get(this._filter.name);
+ } else if (this._messageCount === 1) {
+ this.title = Console.ConsoleSidebar._groupSingularTitleMap.get(this._filter.name);
+ } else {
+ this.title =
+ String.sprintf(Console.ConsoleSidebar._groupPluralTitleMap.get(this._filter.name), this._messageCount);
+ }
+
this.setExpandable(!!this.childCount());
}
@@ -227,21 +232,35 @@
};
/** @enum {string} */
-Console.ConsoleSidebar._groupSingularName = {
- ConsoleAPI: Common.UIString('user message'),
- All: Common.UIString('message'),
- Error: Common.UIString('error'),
- Warning: Common.UIString('warning'),
- Info: Common.UIString('info'),
- Verbose: Common.UIString('verbose')
+Console.ConsoleSidebar._groupName = {
+ ConsoleAPI: 'user message',
+ All: 'message',
+ Error: 'error',
+ Warning: 'warning',
+ Info: 'info',
+ Verbose: 'verbose'
};
/** @const {!Map<string, string>} */
-Console.ConsoleSidebar._groupPluralNameMap = new Map([
- [Console.ConsoleSidebar._groupSingularName.ConsoleAPI, Common.UIString('user messages')],
- [Console.ConsoleSidebar._groupSingularName.All, Common.UIString('messages')],
- [Console.ConsoleSidebar._groupSingularName.Error, Common.UIString('errors')],
- [Console.ConsoleSidebar._groupSingularName.Warning, Common.UIString('warnings')],
- [Console.ConsoleSidebar._groupSingularName.Info, Common.UIString('info')],
- [Console.ConsoleSidebar._groupSingularName.Verbose, Common.UIString('verbose')]
+Console.ConsoleSidebar._groupSingularTitleMap = new Map([
+ [Console.ConsoleSidebar._groupName.ConsoleAPI, ls`1 user message`],
+ [Console.ConsoleSidebar._groupName.All, ls`1 message`], [Console.ConsoleSidebar._groupName.Error, ls`1 error`],
+ [Console.ConsoleSidebar._groupName.Warning, ls`1 warning`], [Console.ConsoleSidebar._groupName.Info, ls`1 info`],
+ [Console.ConsoleSidebar._groupName.Verbose, ls`1 verbose`]
+]);
+
+/** @const {!Map<string, string>} */
+Console.ConsoleSidebar._groupPluralTitleMap = new Map([
+ [Console.ConsoleSidebar._groupName.ConsoleAPI, ls`%d user messages`],
+ [Console.ConsoleSidebar._groupName.All, ls`%d messages`], [Console.ConsoleSidebar._groupName.Error, ls`%d errors`],
+ [Console.ConsoleSidebar._groupName.Warning, ls`%d warnings`], [Console.ConsoleSidebar._groupName.Info, ls`%d info`],
+ [Console.ConsoleSidebar._groupName.Verbose, ls`%d verbose`]
+]);
+
+/** @const {!Map<string, string>} */
+Console.ConsoleSidebar._groupNoMessageTitleMap = new Map([
+ [Console.ConsoleSidebar._groupName.ConsoleAPI, ls`No user messages`],
+ [Console.ConsoleSidebar._groupName.All, ls`No messages`], [Console.ConsoleSidebar._groupName.Error, ls`No errors`],
+ [Console.ConsoleSidebar._groupName.Warning, ls`No warnings`], [Console.ConsoleSidebar._groupName.Info, ls`No info`],
+ [Console.ConsoleSidebar._groupName.Verbose, ls`No verbose`]
]);
