Changeset 239286 in webkit

Timestamp:

Dec 17, 2018 1:16:30 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Audit: add plural result strings
​https://bugs.webkit.org/show_bug.cgi?id=192769
<rdar://problem/46628680>

Reviewed by Brian Burg.

• UserInterface/Views/AuditTestContentView.js:

(WI.AuditTestContentView.prototype.showNoResultDataPlaceholder):

• UserInterface/Views/AuditTestGroupContentView.js:

(WI.AuditTestGroupContentView.prototype.layout):

• Localizations/en.lproj/localizedStrings.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (2 diffs)
• UserInterface/Views/AuditTestContentView.js (modified) (1 diff)
• UserInterface/Views/AuditTestGroupContentView.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-12-17  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: add plural result strings
+        https://bugs.webkit.org/show_bug.cgi?id=192769
+        <rdar://problem/46628680>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/AuditTestContentView.js:
+        (WI.AuditTestContentView.prototype.showNoResultDataPlaceholder):
+
+        * UserInterface/Views/AuditTestGroupContentView.js:
+        (WI.AuditTestGroupContentView.prototype.layout):
+
+        * Localizations/en.lproj/localizedStrings.js:
+
 2018-12-17  Devin Rousso  <drousso@apple.com>
 

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

@@ -26 +26 @@
 localizedStrings["%d Errors"] = "%d Errors";
 localizedStrings["%d Errors, %d Warnings"] = "%d Errors, %d Warnings";
-localizedStrings["%d Fail"] = "%d Fail";
+localizedStrings["%d Failed"] = "%d Failed";
 localizedStrings["%d Frame"] = "%d Frame";
 localizedStrings["%d Frames"] = "%d Frames";
 localizedStrings["%d More\u2026"] = "%d More\u2026";
-localizedStrings["%d Pass"] = "%d Pass";
+localizedStrings["%d Passed"] = "%d Passed";
 localizedStrings["%d Threads"] = "%d Threads";
 localizedStrings["%d Unsupported"] = "%d Unsupported";
-localizedStrings["%d Warn"] = "%d Warn";
+localizedStrings["%d Warning"] = "%d Warning";
 localizedStrings["%d Warnings"] = "%d Warnings";
 localizedStrings["%d \xd7 %d pixels"] = "%d \xd7 %d pixels";
@@ -922 +922 @@
 localizedStrings["The \u201C%s\u201D audit is unsupported"] = "The \u201C%s\u201D audit is unsupported";
 localizedStrings["The \u201C%s\u201D audit passed"] = "The \u201C%s\u201D audit passed";
+localizedStrings["The \u201C%s\u201D audit resulted in a warning"] = "The \u201C%s\u201D audit resulted in a warning";
 localizedStrings["The \u201C%s\u201D audit threw an error"] = "The \u201C%s\u201D audit threw an error";
-localizedStrings["The \u201C%s\u201D audit warned"] = "The \u201C%s\u201D audit warned";
 localizedStrings["The \u201C%s\u201D\ntable is empty."] = "The \u201C%s\u201D\ntable is empty.";
 localizedStrings["The page's content has changed"] = "The page's content has changed";

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

@@ -181 +181 @@
                 message = WI.UIString("The \u201C%s\u201D audit failed");
             else if (result.didWarn)
-                message = WI.UIString("The \u201C%s\u201D audit warned");
+                message = WI.UIString("The \u201C%s\u201D audit resulted in a warning");
             else if (result.didPass)
                 message = WI.UIString("The \u201C%s\u201D audit passed");

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

@@ -98 +98 @@
             let scopeBarItems = [];
 
-            let addScopeBarItem = (level, label) => {
+            let addScopeBarItem = (level, labelSingular, labelPlural) => {
                 let count = levelCounts[level];
                 if (isNaN(count) || count <= 0)
                     return;
 
+                let label = (labelPlural && count !== 1) ? labelPlural : labelSingular;
                 let scopeBarItem = new WI.ScopeBarItem(level, label.format(count), {
                     className: level,
@@ -112 +113 @@
             };
 
-            addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Pass"));
-            addScopeBarItem(WI.AuditTestCaseResult.Level.Warn, WI.UIString("%d Warn"));
-            addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Fail"));
-            addScopeBarItem(WI.AuditTestCaseResult.Level.Error, WI.UIString("%d Error"));
+            addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Passed"));
+            addScopeBarItem(WI.AuditTestCaseResult.Level.Warn, WI.UIString("%d Warning"), WI.UIString("%d Warnings"));
+            addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Failed"));
+            addScopeBarItem(WI.AuditTestCaseResult.Level.Error, WI.UIString("%d Error"), WI.UIString("%d Errors"));
             addScopeBarItem(WI.AuditTestCaseResult.Level.Unsupported, WI.UIString("%d Unsupported"));