Attachment 357825 Details for Bug 153962 – Patch

[patch] Patch

bug-153962-20181220105047.patch (text/plain), 7.25 KB, created by Devin Rousso on 2018-12-20 09:50:48 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-12-20 09:50:48 PST

Size: 7.25 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index b464cca872adb4c7d9ec8de955bcd3ab2d9a6637..d43286835b51df64229cab174662c7df4cdd2fa3 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-12-20  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: UIString should take an optional key and description to aid localization
>+        https://bugs.webkit.org/show_bug.cgi?id=153962
>+        <rdar://problem/24542505>
>+
>+        Reviewed by Brian Burg.
>+
>+        * UserInterface/Base/LoadLocalizedStrings.js:
>+        (WI.UIString):
>+
>+        * UserInterface/Test/Test.js:
>+        (WI.UIString):
>+
>+        * UserInterface/Views/AuditTestGroupContentView.js:
>+        (WI.AuditTestGroupContentView.prototype.initialLayout):
>+
> 2018-12-19  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Audit: fix descriptions for default tests
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index 494234beee8300f3758b1dd78f2f34533c32ef53..aa78eeb05fb3e09d26342f7b42fbebef4a0d536d 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -56,7 +56,6 @@ localizedStrings["%s cannot be modified"] = "%s cannot be modified";
> localizedStrings["%s delay"] = "%s delay";
> localizedStrings["%s eval\n%s async"] = "%s eval\n%s async";
> localizedStrings["%s interval"] = "%s interval";
>-localizedStrings["%s%%"] = "%s%%";
> localizedStrings["(Action %s)"] = "(Action %s)";
> localizedStrings["(Disk)"] = "(Disk)";
> localizedStrings["(Index)"] = "(Index)";
>@@ -672,6 +671,8 @@ localizedStrings["Path"] = "Path";
> localizedStrings["Pause Processing"] = "Pause Processing";
> localizedStrings["Pause Reason"] = "Pause Reason";
> localizedStrings["Pause script execution (%s or %s)"] = "Pause script execution (%s or %s)";
>+/* The number of tests that passed expressed as a percentage, followed by a literal %. */
>+localizedStrings["Percentage (of audits)"] = "%s%%";
> localizedStrings["Ping"] = "Ping";
> localizedStrings["Ping Frame"] = "Ping Frame";
> localizedStrings["Pings"] = "Pings";
>diff --git a/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js b/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js
>index f0fd8cd6ea0acf6ec516a7a6d765d31f75b411b2..c0f5a375e33dd076ac70aa8901497dddeef4577f 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js
>@@ -41,23 +41,25 @@ WI.unlocalizedString = function(string)
>     return string;
> };
> 
>-WI.UIString = function(string)
>+WI.UIString = function(string, key, comment)
> {
>     if (WI.dontLocalizeUserInterface)
>         return string;
> 
>-    if (window.localizedStrings && string in window.localizedStrings)
>-        return window.localizedStrings[string];
>+    key = key || string;
>+
>+    if (window.localizedStrings && key in window.localizedStrings)
>+        return window.localizedStrings[key];
> 
>     if (!window.localizedStrings)
>-        console.error(`Attempted to load localized string "${string}" before localizedStrings was initialized.`);
>+        console.error(`Attempted to load localized string "${key}" before localizedStrings was initialized.`, comment);
> 
>     if (!this._missingLocalizedStrings)
>         this._missingLocalizedStrings = {};
> 
>-    if (!(string in this._missingLocalizedStrings)) {
>-        console.error("Localized string \"" + string + "\" was not found.");
>-        this._missingLocalizedStrings[string] = true;
>+    if (!(key in this._missingLocalizedStrings)) {
>+        console.error(`Localized string "${key}" was not found.`, comment);
>+        this._missingLocalizedStrings[key] = true;
>     }
> 
>     return "LOCALIZED STRING NOT FOUND";
>diff --git a/Source/WebInspectorUI/UserInterface/Test/Test.js b/Source/WebInspectorUI/UserInterface/Test/Test.js
>index 7f6c726ffd32ec286f12709d64c57dec9aa61d3d..f8adde814a31199222b807081ba3dacaeb27b5de 100644
>--- a/Source/WebInspectorUI/UserInterface/Test/Test.js
>+++ b/Source/WebInspectorUI/UserInterface/Test/Test.js
>@@ -165,7 +165,7 @@ WI.assumingMainTarget = () => WI.mainTarget;
> WI.isDebugUIEnabled = () => false;
> 
> WI.unlocalizedString = (string) => string;
>-WI.UIString = (string) => string;
>+WI.UIString = (string, key, comment) => string;
> 
> WI.indentString = () => "    ";
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js b/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js
>index 44101dad5aca3ff4540467a434686b5ebbdae81c..628eb1b30dff3cc30b215acdd5aa36236fd0f097 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js
>@@ -65,7 +65,8 @@ WI.AuditTestGroupContentView = class AuditTestGroupContentView extends WI.AuditT
> 
>         this._percentageTextElement = document.createElement("span");
> 
>-        String.format(WI.UIString("%s%%"), [this._percentageTextElement], String.standardFormatters, this._percentageContainer, (a, b) => {
>+        const format = WI.UIString("%s%%", "Percentage (of audits)", "The number of tests that passed expressed as a percentage, followed by a literal %.");
>+        String.format(format, [this._percentageTextElement], String.standardFormatters, this._percentageContainer, (a, b) => {
>             a.append(b);
>             return a;
>         });
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d069393c3432179af7494fd45c965f0e1e9adffe..126867c7e1548b2a15b558363511c02c990d932f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-12-20  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: UIString should take an optional key and description to aid localization
>+        https://bugs.webkit.org/show_bug.cgi?id=153962
>+        <rdar://problem/24542505>
>+
>+        Reviewed by Brian Burg.
>+
>+        * Scripts/extract-localizable-js-strings:
>+
> 2018-12-19  Chris Dumez  <cdumez@apple.com>
> 
>         wtf/Optional.h: move-constructor and move-assignment operator should disengage the value being moved from
>diff --git a/Tools/Scripts/extract-localizable-js-strings b/Tools/Scripts/extract-localizable-js-strings
>index b4200f6ef421f4bb94f9ad89f2d450fb82686984..34b5ac7793b3806eafa542348362ed1beef415ed 100755
>--- a/Tools/Scripts/extract-localizable-js-strings
>+++ b/Tools/Scripts/extract-localizable-js-strings
>@@ -74,7 +74,7 @@ for my $file (sort @files) {
>         chomp;
> 
>         # Handle WebInspector strings. Prints a warning if a non-string literal is passed to WI.UIString().
>-        HandleUIString($1, $1, "", $file, $.) while s/WI\.UIString$"([^"]+)"$//;
>+        HandleUIString($1, $2 || $1, $3 || "", $file, $.) while s/WI\.UIString$"([^"]+)"(?:,\s*"([^"]+)"(?:,\s*"([^"]+)")?)?$//;
>         print "$file:$.:WARNING: $&\n" while s/WI\.UIString$.*?$//;
> 
>         # Handle strings for other projects that also use this script.
>@@ -151,6 +151,7 @@ if ($sawError) {
> my $localizedStrings = "var localizedStrings = new Object;\n\n";
> 
> for my $key (sort keys %commentByKey) {
>+    $localizedStrings .= "/* $commentByKey{$key} */\n" if length $commentByKey{$key};
>     $localizedStrings .= "localizedStrings[\"$key\"] = \"$stringByKey{$key}\";\n";
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 153962: 357764 | 357786 | 357825