Changeset 196692 in webkit

Timestamp:

Feb 17, 2016 8:01:23 AM (8 years ago)

Author:

Matt Baker

Message:

Web Inspector: Add singular and plural cases for "Ignore n times before stopping" label in breakpoint editor
​https://bugs.webkit.org/show_bug.cgi?id=154335
<rdar://problem/24655491>

Reviewed by Timothy Hatcher.

• Localizations/en.lproj/localizedStrings.js:

Added string for singular ignore count.

• UserInterface/Controllers/BreakpointPopoverController.js:

(WebInspector.BreakpointPopoverController.prototype._createPopoverContent):
Remove unused variable "this._ignoreCount" and update ignore count text.

(WebInspector.BreakpointPopoverController.prototype._popoverIgnoreInputChanged):
Update ignore count text as value changes.

(WebInspector.BreakpointPopoverController.prototype._updateIgnoreCountText):
Set singular text when count === 1, otherwise set plural text.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Controllers/BreakpointPopoverController.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-17  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Add singular and plural cases for "Ignore n times before stopping" label in breakpoint editor
+        https://bugs.webkit.org/show_bug.cgi?id=154335
+        <rdar://problem/24655491>
+
+        Reviewed by Timothy Hatcher.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        Added string for singular ignore count.
+
+        * UserInterface/Controllers/BreakpointPopoverController.js:
+        (WebInspector.BreakpointPopoverController.prototype._createPopoverContent):
+        Remove unused variable "this._ignoreCount" and update ignore count text.
+
+        (WebInspector.BreakpointPopoverController.prototype._popoverIgnoreInputChanged):
+        Update ignore count text as value changes.
+
+        (WebInspector.BreakpointPopoverController.prototype._updateIgnoreCountText):
+        Set singular text when count === 1, otherwise set plural text.
+
 2016-02-16  Nikita Vasilyev  <nvasilyev@apple.com>
 

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

@@ -722 +722 @@
 localizedStrings["line "] = "line ";
 localizedStrings["originally %s"] = "originally %s";
+localizedStrings["time before stopping"] = "time before stopping";
 localizedStrings["times before stopping"] = "times before stopping";
 localizedStrings["value"] = "value";

trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js

@@ -181 +181 @@
                 this._ignoreCountInput.type = "number";
                 this._ignoreCountInput.min = 0;
-                this._ignoreCountInput.value = this._ignoreCount || 0;
+                this._ignoreCountInput.value = 0;
                 this._ignoreCountInput.addEventListener("change", this._popoverIgnoreInputChanged.bind(this));
 
-                let ignoreCountText = ignoreCountData.appendChild(document.createElement("span"));
                 ignoreCountLabel.setAttribute("for", this._ignoreCountInput.id);
                 ignoreCountLabel.textContent = WebInspector.UIString("Ignore");
-                ignoreCountText.textContent = WebInspector.UIString("times before stopping");
+
+                this._ignoreCountText = ignoreCountData.appendChild(document.createElement("span"));
+                this._updateIgnoreCountText();
             }
 
@@ -260 +261 @@
         this._ignoreCountInput.value = ignoreCount;
         this._breakpoint.ignoreCount = ignoreCount;
+
+        this._updateIgnoreCountText();
     }
 
@@ -297 +300 @@
             this._actionsContainer.insertBefore(breakpointActionView.element, nextElement);
         }
+    }
+
+    _updateIgnoreCountText()
+    {
+        if (this._breakpoint.ignoreCount === 1)
+            this._ignoreCountText.textContent = WebInspector.UIString("time before stopping");
+        else
+            this._ignoreCountText.textContent = WebInspector.UIString("times before stopping");
     }