Changeset 214841 in webkit

Timestamp:

Apr 3, 2017 3:06:24 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: "Space" is not localizable in Timelines record button tooltips
​https://bugs.webkit.org/show_bug.cgi?id=170420
<rdar://problem/30871371>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-04-03
Reviewed by Timothy Hatcher.

• UserInterface/Base/LoadLocalizedStrings.js:

(WebInspector.unlocalizedString):
(WebInspector.UIString):

• UserInterface/Base/Main.js:

Move UIString / unlocalizedString to LoadLocalizedString.js.
They may be needed before Main.js has introduced it.

• UserInterface/Test/Test.js:

Provide a default implementaiton of unlocalizedString.

• Localizations/en.lproj/localizedStrings.js:
• UserInterface/Models/KeyboardShortcut.js:

Most keys use a symbol to represent the key. "Space" was the one
exception, so use a localized string.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Base/LoadLocalizedStrings.js (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Models/KeyboardShortcut.js (modified) (1 diff)
• UserInterface/Test/Test.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-04-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: "Space" is not localizable in Timelines record button tooltips
+        https://bugs.webkit.org/show_bug.cgi?id=170420
+        <rdar://problem/30871371>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Base/LoadLocalizedStrings.js:
+        (WebInspector.unlocalizedString):
+        (WebInspector.UIString):
+        * UserInterface/Base/Main.js:
+        Move UIString / unlocalizedString to LoadLocalizedString.js.
+        They may be needed before Main.js has introduced it.
+
+        * UserInterface/Test/Test.js:
+        Provide a default implementaiton of unlocalizedString.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        * UserInterface/Models/KeyboardShortcut.js:
+        Most keys use a symbol to represent the key. "Space" was the one
+        exception, so use a localized string.
+
 2017-04-03  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -768 +768 @@
 localizedStrings["Source"] = "Source";
 localizedStrings["Sources"] = "Sources";
+localizedStrings["Space"] = "Space";
 localizedStrings["Spaces"] = "Spaces";
 localizedStrings["Spacing"] = "Spacing";

trunk/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js

@@ -33 +33 @@
         document.write("<script src=\"" + localizedStringsURL + "\"></script>");
 })();
+
+WebInspector.unlocalizedString = function(string)
+{
+    // Intentionally do nothing, since this is for engineering builds
+    // (such as in Debug UI) or in text that is standardized in English.
+    // For example, CSS property names and values are never localized.
+    return string;
+};
+
+WebInspector.UIString = function(string, vararg)
+{
+    if (WebInspector.dontLocalizeUserInterface)
+        return string;
+
+    if (window.localizedStrings && string in window.localizedStrings)
+        return window.localizedStrings[string];
+
+    if (!this._missingLocalizedStrings)
+        this._missingLocalizedStrings = {};
+
+    if (!(string in this._missingLocalizedStrings)) {
+        console.error("Localized string \"" + string + "\" was not found.");
+        this._missingLocalizedStrings[string] = true;
+    }
+
+    return "LOCALIZED STRING NOT FOUND";
+};

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1065 +1065 @@
 };
 
-WebInspector.unlocalizedString = function(string)
-{
-    // Intentionally do nothing, since this is for engineering builds
-    // (such as in Debug UI) or in text that is standardized in English.
-    // For example, CSS property names and values are never localized.
-    return string;
-};
-
-WebInspector.UIString = function(string, vararg)
-{
-    if (WebInspector.dontLocalizeUserInterface)
-        return string;
-
-    if (window.localizedStrings && string in window.localizedStrings)
-        return window.localizedStrings[string];
-
-    if (!this._missingLocalizedStrings)
-        this._missingLocalizedStrings = {};
-
-    if (!(string in this._missingLocalizedStrings)) {
-        console.error("Localized string \"" + string + "\" was not found.");
-        this._missingLocalizedStrings[string] = true;
-    }
-
-    return "LOCALIZED STRING NOT FOUND";
-};
-
 WebInspector.indentString = function()
 {

trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js

@@ -233 +233 @@
     Enter: new WebInspector.Key(13, "\u21a9"),
     Escape: new WebInspector.Key(27, "\u238b"),
-    Space: new WebInspector.Key(32, "Space"),
+    Space: new WebInspector.Key(32, WebInspector.UIString("Space")),
     PageUp: new WebInspector.Key(33, "\u21de"),
     PageDown: new WebInspector.Key(34, "\u21df"),

trunk/Source/WebInspectorUI/UserInterface/Test/Test.js

@@ -103 +103 @@
 WebInspector.isDebugUIEnabled = () => false;
 
+WebInspector.unlocalizedString = (string) => string;
 WebInspector.UIString = (string) => string;