Changeset 245060 in webkit


Ignore:
Timestamp:
May 8, 2019 10:44:47 AM (5 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r244952.

Caused inspector to appear blank.

Reverted changeset:

"Web Inspector: Provide UIString descriptions to improve
localizations"
​https://bugs.webkit.org/show_bug.cgi?id=195132
​https://trac.webkit.org/changeset/244952

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r244952 r245060  
     12019-05-08  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r244952.
     4
     5        Caused inspector to appear blank.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Provide UIString descriptions to improve
     10        localizations"
     11        https://bugs.webkit.org/show_bug.cgi?id=195132
     12        https://trac.webkit.org/changeset/244952
     13
    1142019-05-04  Nikita Vasilyev  <nvasilyev@apple.com>
    215

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

    r244952 r245060  
    9898localizedStrings["All"] = "All";
    9999localizedStrings["All Changes"] = "All Changes";
    100 /* Break (pause) on all exceptions */
    101100localizedStrings["All Exceptions"] = "All Exceptions";
    102101localizedStrings["All Layers"] = "All Layers";
    103 /* A submenu item of 'Break on' that breaks (pauses) before all network requests */
    104102localizedStrings["All Requests"] = "All Requests";
    105103localizedStrings["All Resources"] = "All Resources";
    … …  
    130128localizedStrings["Assertion Failed"] = "Assertion Failed";
    131129localizedStrings["Assertion Failed: %s"] = "Assertion Failed: %s";
    132 /* Break (pause) when console.assert() fails */
    133130localizedStrings["Assertion Failures"] = "Assertion Failures";
    134131localizedStrings["Assertion with message: %s"] = "Assertion with message: %s";
    … …  
    137134localizedStrings["Async audits are not supported."] = "Async audits are not supported.";
    138135localizedStrings["Attribute"] = "Attribute";
    139 /* A submenu item of 'Break On' that breaks (pauses) before DOM attribute is modified */
    140136localizedStrings["Attribute Modified"] = "Attribute Modified";
    141137localizedStrings["Attributes"] = "Attributes";
    … …  
    201197localizedStrings["Canvas Element"] = "Canvas Element";
    202198localizedStrings["Canvases"] = "Canvases";
    203 /* Capture screenshot of the selected DOM node */
    204199localizedStrings["Capture Screenshot"] = "Capture Screenshot";
    205200localizedStrings["Capturing"] = "Capturing";
    … …  
    215210localizedStrings["Charge \u201C%s\u201D to Callers"] = "Charge \u201C%s\u201D to Callers";
    216211localizedStrings["Checked"] = "Checked";
    217 /* A submenu item of 'Add' to append DOM nodes to the selected DOM node */
    218212localizedStrings["Child"] = "Child";
    219213localizedStrings["Child Layers"] = "Child Layers";
    … …  
    250244localizedStrings["Compare snapshots"] = "Compare snapshots";
    251245localizedStrings["Comparison of total memory size at the end of the selected time range to the maximum memory size in this recording"] = "Comparison of total memory size at the end of the selected time range to the maximum memory size in this recording";
    252 /* Composite phase timeline records, where graphic layers are combined */
    253 localizedStrings["Composite @ Timeline record"] = "Composite";
     246localizedStrings["Composite"] = "Composite";
    254247localizedStrings["Composited"] = "Composited";
    255248localizedStrings["Compressed"] = "Compressed";
    … …  
    471464localizedStrings["Failed to upgrade"] = "Failed to upgrade";
    472465localizedStrings["Failure status code"] = "Failure status code";
    473 /* Resource loaded via 'fetch' method */
    474466localizedStrings["Fetch"] = "Fetch";
    475 /* Resources loaded via 'fetch' method */
    476467localizedStrings["Fetches"] = "Fetches";
    477468localizedStrings["File or Resource"] = "File or Resource";
    … …  
    490481localizedStrings["Force Light Appearance"] = "Force Light Appearance";
    491482localizedStrings["Force Print Media Styles"] = "Force Print Media Styles";
    492 /* Layout phase records that were imperative (forced) */
    493483localizedStrings["Forced Layout"] = "Forced Layout";
    494 /* A context menu item to force (override) a DOM node's pseudo-classes */
    495484localizedStrings["Forced Pseudo-Classes"] = "Forced Pseudo-Classes";
    496485localizedStrings["Format: HSL"] = "Format: HSL";
    … …  
    582571localizedStrings["Info: "] = "Info: ";
    583572localizedStrings["Infos"] = "Infos";
    584 /* A section of CSS rules matching an ancestor DOM node */
    585573localizedStrings["Inherited From"] = "Inherited From";
    586574localizedStrings["Initial State"] = "Initial State";
    … …  
    611599localizedStrings["Layers"] = "Layers";
    612600localizedStrings["Layers:"] = "Layers:";
     601localizedStrings["Layout"] = "Layout";
    613602localizedStrings["Layout & Rendering"] = "Layout & Rendering";
    614 /* Layout phase timeline records */
    615 localizedStrings["Layout @ Timeline record"] = "Layout";
    616603localizedStrings["Layout Invalidated"] = "Layout Invalidated";
    617604localizedStrings["Line %d"] = "Line %d";
    … …  
    631618localizedStrings["Location"] = "Location";
    632619localizedStrings["Log Canvas Context"] = "Log Canvas Context";
    633 /* Log (print) DOM element to Console */
    634620localizedStrings["Log Element"] = "Log Element";
    635621localizedStrings["Log Frame Text"] = "Log Frame Text";
    636622localizedStrings["Log Frame Value"] = "Log Frame Value";
    637623localizedStrings["Log Message"] = "Log Message";
    638 /* Log (print) DOM node to Console */
    639624localizedStrings["Log Node"] = "Log Node";
    640625localizedStrings["Log Symbol"] = "Log Symbol";
    … …  
    680665localizedStrings["Network Requests:"] = "Network Requests:";
    681666localizedStrings["New Tab"] = "New Tab";
    682 /* A submenu item of 'Add' to add DOM nodes after the selected DOM node */
    683667localizedStrings["Next Sibling"] = "Next Sibling";
    684668localizedStrings["No"] = "No";
    … …  
    721705localizedStrings["No response headers"] = "No response headers";
    722706localizedStrings["Node"] = "Node";
    723 /* A submenu item of 'Break On' that breaks (pauses) before DOM node is removed */
    724707localizedStrings["Node Removed"] = "Node Removed";
    725708localizedStrings["Nodes"] = "Nodes";
    … …  
    761744localizedStrings["Page navigated at %s"] = "Page navigated at %s";
    762745localizedStrings["Page reloaded at %s"] = "Page reloaded at %s";
    763 /* Paint (render) phase timeline records */
    764 localizedStrings["Paint @ Timeline record"] = "Paint";
     746localizedStrings["Paint"] = "Paint";
    765747localizedStrings["Paints"] = "Paints";
    766 /* A count of how many times an element was painted (rendered) */
    767 localizedStrings["Paints @ Column title"] = "Paints";
    768748localizedStrings["Parent"] = "Parent";
    769749localizedStrings["Partial Garbage Collection"] = "Partial Garbage Collection";
    … …  
    795775localizedStrings["Pretty print"] = "Pretty print";
    796776localizedStrings["Preview"] = "Preview";
    797 /* A submenu item of 'Add' to add DOM nodes before the selected DOM node */
    798777localizedStrings["Previous Sibling"] = "Previous Sibling";
    799778localizedStrings["Primary Key"] = "Primary Key";
    … …  
    883862localizedStrings["Return value is not an object, string, or boolean"] = "Return value is not an object, string, or boolean";
    884863localizedStrings["Reveal Breakpoint"] = "Reveal Breakpoint";
    885 /* Open Elements tab and select this node in DOM tree */
    886864localizedStrings["Reveal in DOM Tree"] = "Reveal in DOM Tree";
    887865localizedStrings["Reveal in Debugger Tab"] = "Reveal in Debugger Tab";
    888866localizedStrings["Reveal in Elements Tab"] = "Reveal in Elements Tab";
    889 /* Open Layers tab and select the layer corresponding to this node */
    890867localizedStrings["Reveal in Layers Tab"] = "Reveal in Layers Tab";
    891868localizedStrings["Reveal in Network Tab"] = "Reveal in Network Tab";
    … …  
    916893localizedStrings["Script Evaluated"] = "Script Evaluated";
    917894localizedStrings["Scripts"] = "Scripts";
    918 /* Scroll selected DOM node into view on the inspected web page */
    919 localizedStrings["Scroll into View"] = "Scroll into View";
     895localizedStrings["Scroll Into View"] = "Scroll Into View";
    920896localizedStrings["Search"] = "Search";
    921897localizedStrings["Search Again"] = "Search Again";
    … …  
    932908localizedStrings["Selected"] = "Selected";
    933909localizedStrings["Selected Canvas Context"] = "Selected Canvas Context";
    934 /* Selected DOM element */
    935910localizedStrings["Selected Element"] = "Selected Element";
    936911localizedStrings["Selected Frame"] = "Selected Frame";
    937912localizedStrings["Selected Item"] = "Selected Item";
    938913localizedStrings["Selected Items"] = "Selected Items";
    939 /* Selected DOM node */
    940914localizedStrings["Selected Node"] = "Selected Node";
    941915localizedStrings["Selected Symbol"] = "Selected Symbol";
    … …  
    10381012localizedStrings["Stopping the \u201C%s\u201D audit"] = "Stopping the \u201C%s\u201D audit";
    10391013localizedStrings["Storage"] = "Storage";
    1040 /* CSS properties defined via HTML style attribute */
    10411014localizedStrings["Style Attribute"] = "Style Attribute";
    10421015localizedStrings["Style Resolution"] = "Style Resolution";
    … …  
    10511024localizedStrings["Stylesheets"] = "Stylesheets";
    10521025localizedStrings["Subject"] = "Subject";
    1053 /* A submenu item of 'Break On' that breaks (pauses) before child DOM node is modified */
    10541026localizedStrings["Subtree Modified"] = "Subtree Modified";
    10551027localizedStrings["Summary"] = "Summary";
    … …  
    10581030localizedStrings["Tab width:"] = "Tab width:";
    10591031localizedStrings["Tabs"] = "Tabs";
    1060 /* A submenu item of 'Edit' to change DOM element's tag name */
    10611032localizedStrings["Tag"] = "Tag";
    10621033localizedStrings["Take snapshot"] = "Take snapshot";
    … …  
    11211092localizedStrings["Trace"] = "Trace";
    11221093localizedStrings["Trace: %s"] = "Trace: %s";
    1123 /* Amount of data sent over the network for a single resource */
    11241094localizedStrings["Transfer Size"] = "Transfer Size";
    11251095localizedStrings["Transferred"] = "Transferred";
    … …  
    11361106localizedStrings["Unable to parse as JSON: %s"] = "Unable to parse as JSON: %s";
    11371107localizedStrings["Unable to show certificate for \u201C%s\u201D"] = "Unable to show certificate for \u201C%s\u201D";
    1138 /* Break (pause) on uncaught (unhandled) exceptions */
    11391108localizedStrings["Uncaught Exceptions"] = "Uncaught Exceptions";
    11401109localizedStrings["Undefined custom element"] = "Undefined custom element";

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

    r244952 r245060  
    4444WI.UIString = function(string, key, comment)
    4545{
    46     "use strict";
    47 
    4846    if (WI.dontLocalizeUserInterface)
    4947        return string;
    50 
    51     // UIString(string, comment)
    52     if (arguments.length === 2) {
    53         comment = key;
    54         key = undefined;
    55     }
    5648
    5749    key = key || string;
    … …  
    7365    return "LOCALIZED STRING NOT FOUND";
    7466};
    75 
    76 WI.repeatedUIString = {};
    77 
    78 WI.repeatedUIString.timelineRecordLayout = function() {
    79     return WI.UIString("Layout", "Layout @ Timeline record", "Layout phase timeline records");
    80 };
    81 
    82 WI.repeatedUIString.timelineRecordPaint = function() {
    83     return WI.UIString("Paint", "Paint @ Timeline record", "Paint (render) phase timeline records");
    84 };
    85 
    86 WI.repeatedUIString.timelineRecordComposite = function() {
    87     return WI.UIString("Composite", "Composite @ Timeline record", "Composite phase timeline records, where graphic layers are combined");
    88 };
    89 
    90 WI.repeatedUIString.allExceptions = function() {
    91     return WI.UIString("All Exceptions", "Break (pause) on all exceptions");
    92 };
    93 
    94 WI.repeatedUIString.uncaughtExceptions = function() {
    95     return WI.UIString("Uncaught Exceptions", "Break (pause) on uncaught (unhandled) exceptions");
    96 };
    97 
    98 WI.repeatedUIString.assertionFailures = function() {
    99     return WI.UIString("Assertion Failures", "Break (pause) when console.assert() fails");
    100 };
    101 
    102 WI.repeatedUIString.allRequests = function() {
    103     return WI.UIString("All Requests", "A submenu item of 'Break on' that breaks (pauses) before all network requests");
    104 };
    105 
    106 WI.repeatedUIString.fetch = function() {
    107     return WI.UIString("Fetch", "Resource loaded via 'fetch' method");
    108 };
    109 
    110 WI.repeatedUIString.revealInDOMTree = function() {
    111     return WI.UIString("Reveal in DOM Tree", "Open Elements tab and select this node in DOM tree");
    112 };

  • trunk/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js

    r244952 r245060  
    5252            return WI.UIString("Layout Invalidated");
    5353        case WI.LayoutTimelineRecord.EventType.ForcedLayout:
    54             return WI.UIString("Forced Layout", "Layout phase records that were imperative (forced)");
     54            return WI.UIString("Forced Layout");
    5555        case WI.LayoutTimelineRecord.EventType.Layout:
    56             return WI.repeatedUIString.timelineRecordLayout();
     56            return WI.UIString("Layout");
    5757        case WI.LayoutTimelineRecord.EventType.Paint:
    58             return WI.repeatedUIString.timelineRecordPaint();
     58            return WI.UIString("Paint");
    5959        case WI.LayoutTimelineRecord.EventType.Composite:
    60             return WI.repeatedUIString.timelineRecordComposite();
     60            return WI.UIString("Composite");
    6161        }
    6262    }

  • trunk/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js

    r244952 r245060  
    4747            return WI.UIString("Script");
    4848        case WI.RenderingFrameTimelineRecord.TaskType.Layout:
    49             return WI.repeatedUIString.timelineRecordLayout();
     49            return WI.UIString("Layout");
    5050        case WI.RenderingFrameTimelineRecord.TaskType.Paint:
    51             return WI.repeatedUIString.timelineRecordPaint();
     51            return WI.UIString("Paint");
    5252        case WI.RenderingFrameTimelineRecord.TaskType.Other:
    5353            return WI.UIString("Other");

  • trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js

    r244952 r245060  
    157157        case WI.Resource.Type.Fetch:
    158158            if (plural)
    159                 return WI.UIString("Fetches", "Resources loaded via 'fetch' method");
    160             return WI.repeatedUIString.fetch();
     159                return WI.UIString("Fetches");
     160            return WI.UIString("Fetch");
    161161        case WI.Resource.Type.Ping:
    162162            if (plural)

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

    r244952 r245060  
    126126            };
    127127
    128             addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Passed", "%d Passed (singular)", ""), WI.UIString("%d Passed", "%d Passed (plural)", ""));
     128            addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Passed", "%d Passed (singular)"), WI.UIString("%d Passed", "%d Passed (plural)"));
    129129            addScopeBarItem(WI.AuditTestCaseResult.Level.Warn, WI.UIString("%d Warning"), WI.UIString("%d Warnings"));
    130             addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Failed", "%d Failed (singular)", ""), WI.UIString("%d Failed", "%d Failed (plural)", ""));
     130            addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Failed", "%d Failed (singular)"), WI.UIString("%d Failed", "%d Failed (plural)"));
    131131            addScopeBarItem(WI.AuditTestCaseResult.Level.Error, WI.UIString("%d Error"), WI.UIString("%d Errors"));
    132             addScopeBarItem(WI.AuditTestCaseResult.Level.Unsupported, WI.UIString("%d Unsupported", "%d Unsupported (singular)", ""), WI.UIString("%d Unsupported", "%d Unsupported (plural)", ""));
     132            addScopeBarItem(WI.AuditTestCaseResult.Level.Unsupported, WI.UIString("%d Unsupported", "%d Unsupported (singular)"), WI.UIString("%d Unsupported", "%d Unsupported (plural)"));
    133133
    134134            this._levelScopeBar = new WI.ScopeBar(null, scopeBarItems);

  • trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js

    r244952 r245060  
    5858            return WI.UIString("Script");
    5959        case WI.CPUTimelineView.SampleType.Layout:
    60             return WI.repeatedUIString.timelineRecordLayout();
     60            return WI.UIString("Layout");
    6161        case WI.CPUTimelineView.SampleType.Paint:
    62             return WI.repeatedUIString.timelineRecordPaint();
     62            return WI.UIString("Paint");
    6363        case WI.CPUTimelineView.SampleType.Style:
    6464            return WI.UIString("Style Resolution");

  • trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js

    r244952 r245060  
    217217
    218218    if (!options.excludeLogElement && !domNode.isInUserAgentShadowTree() && !domNode.isPseudoElement()) {
    219         let label = isElement ? WI.UIString("Log Element", "Log (print) DOM element to Console") : WI.UIString("Log Node", "Log (print) DOM node to Console");
     219        let label = isElement ? WI.UIString("Log Element") : WI.UIString("Log Node");
    220220        contextMenu.appendItem(label, () => {
    221221            WI.RemoteObject.resolveNode(domNode, WI.RuntimeManager.ConsoleObjectGroup).then((remoteObject) => {
    222                 let text = isElement ? WI.UIString("Selected Element", "Selected DOM element") : WI.UIString("Selected Node", "Selected DOM node");
     222                let text = isElement ? WI.UIString("Selected Element") : WI.UIString("Selected Node");
    223223                const addSpecialUserLogClass = true;
    224224                WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass);
    … …  
    228228
    229229    if (!options.excludeRevealElement && window.DOMAgent && attached) {
    230         contextMenu.appendItem(WI.repeatedUIString.revealInDOMTree(), () => {
     230        contextMenu.appendItem(WI.UIString("Reveal in DOM Tree"), () => {
    231231            WI.domManager.inspectElement(domNode.id);
    232232        });
    … …  
    234234
    235235    if (WI.settings.experimentalEnableLayersTab.value && window.LayerTreeAgent && attached) {
    236         contextMenu.appendItem(WI.UIString("Reveal in Layers Tab", "Open Layers tab and select the layer corresponding to this node"), () => {
     236        contextMenu.appendItem(WI.UIString("Reveal in Layers Tab"), () => {
    237237            WI.showLayersTab({nodeToSelect: domNode});
    238238        });
    … …  
    240240
    241241    if (window.PageAgent && attached) {
    242         contextMenu.appendItem(WI.UIString("Capture Screenshot", "Capture screenshot of the selected DOM node"), () => {
     242        contextMenu.appendItem(WI.UIString("Capture Screenshot"), () => {
    243243            PageAgent.snapshotNode(domNode.id, (error, dataURL) => {
    244244                if (error) {
    … …  
    263263
    264264    if (isElement && attached) {
    265         contextMenu.appendItem(WI.UIString("Scroll into View", "Scroll selected DOM node into view on the inspected web page"), () => {
     265        contextMenu.appendItem(WI.UIString("Scroll Into View"), () => {
    266266            domNode.scrollIntoView();
    267267        });

  • trunk/Source/WebInspectorUI/UserInterface/Views/DOMBreakpointTreeElement.js

    r244952 r245060  
    5151        switch (type) {
    5252        case WI.DOMBreakpoint.Type.SubtreeModified:
    53             return WI.UIString("Subtree Modified", "A submenu item of 'Break On' that breaks (pauses) before child DOM node is modified");
     53            return WI.UIString("Subtree Modified");
    5454        case WI.DOMBreakpoint.Type.AttributeModified:
    55             return WI.UIString("Attribute Modified", "A submenu item of 'Break On' that breaks (pauses) before DOM attribute is modified");
     55            return WI.UIString("Attribute Modified");
    5656        case WI.DOMBreakpoint.Type.NodeRemoved:
    57             return WI.UIString("Node Removed", "A submenu item of 'Break On' that breaks (pauses) before DOM node is removed");
     57            return WI.UIString("Node Removed");
    5858        default:
    5959            console.error("Unexpected DOM breakpoint type: " + type);

  • trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeTreeElement.js

    r244952 r245060  
    6262        contextMenu.appendSeparator();
    6363
    64         contextMenu.appendItem(WI.repeatedUIString.revealInDOMTree(), () => {
     64        contextMenu.appendItem(WI.UIString("Reveal in DOM Tree"), () => {
    6565            WI.domManager.inspectElement(this.representedObject.id);
    6666        });

  • trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js

    r244952 r245060  
    778778        }, !attribute || !isNonShadowEditable);
    779779
    780         subMenus.edit.appendItem(WI.UIString("Tag", "A submenu item of 'Edit' to change DOM element's tag name"), () => {
     780        subMenus.edit.appendItem(WI.UIString("Tag"), () => {
    781781            this._startEditingTagName();
    782782        }, !isNonShadowEditable);
    … …  
    785785
    786786        if (WI.cssManager.canForcePseudoClasses() && attached) {
    787             let pseudoSubMenu = contextMenu.appendSubMenuItem(WI.UIString("Forced Pseudo-Classes", "A context menu item to force (override) a DOM node's pseudo-classes"));
     787            let pseudoSubMenu = contextMenu.appendSubMenuItem(WI.UIString("Forced Pseudo-Classes"));
    788788
    789789            let enabledPseudoClasses = node.enabledPseudoClasses;
    … …  
    816816        let isEditableNode = node.nodeType() === Node.ELEMENT_NODE && this.editable;
    817817        let forbiddenClosingTag = WI.DOMTreeElement.ForbiddenClosingTagElements.has(node.nodeNameInCorrectCase());
    818         subMenus.add.appendItem(WI.UIString("Child", "A submenu item of 'Add' to append DOM nodes to the selected DOM node"), this._addHTML.bind(this), forbiddenClosingTag || !isEditableNode);
    819         subMenus.add.appendItem(WI.UIString("Previous Sibling", "A submenu item of 'Add' to add DOM nodes before the selected DOM node"), this._addPreviousSibling.bind(this), !isEditableNode);
    820         subMenus.add.appendItem(WI.UIString("Next Sibling", "A submenu item of 'Add' to add DOM nodes after the selected DOM node"), this._addNextSibling.bind(this), !isEditableNode);
     818        subMenus.add.appendItem(WI.UIString("Child"), this._addHTML.bind(this), forbiddenClosingTag || !isEditableNode);
     819        subMenus.add.appendItem(WI.UIString("Previous Sibling"), this._addPreviousSibling.bind(this), !isEditableNode);
     820        subMenus.add.appendItem(WI.UIString("Next Sibling"), this._addNextSibling.bind(this), !isEditableNode);
    821821
    822822        subMenus.edit.appendItem(WI.UIString("HTML"), this._editAsHTML.bind(this), !this.editable);

  • trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js

    r244952 r245060  
    475475        if (breakpoint === WI.debuggerManager.allExceptionsBreakpoint) {
    476476            options.className = WI.DebuggerSidebarPanel.ExceptionIconStyleClassName;
    477             options.title = WI.repeatedUIString.allExceptions();
     477            options.title = WI.UIString("All Exceptions");
    478478        } else if (breakpoint === WI.debuggerManager.uncaughtExceptionsBreakpoint) {
    479479            options.className = WI.DebuggerSidebarPanel.ExceptionIconStyleClassName;
    480             options.title = WI.repeatedUIString.uncaughtExceptions();
     480            options.title = WI.UIString("Uncaught Exceptions");
    481481        } else if (breakpoint === WI.debuggerManager.assertionFailuresBreakpoint) {
    482482            options.className = WI.DebuggerSidebarPanel.AssertionIconStyleClassName;
    483             options.title = WI.repeatedUIString.assertionFailures();
     483            options.title = WI.UIString("Assertion Failures");
    484484        } else if (breakpoint instanceof WI.DOMBreakpoint) {
    485485            if (!breakpoint.domNodeIdentifier)
    … …  
    515515            if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) {
    516516                options.className = WI.DebuggerSidebarPanel.AssertionIconStyleClassName;
    517                 options.title = WI.repeatedUIString.allRequests();
     517                options.title = WI.UIString("All Requests");
    518518            }
    519519        } else {
    … …  
    14581458            let assertionFailuresBreakpointShown = WI.settings.showAssertionFailuresBreakpoint.value;
    14591459
    1460             contextMenu.appendCheckboxItem(WI.repeatedUIString.assertionFailures(), () => {
     1460            contextMenu.appendCheckboxItem(WI.UIString("Assertion Failures"), () => {
    14611461                if (assertionFailuresBreakpointShown)
    14621462                    WI.debuggerManager.removeBreakpoint(WI.debuggerManager.assertionFailuresBreakpoint);
    … …  
    14801480            let allRequestsBreakpointShown = WI.settings.showAllRequestsBreakpoint.value;
    14811481
    1482             contextMenu.appendCheckboxItem(WI.repeatedUIString.allRequests(), () => {
     1482            contextMenu.appendCheckboxItem(WI.UIString("All Requests"), () => {
    14831483                if (allRequestsBreakpointShown)
    14841484                    WI.domDebuggerManager.removeURLBreakpoint(WI.domDebuggerManager.allRequestsBreakpoint);

  • trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js

    r244952 r245060  
    137137        columns.name.sortable = false;
    138138
    139         columns.paintCount.title = WI.UIString("Paints", "Paints @ Column title", "A count of how many times an element was painted (rendered)");
     139        columns.paintCount.title = WI.UIString("Paints");
    140140        columns.paintCount.sortable = true;
    141141        columns.paintCount.aligned = "right";

  • trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

    r244952 r245060  
    212212            return "XHR";
    213213        case WI.Resource.Type.Fetch:
    214             return WI.repeatedUIString.fetch();
     214            return WI.UIString("Fetch");
    215215        case WI.Resource.Type.Ping:
    216216            return WI.UIString("Ping");
    … …  
    11731173        });
    11741174
    1175         this._transferSizeColumn = new WI.TableColumn("transferSize", WI.UIString("Transfer Size", "Amount of data sent over the network for a single resource"), {
     1175        this._transferSizeColumn = new WI.TableColumn("transferSize", WI.UIString("Transfer Size"), {
    11761176            minWidth: 100,
    11771177            maxWidth: 150,

  • trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js

    r244952 r245060  
    884884        if (breakpoint === WI.debuggerManager.allExceptionsBreakpoint) {
    885885            options.className = "breakpoint-exception-icon";
    886             options.title = WI.repeatedUIString.allExceptions();
     886            options.title = WI.UIString("All Exceptions");
    887887        } else if (breakpoint === WI.debuggerManager.uncaughtExceptionsBreakpoint) {
    888888            options.className = "breakpoint-exception-icon";
    889             options.title = WI.repeatedUIString.uncaughtExceptions();
     889            options.title = WI.UIString("Uncaught Exceptions");
    890890        } else if (breakpoint === WI.debuggerManager.assertionFailuresBreakpoint) {
    891891            options.className = "breakpoint-assertion-icon";
    892             options.title = WI.repeatedUIString.assertionFailures();
     892            options.title = WI.UIString("Assertion Failures");
    893893        } else if (breakpoint instanceof WI.DOMBreakpoint) {
    894894            if (!breakpoint.domNodeIdentifier)
    … …  
    924924            if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) {
    925925                options.className = "breakpoint-assertion-icon";
    926                 options.title = WI.repeatedUIString.allRequests();
     926                options.title = WI.UIString("All Requests");
    927927            }
    928928        } else {
    … …  
    15031503            let assertionFailuresBreakpointShown = WI.settings.showAssertionFailuresBreakpoint.value;
    15041504
    1505             contextMenu.appendCheckboxItem(WI.repeatedUIString.assertionFailures(), () => {
     1505            contextMenu.appendCheckboxItem(WI.UIString("Assertion Failures"), () => {
    15061506                if (assertionFailuresBreakpointShown)
    15071507                    WI.debuggerManager.removeBreakpoint(WI.debuggerManager.assertionFailuresBreakpoint);
    … …  
    15251525            let allRequestsBreakpointShown = WI.settings.showAllRequestsBreakpoint.value;
    15261526
    1527             contextMenu.appendCheckboxItem(WI.repeatedUIString.allRequests(), () => {
     1527            contextMenu.appendCheckboxItem(WI.UIString("All Requests"), () => {
    15281528                if (allRequestsBreakpointShown)
    15291529                    WI.domDebuggerManager.removeURLBreakpoint(WI.domDebuggerManager.allRequestsBreakpoint);

  • trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js

    r244952 r245060  
    316316
    317317        case WI.CSSStyleDeclaration.Type.Inline:
    318             this._selectorElement.textContent = WI.UIString("Style Attribute", "CSS properties defined via HTML style attribute");
     318            this._selectorElement.textContent = WI.UIString("Style Attribute");
    319319            this._selectorElement.classList.add("style-attribute");
    320320            break;

  • trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js

    r244952 r245060  
    257257        let addSection = (section) => {
    258258            if (section.style.inherited && (!previousStyle || previousStyle.node !== section.style.node))
    259                 addHeader(WI.UIString("Inherited From", "A section of CSS rules matching an ancestor DOM node"), section.style.node);
     259                addHeader(WI.UIString("Inherited From"), section.style.node);
    260260
    261261            if (!section.isDescendantOf(this)) {

  • trunk/Tools/ChangeLog

    r245057 r245060  
     12019-05-08  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r244952.
     4
     5        Caused inspector to appear blank.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Provide UIString descriptions to improve
     10        localizations"
     11        https://bugs.webkit.org/show_bug.cgi?id=195132
     12        https://trac.webkit.org/changeset/244952
     13
    1142019-05-08  Wenson Hsieh  <wenson_hsieh@apple.com>
    215

  • trunk/Tools/Scripts/extract-localizable-js-strings

    r244952 r245060  
    7575
    7676        # Handle WebInspector strings. Prints a warning if a non-string literal is passed to WI.UIString().
    77         # Allow: WI.UIString(string, comment)
    78         #        WI.UIString(string, key, comment)
    79         HandleUIString(
    80             $1,
    81             ($3 || (defined $3 and length $3 == 0)) ? $2 : $1,
    82             ($3 || (defined $3 and length $3 == 0)) ? $3 : $2 || "",
    83             $file,
    84             $.
    85         ) while s/WI\.UIString\("([^"]+)"(?:,\s*"([^"]*)"(?:,\s*"([^"]*)")?)?\)//;
     77        HandleUIString($1, $2 || $1, $3 || "", $file, $.) while s/WI\.UIString\("([^"]+)"(?:,\s*"([^"]+)"(?:,\s*"([^"]+)")?)?\)//;
    8678        print "$file:$.:WARNING: $&\n" while s/WI\.UIString\(.*?\)//;
    8779
Note: See TracChangeset for help on using the changeset viewer.