Diff
Modified: trunk/LayoutTests/ChangeLog (209619 => 209620)
--- trunk/LayoutTests/ChangeLog 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/ChangeLog 2016-12-09 19:42:43 UTC (rev 209620)
@@ -1,3 +1,18 @@
+2016-12-09 Chris Dumez <cdu...@apple.com>
+
+ [Cocoa] Validation message for required checkbox doesn’t conform the the Apple Style Guide
+ https://bugs.webkit.org/show_bug.cgi?id=165661
+
+ Reviewed by Dan Bernstein.
+
+ Update / rebaseline tests.
+
+ * fast/forms/ios/validation-bubble-dismiss-on-tap-expected.txt:
+ * fast/forms/ios/validation-bubble-dismiss-on-tap.html:
+ * fast/forms/validation-messages-expected.txt:
+ * fast/forms/validation-messages.html:
+ * platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt:
+
2016-12-09 Jiewen Tan <jiewen_...@apple.com>
Unreviewed, followup after r209598.
Modified: trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap-expected.txt (209619 => 209620)
--- trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap-expected.txt 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap-expected.txt 2016-12-09 19:42:43 UTC (rev 209620)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS validationBubbleContents.message is "Check this box"
+PASS validationBubbleContents.message is "Select this checkbox"
PASS validationBubbleContents.message is ""
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap.html (209619 => 209620)
--- trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap.html 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/fast/forms/ios/validation-bubble-dismiss-on-tap.html 2016-12-09 19:42:43 UTC (rev 209620)
@@ -36,7 +36,7 @@
testRunner.runUIScript(getValidationBubbleContents(), function(result) {
validationBubbleContents = JSON.parse(result).validationBubble;
- shouldBeEqualToString("validationBubbleContents.message", "Check this box");
+ shouldBeEqualToString("validationBubbleContents.message", "Select this checkbox");
testRunner.runUIScript(getTapAtPointUIScript(0, 0), function() {
testRunner.runUIScript(getValidationBubbleContents(), function(result) {
Modified: trunk/LayoutTests/fast/forms/validation-messages-expected.txt (209619 => 209620)
--- trunk/LayoutTests/fast/forms/validation-messages-expected.txt 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/fast/forms/validation-messages-expected.txt 2016-12-09 19:42:43 UTC (rev 209620)
@@ -4,7 +4,7 @@
PASS validationBubbleContents.message is "Fill out this field"
-PASS validationBubbleContents.message is "Check this box"
+PASS validationBubbleContents.message is "Select this checkbox"
PASS validationBubbleContents.message is "Select one of these options"
PASS validationBubbleContents.message is "Select a file"
PASS validationBubbleContents.message is "Enter an email address"
Modified: trunk/LayoutTests/fast/forms/validation-messages.html (209619 => 209620)
--- trunk/LayoutTests/fast/forms/validation-messages.html 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/fast/forms/validation-messages.html 2016-12-09 19:42:43 UTC (rev 209620)
@@ -51,7 +51,7 @@
var tests = [
['required_text_input_submit', 'Fill out this field'],
- ['required_checkbox_submit', 'Check this box'],
+ ['required_checkbox_submit', 'Select this checkbox'],
['required_radio_submit', 'Select one of these options'],
['required_file_submit', 'Select a file'],
['required_email_submit', 'Enter an email address'],
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt (209619 => 209620)
--- trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt 2016-12-09 19:42:43 UTC (rev 209620)
@@ -4,7 +4,7 @@
PASS validationBubbleContents.message is "Fill out this field"
-PASS validationBubbleContents.message is "Check this box"
+PASS validationBubbleContents.message is "Select this checkbox"
PASS validationBubbleContents.message is "Select one of these options"
PASS validationBubbleContents.message is "Select a file"
PASS validationBubbleContents.message is "Enter an email address"
Modified: trunk/Source/WebCore/ChangeLog (209619 => 209620)
--- trunk/Source/WebCore/ChangeLog 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/Source/WebCore/ChangeLog 2016-12-09 19:42:43 UTC (rev 209620)
@@ -1,3 +1,16 @@
+2016-12-09 Chris Dumez <cdu...@apple.com>
+
+ [Cocoa] Validation message for required checkbox doesn’t conform the the Apple Style Guide
+ https://bugs.webkit.org/show_bug.cgi?id=165661
+
+ Reviewed by Dan Bernstein.
+
+ Update validation message as per Apple Style Guide.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::validationMessageValueMissingForCheckboxText):
+
2016-12-09 Zalan Bujtas <za...@apple.com>
ASSERTION FAILED: !beforeChild->isRubyRun() in WebCore::RenderRubyAsBlock::addChild
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (209619 => 209620)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-12-09 19:42:43 UTC (rev 209620)
@@ -151,9 +151,6 @@
/* Check spelling while typing context menu item */
"Check Spelling While Typing" = "Check Spelling While Typing";
-/* Validation message for required checkboxes that have not be checked */
-"Check this box" = "Check this box";
-
/* title for a single file chooser button used in HTML forms */
"Choose File" = "Choose File";
@@ -529,6 +526,9 @@
/* Validation message for required radio boxes that have no selection */
"Select one of these options" = "Select one of these options";
+/* Validation message for required checkboxes that have not be selected */
+"Select this checkbox" = "Select this checkbox";
+
/* Selection direction context sub-menu item */
"Selection Direction" = "Selection Direction";
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (209619 => 209620)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-12-09 19:41:53 UTC (rev 209619)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-12-09 19:42:43 UTC (rev 209620)
@@ -1073,7 +1073,7 @@
String validationMessageValueMissingForCheckboxText()
{
- return WEB_UI_STRING("Check this box", "Validation message for required checkboxes that have not be checked");
+ return WEB_UI_STRING("Select this checkbox", "Validation message for required checkboxes that have not be selected");
}
String validationMessageValueMissingForFileText()
