Title: [190740] branches/safari-601.1-branch/Source/WebInspectorUI
Diff
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog (190739 => 190740)
--- branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:19:02 UTC (rev 190739)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog 2015-10-08 20:19:15 UTC (rev 190740)
@@ -1,5 +1,9 @@
2015-10-08 Lucas Forschler <[email protected]>
+ Rollout r190736
+
+2015-10-08 Lucas Forschler <[email protected]>
+
Rollout r190737
2015-10-08 Lucas Forschler <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (190739 => 190740)
--- branches/safari-601.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-08 20:19:02 UTC (rev 190739)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-08 20:19:15 UTC (rev 190740)
@@ -67,7 +67,7 @@
localizedStrings["Application Cache"] = "Application Cache";
localizedStrings["Assertion"] = "Assertion";
localizedStrings["Assertion Failed"] = "Assertion Failed";
-localizedStrings["Assertion Failed: %s"] = "Assertion Failed: %s";
+localizedStrings["Assertion failed:"] = "Assertion failed:";
localizedStrings["Assertion with message: %s"] = "Assertion with message: %s";
localizedStrings["Assertive"] = "Assertive";
localizedStrings["Attribute"] = "Attribute";
Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (190739 => 190740)
--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-10-08 20:19:02 UTC (rev 190739)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-10-08 20:19:15 UTC (rev 190740)
@@ -232,13 +232,9 @@
break;
case WebInspector.ConsoleMessage.MessageType.Assert:
- var args = [WebInspector.UIString("Assertion Failed")];
- if (this._message.parameters) {
- if (this._message.parameters[0].type === "string")
- args = [WebInspector.UIString("Assertion Failed: %s")].concat(this._message.parameters);
- else
- args = args.concat(this._message.parameters);
- }
+ var args = [WebInspector.UIString("Assertion failed:")];
+ if (this._message.parameters)
+ args.concat(this._message.parameters);
this._appendFormattedArguments(element, args);
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
