Diff
Modified: trunk/LayoutTests/ChangeLog (208929 => 208930)
--- trunk/LayoutTests/ChangeLog 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/ChangeLog 2016-11-19 21:22:13 UTC (rev 208930)
@@ -1,3 +1,21 @@
+2016-11-19 Chris Dumez <[email protected]>
+
+ Update HTML form validation messages
+ https://bugs.webkit.org/show_bug.cgi?id=164957
+ <rdar://problem/29338669>
+
+ Reviewed by Darin Adler.
+
+ Rebaseline existing tests.
+
+ * fast/forms/number/number-validation-message-expected.txt:
+ * fast/forms/number/number-validation-message.html:
+ * fast/forms/validation-custom-message-expected.txt:
+ * fast/forms/validation-custom-message.html:
+ * fast/forms/validation-messages-expected.txt:
+ * fast/forms/validation-messages.html:
+ * fast/forms/validationMessage-expected.txt:
+
2016-11-19 Joanmarie Diggs <[email protected]>
AX: [ATK] Implement selection interface and states for elements supporting aria-selected and for menu roles
Modified: trunk/LayoutTests/fast/forms/date/input-date-validation-message-expected.txt (208929 => 208930)
--- trunk/LayoutTests/fast/forms/date/input-date-validation-message-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/date/input-date-validation-message-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -6,15 +6,15 @@
No message
PASS testIt("", "", "") is ""
Value missing
-FAIL testIt("", "", "") should be value missing. Was Please fill out this field..
+FAIL testIt("", "", "") should be value missing. Was Fill out this field.
Type mismatch
PASS testIt("foo", "", "") is ""
Range overflow
-FAIL testIt("1982-11-02", "", "1970-12-31") should be range overflow. Was Value must be less than or equal to 1970-12-31..
+FAIL testIt("1982-11-02", "", "1970-12-31") should be range overflow. Was Value must be less than or equal to 1970-12-31.
Range underflow
-FAIL testIt("1982-11-02", "1990-05-25", "1990-12-24") should be range underflow. Was Value must be greater than or equal to 1990-05-25..
+FAIL testIt("1982-11-02", "1990-05-25", "1990-12-24") should be range underflow. Was Value must be greater than or equal to 1990-05-25.
Step mismatch
-FAIL testIt("1982-11-02", "", "", "123") should be step mismatch. Was Please enter a valid value..
+FAIL testIt("1982-11-02", "", "", "123") should be step mismatch. Was Enter a valid value.
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/forms/number/number-validation-message-expected.txt (208929 => 208930)
--- trunk/LayoutTests/fast/forms/number/number-validation-message-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/number/number-validation-message-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -6,15 +6,15 @@
No message
PASS testIt("", "", "") is ""
Value missing
-PASS testIt("", "", "") is "Please fill out this field."
+PASS testIt("", "", "") is "Fill out this field"
Type mismatch
PASS testIt("foo", "", "") is ""
Range overflow
-PASS testIt("200", "", "100") is "Value must be less than or equal to 100."
+PASS testIt("200", "", "100") is "Value must be less than or equal to 100"
Range underflow
-PASS testIt("10", "50", "100") is "Value must be greater than or equal to 50."
+PASS testIt("10", "50", "100") is "Value must be greater than or equal to 50"
Step mismatch
-PASS testIt("55", "0", "100", "10") is "Please enter a valid value."
+PASS testIt("55", "0", "100", "10") is "Enter a valid value"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/forms/number/number-validation-message.html (208929 => 208930)
--- trunk/LayoutTests/fast/forms/number/number-validation-message.html 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/number/number-validation-message.html 2016-11-19 21:22:13 UTC (rev 208930)
@@ -25,7 +25,7 @@
debug('Value missing')
input.setAttribute("required", "");
-shouldBeEqualToString('testIt("", "", "")', 'Please fill out this field.');
+shouldBeEqualToString('testIt("", "", "")', 'Fill out this field');
input.removeAttribute("required");
debug('Type mismatch');
@@ -32,13 +32,13 @@
shouldBeEqualToString('testIt("foo", "", "")', '');
debug('Range overflow')
-shouldBeEqualToString('testIt("200", "", "100")', 'Value must be less than or equal to 100.');
+shouldBeEqualToString('testIt("200", "", "100")', 'Value must be less than or equal to 100');
debug('Range underflow')
-shouldBeEqualToString('testIt("10", "50", "100")', 'Value must be greater than or equal to 50.');
+shouldBeEqualToString('testIt("10", "50", "100")', 'Value must be greater than or equal to 50');
debug('Step mismatch')
-shouldBeEqualToString('testIt("55", "0", "100", "10")', 'Please enter a valid value.');
+shouldBeEqualToString('testIt("55", "0", "100", "10")', 'Enter a valid value');
</script>
<script src=""
Modified: trunk/LayoutTests/fast/forms/validation-custom-message-expected.txt (208929 => 208930)
--- trunk/LayoutTests/fast/forms/validation-custom-message-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/validation-custom-message-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -4,7 +4,7 @@
PASS validationBubbleContents.message is "This is a custom validity message."
-PASS validationBubbleContents.message is "Please fill out this field."
+PASS validationBubbleContents.message is "Fill out this field"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/forms/validation-custom-message.html (208929 => 208930)
--- trunk/LayoutTests/fast/forms/validation-custom-message.html 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/validation-custom-message.html 2016-11-19 21:22:13 UTC (rev 208930)
@@ -33,7 +33,7 @@
testRunner.runUIScript(getValidationBubbleContents(), function(result) {
validationBubbleContents = JSON.parse(result).validationBubble;
- shouldBeEqualToString("validationBubbleContents.message", "Please fill out this field.");
+ shouldBeEqualToString("validationBubbleContents.message", "Fill out this field");
finishJSTest();
});
});
Modified: trunk/LayoutTests/fast/forms/validation-messages-expected.txt (208929 => 208930)
--- trunk/LayoutTests/fast/forms/validation-messages-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/validation-messages-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -3,17 +3,17 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS validationBubbleContents.message is "Please fill out this field."
-PASS validationBubbleContents.message is "Please check this box if you want to proceed."
-PASS validationBubbleContents.message is "Please select one of these options."
-PASS validationBubbleContents.message is "Please select a file."
-PASS validationBubbleContents.message is "Please enter an email address."
-PASS validationBubbleContents.message is "Please enter a URL."
-PASS validationBubbleContents.message is "Please match the requested format."
-PASS validationBubbleContents.message is "Please use at least 100 characters."
-PASS validationBubbleContents.message is "Value must be greater than or equal to 5."
-PASS validationBubbleContents.message is "Value must be less than or equal to 5."
-PASS validationBubbleContents.message is "Please enter a valid value."
+PASS validationBubbleContents.message is "Fill out this field"
+PASS validationBubbleContents.message is "Check this box"
+PASS validationBubbleContents.message is "Select one of these options"
+PASS validationBubbleContents.message is "Select a file"
+PASS validationBubbleContents.message is "Enter an email address"
+PASS validationBubbleContents.message is "Enter a URL"
+PASS validationBubbleContents.message is "Match the requested format"
+PASS validationBubbleContents.message is "Use at least 100 characters"
+PASS validationBubbleContents.message is "Value must be greater than or equal to 5"
+PASS validationBubbleContents.message is "Value must be less than or equal to 5"
+PASS validationBubbleContents.message is "Enter a valid value"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/forms/validation-messages.html (208929 => 208930)
--- trunk/LayoutTests/fast/forms/validation-messages.html 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/validation-messages.html 2016-11-19 21:22:13 UTC (rev 208930)
@@ -50,17 +50,17 @@
}
var tests = [
- ['required_text_input_submit', 'Please fill out this field.'],
- ['required_checkbox_submit', 'Please check this box if you want to proceed.'],
- ['required_radio_submit', 'Please select one of these options.'],
- ['required_file_submit', 'Please select a file.'],
- ['required_email_submit', 'Please enter an email address.'],
- ['required_url_submit', 'Please enter a URL.'],
- ['input_with_pattern_submit', 'Please match the requested format.'],
- ['input_with_minlength_submit', 'Please use at least 100 characters.'],
- ['range_with_min_submit', 'Value must be greater than or equal to 5.'],
- ['range_with_max_submit', 'Value must be less than or equal to 5.'],
- ['range_with_step_submit', 'Please enter a valid value.'],
+ ['required_text_input_submit', 'Fill out this field'],
+ ['required_checkbox_submit', 'Check this box'],
+ ['required_radio_submit', 'Select one of these options'],
+ ['required_file_submit', 'Select a file'],
+ ['required_email_submit', 'Enter an email address'],
+ ['required_url_submit', 'Enter a URL'],
+ ['input_with_pattern_submit', 'Match the requested format'],
+ ['input_with_minlength_submit', 'Use at least 100 characters'],
+ ['range_with_min_submit', 'Value must be greater than or equal to 5'],
+ ['range_with_max_submit', 'Value must be less than or equal to 5'],
+ ['range_with_step_submit', 'Enter a valid value'],
];
var currentTestIndex = -1;
Modified: trunk/LayoutTests/fast/forms/validationMessage-expected.txt (208929 => 208930)
--- trunk/LayoutTests/fast/forms/validationMessage-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/fast/forms/validationMessage-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -3,12 +3,12 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-input patternMismatch: Please match the requested format.
-input valueMissing: Please fill out this field.
-textarea valueMissing: Please fill out this field.
-select valueMissing: Please select an item in the list.
-input typeMismatch: Please enter an email address.
-input badInput: Please enter a number.
+input patternMismatch: Match the requested format
+input valueMissing: Fill out this field
+textarea valueMissing: Fill out this field
+select valueMissing: Select an item in the list
+input typeMismatch: Enter an email address
+input badInput: Enter a number
badInput and valueMissing:
PASS numberInput.validationMessage is nonRequiredBadInputMessage
PASS but.validationMessage is ''
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt (208929 => 208930)
--- trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -3,17 +3,17 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS validationBubbleContents.message is "Please fill out this field."
-PASS validationBubbleContents.message is "Please check this box if you want to proceed."
-PASS validationBubbleContents.message is "Please select one of these options."
-PASS validationBubbleContents.message is "Please select a file."
-PASS validationBubbleContents.message is "Please enter an email address."
-PASS validationBubbleContents.message is "Please enter a URL."
-PASS validationBubbleContents.message is "Please match the requested format."
-FAIL validationBubbleContents.message should be Please use at least 100 characters.. Was Please fill out this field..
-PASS validationBubbleContents.message is "Value must be greater than or equal to 5."
-PASS validationBubbleContents.message is "Value must be less than or equal to 5."
-PASS validationBubbleContents.message is "Please enter a valid value."
+PASS validationBubbleContents.message is "Fill out this field"
+PASS validationBubbleContents.message is "Check this box"
+PASS validationBubbleContents.message is "Select one of these options"
+PASS validationBubbleContents.message is "Select a file"
+PASS validationBubbleContents.message is "Enter an email address"
+PASS validationBubbleContents.message is "Enter a URL"
+PASS validationBubbleContents.message is "Match the requested format"
+FAIL validationBubbleContents.message should be Use at least 100 characters. Was Fill out this field.
+PASS validationBubbleContents.message is "Value must be greater than or equal to 5"
+PASS validationBubbleContents.message is "Value must be less than or equal to 5"
+PASS validationBubbleContents.message is "Enter a valid value"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/mac/fast/forms/validation-message-appearance-expected.txt (208929 => 208930)
--- trunk/LayoutTests/platform/mac/fast/forms/validation-message-appearance-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/platform/mac/fast/forms/validation-message-appearance-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -4,18 +4,18 @@
RenderBlock {HTML} at (0,0) size 800x39
RenderBody {BODY} at (8,8) size 784x23
RenderBlock {FORM} at (0,0) size 784x23
- RenderTextControl {INPUT} at (2,2) size 146x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderFlexibleBox {DIV} at (3,3) size 140x13
- RenderBlock {DIV} at (0,0) size 140x13
- RenderText {#text} at (149,2) size 5x18
- text run at (149,2) width 5: " "
- RenderButton {INPUT} at (155,3) size 54x18 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 37x13
- RenderText at (0,0) size 37x13
- text run at (0,0) width 37: "Submit"
+ RenderTextControl {INPUT} at (2,2) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderFlexibleBox {DIV} at (3,3) size 131x13
+ RenderBlock {DIV} at (0,0) size 131x13
+ RenderText {#text} at (140,2) size 5x18
+ text run at (140,2) width 5: " "
+ RenderButton {INPUT} at (146,3) size 54x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 38x13
+ RenderText at (0,0) size 38x13
+ text run at (0,0) width 38: "Submit"
RenderText {#text} at (0,0) size 0x0
-layer at (13,13) size 140x13
- RenderBlock {DIV} at (0,0) size 140x13
+layer at (13,13) size 130x13
+ RenderBlock {DIV} at (0,0) size 131x13
layer at (10,29) size 220x100
RenderBlock (positioned) zI: 2147483647 {DIV} at (10,29) size 220x100
layer at (10,29) size 220x16 scrollHeight 25
@@ -25,15 +25,15 @@
RenderBlock {DIV} at (10,10) size 0x64
RenderBlock {DIV} at (10,10) size 200x64
RenderBlock {DIV} at (0,0) size 200x16
- RenderText {#text} at (0,0) size 152x16
- text run at (0,0) width 152: "Please fill out this field."
+ RenderText {#text} at (0,0) size 105x16
+ text run at (0,0) width 105: "Fill out this field"
RenderBlock {DIV} at (0,16) size 200x48
- RenderText {#text} at (0,0) size 145x16
- text run at (0,0) width 145: "Needs at least 8 letters."
- RenderBR {BR} at (144,0) size 1x16
- RenderText {#text} at (0,16) size 192x32
- text run at (0,16) width 192: "Should not be identical with the"
- text run at (0,32) width 110: "current password."
+ RenderText {#text} at (0,0) size 147x16
+ text run at (0,0) width 147: "Needs at least 8 letters."
+ RenderBR {BR} at (146,0) size 1x16
+ RenderText {#text} at (0,16) size 195x32
+ text run at (0,16) width 195: "Should not be identical with the"
+ text run at (0,32) width 112: "current password."
layer at (42,29) size 18x18 backgroundClip at (10,29) size 220x16 clip at (10,29) size 220x16
RenderBlock (relative positioned) zI: 2147483645 {DIV} at (0,0) size 18x18 [bgcolor=#F8ECEC] [border: (2px solid #440000) none (2px solid #440000)]
caret: position 0 of child 0 {DIV} of child 0 {DIV} of child 0 {DIV} of {#document-fragment} of child 1 {INPUT} of child 0 {FORM} of body
Modified: trunk/LayoutTests/platform/mac-elcapitan/fast/forms/validation-message-appearance-expected.txt (208929 => 208930)
--- trunk/LayoutTests/platform/mac-elcapitan/fast/forms/validation-message-appearance-expected.txt 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/LayoutTests/platform/mac-elcapitan/fast/forms/validation-message-appearance-expected.txt 2016-11-19 21:22:13 UTC (rev 208930)
@@ -25,8 +25,8 @@
RenderBlock {DIV} at (10,10) size 0x64
RenderBlock {DIV} at (10,10) size 200x64
RenderBlock {DIV} at (0,0) size 200x16
- RenderText {#text} at (0,0) size 153x16
- text run at (0,0) width 153: "Please fill out this field."
+ RenderText {#text} at (0,0) size 105x16
+ text run at (0,0) width 105: "Fill out this field"
RenderBlock {DIV} at (0,16) size 200x48
RenderText {#text} at (0,0) size 147x16
text run at (0,0) width 147: "Needs at least 8 letters."
Modified: trunk/Source/WebCore/ChangeLog (208929 => 208930)
--- trunk/Source/WebCore/ChangeLog 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/Source/WebCore/ChangeLog 2016-11-19 21:22:13 UTC (rev 208930)
@@ -1,3 +1,36 @@
+2016-11-19 Chris Dumez <[email protected]>
+
+ Update HTML form validation messages
+ https://bugs.webkit.org/show_bug.cgi?id=164957
+ <rdar://problem/29338669>
+
+ Reviewed by Darin Adler.
+
+ Update HTML form validation messages as per recent feedback:
+ - Drop the "Please".
+ - Drop the period at the end.
+ - Drop the "if you want to proceed" that was used only for the checkbox.
+
+ No new tests, rebaselined existing tests.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::validationMessageValueMissingText):
+ (WebCore::validationMessageValueMissingForCheckboxText):
+ (WebCore::validationMessageValueMissingForFileText):
+ (WebCore::validationMessageValueMissingForRadioText):
+ (WebCore::validationMessageValueMissingForSelectText):
+ (WebCore::validationMessageTypeMismatchText):
+ (WebCore::validationMessageTypeMismatchForEmailText):
+ (WebCore::validationMessageTypeMismatchForURLText):
+ (WebCore::validationMessagePatternMismatchText):
+ (WebCore::validationMessageTooShortText):
+ (WebCore::validationMessageTooLongText):
+ (WebCore::validationMessageRangeUnderflowText):
+ (WebCore::validationMessageRangeOverflowText):
+ (WebCore::validationMessageStepMismatchText):
+ (WebCore::validationMessageBadInputForNumberText):
+
2016-11-19 Joanmarie Diggs <[email protected]>
AX: [ATK] Implement selection interface and states for elements supporting aria-selected and for menu roles
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (208929 => 208930)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-11-19 21:22:13 UTC (rev 208930)
@@ -86,14 +86,8 @@
"1. 2. 3." = "1. 2. 3.";
/* Menu item title for KEYGEN pop-up menu */
-"1024 (Medium Grade)" = "1024 (Medium Grade)";
-
-/* Menu item title for KEYGEN pop-up menu */
"2048 (High Grade)" = "2048 (High Grade)";
-/* Menu item title for KEYGEN pop-up menu */
-"512 (Low Grade)" = "512 (Low Grade)";
-
/* window title for a standalone image (uses multiplication symbol, not x) */
"<filename> %d×%d pixels" = "<filename> %d×%d pixels";
@@ -157,6 +151,9 @@
/* 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";
@@ -250,6 +247,18 @@
/* menu item */
"Enter Picture in Picture" = "Enter Picture in Picture";
+/* Validation message for input form controls of type 'url' that have an invalid value */
+"Enter a URL" = "Enter a URL";
+
+/* Validation message for number fields where the user entered a non-number string */
+"Enter a number" = "Enter a number";
+
+/* Validation message for input form controls with value not respecting the step attribute */
+"Enter a valid value" = "Enter a valid value";
+
+/* Validation message for input form controls of type 'email' that have an invalid value */
+"Enter an email address" = "Enter an email address";
+
/* Video Exit Fullscreen context menu item */
"Exit Full Screen" = "Exit Full Screen";
@@ -259,6 +268,9 @@
/* menu item */
"Exit Picture in Picture" = "Exit Picture in Picture";
+/* Validation message for required form control elements that have no value */
+"Fill out this field" = "Fill out this field";
+
/* Default application name for Open With context menu */
"Finder" = "Finder";
@@ -305,7 +317,7 @@
"Inspect Element" = "Inspect Element";
/* Validation message for input form controls with a value not matching type */
-"Invalid value." = "Invalid value.";
+"Invalid value" = "Invalid value";
/* Italic context menu item */
"Italic" = "Italic";
@@ -367,6 +379,9 @@
/* Make Upper Case context menu item */
"Make Upper Case" = "Make Upper Case";
+/* Validation message for input form controls requiring a constrained value according to pattern */
+"Match the requested format" = "Match the requested format";
+
/* Label text to be used when a plugin is missing */
"Missing Plug-in" = "Missing Plug-in";
@@ -463,42 +478,6 @@
/* accessibility help text for enter fullscreen button */
"Play movie in fullscreen mode" = "Play movie in fullscreen mode";
-/* Validation message for required checkboxes that have not be checked */
-"Please check this box if you want to proceed." = "Please check this box if you want to proceed.";
-
-/* Validation message for input form controls of type 'url' that have an invalid value */
-"Please enter a URL." = "Please enter a URL.";
-
-/* Validation message for number fields where the user entered a non-number string */
-"Please enter a number." = "Please enter a number.";
-
-/* Validation message for input form controls with value not respecting the step attribute */
-"Please enter a valid value." = "Please enter a valid value.";
-
-/* Validation message for input form controls of type 'email' that have an invalid value */
-"Please enter an email address." = "Please enter an email address.";
-
-/* Validation message for required form control elements that have no value */
-"Please fill out this field." = "Please fill out this field.";
-
-/* Validation message for input form controls requiring a constrained value according to pattern */
-"Please match the requested format." = "Please match the requested format.";
-
-/* Validation message for required file inputs that have no value */
-"Please select a file." = "Please select a file.";
-
-/* Validation message for required menu list controls that have no selection */
-"Please select an item in the list." = "Please select an item in the list.";
-
-/* Validation message for required radio boxes that have no selection */
-"Please select one of these options." = "Please select one of these options.";
-
-/* Validation message for form control elements with a value shorter than minimum allowed length */
-"Please use at least %d characters." = "Please use at least %d characters.";
-
-/* Validation message for form control elements with a value shorter than maximum allowed length */
-"Please use no more than %d characters." = "Please use no more than %d characters.";
-
/* Label text to be used if plugin host process has crashed */
"Plug-in Failure" = "Plug-in Failure";
@@ -541,6 +520,15 @@
/* Search with Google context menu item */
"Search with Google" = "Search with Google";
+/* Validation message for required file inputs that have no value */
+"Select a file" = "Select a file";
+
+/* Validation message for required menu list controls that have no selection */
+"Select an item in the list" = "Select an item in the list";
+
+/* Validation message for required radio boxes that have no selection */
+"Select one of these options" = "Select one of these options";
+
/* Selection direction context sub-menu item */
"Selection Direction" = "Selection Direction";
@@ -751,14 +739,20 @@
/* Undo action name */
"Use Standard Ligatures (Undo action name)" = "Use Standard Ligatures";
+/* Validation message for form control elements with a value shorter than minimum allowed length */
+"Use at least %d characters" = "Use at least %d characters";
+
+/* Validation message for form control elements with a value shorter than maximum allowed length */
+"Use no more than %d characters" = "Use no more than %d characters";
+
/* Description of WebCrypto master keys in Keychain */
"Used to encrypt WebCrypto keys in persistent storage, such as IndexedDB" = "Used to encrypt WebCrypto keys in persistent storage, such as IndexedDB";
/* Validation message for input form controls with value lower than allowed minimum */
-"Value must be greater than or equal to %@." = "Value must be greater than or equal to %@.";
+"Value must be greater than or equal to %@" = "Value must be greater than or equal to %@";
/* Validation message for input form controls with value higher than allowed maximum */
-"Value must be less than or equal to %@." = "Value must be less than or equal to %@.";
+"Value must be less than or equal to %@" = "Value must be less than or equal to %@";
/* Web Inspector window title when inspecting Web Inspector */
"Web Inspector [%d] — %@" = "Web Inspector [%d] — %@";
@@ -844,6 +838,9 @@
/* HTTP result code string */
"created" = "created";
+/* The less good value description for a meter element. */
+"critical value" = "critical value";
+
/* accessibility help text for movie status display */
"current movie status" = "current movie status";
@@ -934,9 +931,6 @@
/* HTTP result code string */
"length required" = "length required";
-/* The less good value description for a meter element. */
-"critical value" = "critical value";
-
/* accessibility role description for link */
"link" = "link";
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (208929 => 208930)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-11-19 21:12:24 UTC (rev 208929)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-11-19 21:22:13 UTC (rev 208930)
@@ -1061,17 +1061,17 @@
String validationMessageValueMissingText()
{
- return WEB_UI_STRING("Please fill out this field.", "Validation message for required form control elements that have no value");
+ return WEB_UI_STRING("Fill out this field", "Validation message for required form control elements that have no value");
}
String validationMessageValueMissingForCheckboxText()
{
- return WEB_UI_STRING("Please check this box if you want to proceed.", "Validation message for required checkboxes that have not be checked");
+ return WEB_UI_STRING("Check this box", "Validation message for required checkboxes that have not be checked");
}
String validationMessageValueMissingForFileText()
{
- return WEB_UI_STRING("Please select a file.", "Validation message for required file inputs that have no value");
+ return WEB_UI_STRING("Select a file", "Validation message for required file inputs that have no value");
}
String validationMessageValueMissingForMultipleFileText()
@@ -1081,22 +1081,22 @@
String validationMessageValueMissingForRadioText()
{
- return WEB_UI_STRING("Please select one of these options.", "Validation message for required radio boxes that have no selection");
+ return WEB_UI_STRING("Select one of these options", "Validation message for required radio boxes that have no selection");
}
String validationMessageValueMissingForSelectText()
{
- return WEB_UI_STRING("Please select an item in the list.", "Validation message for required menu list controls that have no selection");
+ return WEB_UI_STRING("Select an item in the list", "Validation message for required menu list controls that have no selection");
}
String validationMessageTypeMismatchText()
{
- return WEB_UI_STRING("Invalid value.", "Validation message for input form controls with a value not matching type");
+ return WEB_UI_STRING("Invalid value", "Validation message for input form controls with a value not matching type");
}
String validationMessageTypeMismatchForEmailText()
{
- return WEB_UI_STRING("Please enter an email address.", "Validation message for input form controls of type 'email' that have an invalid value");
+ return WEB_UI_STRING("Enter an email address", "Validation message for input form controls of type 'email' that have an invalid value");
}
String validationMessageTypeMismatchForMultipleEmailText()
@@ -1106,28 +1106,28 @@
String validationMessageTypeMismatchForURLText()
{
- return WEB_UI_STRING("Please enter a URL.", "Validation message for input form controls of type 'url' that have an invalid value");
+ return WEB_UI_STRING("Enter a URL", "Validation message for input form controls of type 'url' that have an invalid value");
}
String validationMessagePatternMismatchText()
{
- return WEB_UI_STRING("Please match the requested format.", "Validation message for input form controls requiring a constrained value according to pattern");
+ return WEB_UI_STRING("Match the requested format", "Validation message for input form controls requiring a constrained value according to pattern");
}
String validationMessageTooShortText(int, int minLength)
{
- return formatLocalizedString(WEB_UI_STRING("Please use at least %d characters.", "Validation message for form control elements with a value shorter than minimum allowed length"), minLength);
+ return formatLocalizedString(WEB_UI_STRING("Use at least %d characters", "Validation message for form control elements with a value shorter than minimum allowed length"), minLength);
}
String validationMessageTooLongText(int, int maxLength)
{
- return formatLocalizedString(WEB_UI_STRING("Please use no more than %d characters.", "Validation message for form control elements with a value shorter than maximum allowed length"), maxLength);
+ return formatLocalizedString(WEB_UI_STRING("Use no more than %d characters", "Validation message for form control elements with a value shorter than maximum allowed length"), maxLength);
}
String validationMessageRangeUnderflowText(const String& minimum)
{
#if PLATFORM(COCOA)
- return formatLocalizedString(WEB_UI_STRING("Value must be greater than or equal to %@.", "Validation message for input form controls with value lower than allowed minimum"), minimum.createCFString().get());
+ return formatLocalizedString(WEB_UI_STRING("Value must be greater than or equal to %@", "Validation message for input form controls with value lower than allowed minimum"), minimum.createCFString().get());
#else
UNUSED_PARAM(minimum);
return WEB_UI_STRING("range underflow", "Validation message for input form controls with value lower than allowed minimum");
@@ -1137,7 +1137,7 @@
String validationMessageRangeOverflowText(const String& maximum)
{
#if PLATFORM(COCOA)
- return formatLocalizedString(WEB_UI_STRING("Value must be less than or equal to %@.", "Validation message for input form controls with value higher than allowed maximum"), maximum.createCFString().get());
+ return formatLocalizedString(WEB_UI_STRING("Value must be less than or equal to %@", "Validation message for input form controls with value higher than allowed maximum"), maximum.createCFString().get());
#else
UNUSED_PARAM(maximum);
return WEB_UI_STRING("range overflow", "Validation message for input form controls with value higher than allowed maximum");
@@ -1146,12 +1146,12 @@
String validationMessageStepMismatchText(const String&, const String&)
{
- return WEB_UI_STRING("Please enter a valid value.", "Validation message for input form controls with value not respecting the step attribute");
+ return WEB_UI_STRING("Enter a valid value", "Validation message for input form controls with value not respecting the step attribute");
}
String validationMessageBadInputForNumberText()
{
- return WEB_UI_STRING("Please enter a number.", "Validation message for number fields where the user entered a non-number string");
+ return WEB_UI_STRING("Enter a number", "Validation message for number fields where the user entered a non-number string");
}
String clickToExitFullScreenText()
