Changeset 194123 in webkit

Timestamp:

Dec 15, 2015, 4:23:49 PM (11 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Localize "global code" and "eval code" strings
​https://bugs.webkit.org/show_bug.cgi?id=152313

Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

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

(WebInspector.CallFrame.fromPayload):
Localize the strings given to use from the backend.

LayoutTests:

• inspector/debugger/js-stacktrace-expected.txt:
• inspector/debugger/js-stacktrace.html:
• inspector/model/stack-trace-expected.txt: Added.
• inspector/model/stack-trace.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/js-stacktrace-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/debugger/js-stacktrace.html (modified) (1 diff)
• LayoutTests/inspector/model/stack-trace-expected.txt (added)
• LayoutTests/inspector/model/stack-trace.html (added)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (modified) (3 diffs)
• Source/WebInspectorUI/UserInterface/Models/CallFrame.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-15  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Localize "global code" and "eval code" strings
+        https://bugs.webkit.org/show_bug.cgi?id=152313
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/debugger/js-stacktrace-expected.txt:
+        * inspector/debugger/js-stacktrace.html:
+        * inspector/model/stack-trace-expected.txt: Added.
+        * inspector/model/stack-trace.html: Added.
+
 2015-12-15  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt

@@ -20 +20 @@
         "lineNumber": null,
         "columnNumber": null,
-        "functionName": "eval code",
+        "functionName": "Eval Code",
         "nativeCode": true,
         "programCode": true
@@ -74 +74 @@
         "lineNumber": null,
         "columnNumber": null,
-        "functionName": "eval code",
+        "functionName": "Eval Code",
         "nativeCode": true,
         "programCode": true

trunk/LayoutTests/inspector/debugger/js-stacktrace.html

@@ -115 +115 @@
         for (var frame of stackTrace) {
             index++;
-            if (frame.nativeCode && frame.functionName === "eval code")
+            if (frame.programCode)
                 break;
         }

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-12-15  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Localize "global code" and "eval code" strings
+        https://bugs.webkit.org/show_bug.cgi?id=152313
+
+        Reviewed by Timothy Hatcher.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        * UserInterface/Models/CallFrame.js:
+        (WebInspector.CallFrame.fromPayload):
+        Localize the strings given to use from the backend.
+
 2015-12-15  Matt Baker  <mattbaker@apple.com>
 

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

@@ -267 +267 @@
 localizedStrings["Error: "] = "Error: ";
 localizedStrings["Errors"] = "Errors";
+localizedStrings["Eval Code"] = "Eval Code";
 localizedStrings["Evaluate JavaScript"] = "Evaluate JavaScript";
 localizedStrings["Event Dispatched"] = "Event Dispatched";
@@ -310 +311 @@
 localizedStrings["Getter"] = "Getter";
 localizedStrings["Global Breakpoints"] = "Global Breakpoints";
+localizedStrings["Global Code"] = "Global Code";
 localizedStrings["Global Lexical Environment"] = "Global Lexical Environment";
 localizedStrings["Global Variables"] = "Global Variables";
@@ -392 +394 @@
 localizedStrings["Min"] = "Min";
 localizedStrings["Mixed"] = "Mixed";
+localizedStrings["Module Code"] = "Module Code";
 localizedStrings["Name"] = "Name";
 localizedStrings["Network"] = "Network";

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

@@ -113 +113 @@
         console.assert(payload);
 
-        var url = payload.url;
-        var nativeCode = false;
-        var programCode = false;
-        var sourceCodeLocation = null;
+        let url = payload.url;
+        let nativeCode = false;
+        let programCode = false;
+        let sourceCodeLocation = null;
 
         if (!url || url === "[native code]") {
@@ -122 +122 @@
             url = null;
         } else {
-            var sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
+            let sourceCode = WebInspector.frameResourceManager.resourceForURL(url);
             if (!sourceCode)
                 sourceCode = WebInspector.debuggerManager.scriptsForURL(url)[0];
@@ -128 +128 @@
             if (sourceCode) {
                 // The lineNumber is 1-based, but we expect 0-based.
-                var lineNumber = payload.lineNumber - 1;
+                let lineNumber = payload.lineNumber - 1;
                 sourceCodeLocation = sourceCode.createLazySourceCodeLocation(lineNumber, payload.columnNumber);
             }
         }
 
-        var functionName = payload.functionName;
-        if (payload.functionName === "global code"
-            || payload.functionName === "eval code"
-            || payload.functionName === "module code")
+        let functionName = payload.functionName;
+        if (payload.functionName === "global code") {
+            functionName = WebInspector.UIString("Global Code");
             programCode = true;
+        } else if (payload.functionName === "eval code") {
+            functionName = WebInspector.UIString("Eval Code");
+            programCode = true;
+        } else if (payload.functionName === "module code") {
+            functionName = WebInspector.UIString("Module Code");
+            programCode = true;
+        }
 
         return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode, programCode);