Changeset 208930 in webkit
- Timestamp:
- Nov 19, 2016 1:22:13 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r208929 r208930 1 2016-11-19 Chris Dumez <cdumez@apple.com> 2 3 Update HTML form validation messages 4 https://bugs.webkit.org/show_bug.cgi?id=164957 5 <rdar://problem/29338669> 6 7 Reviewed by Darin Adler. 8 9 Rebaseline existing tests. 10 11 * fast/forms/number/number-validation-message-expected.txt: 12 * fast/forms/number/number-validation-message.html: 13 * fast/forms/validation-custom-message-expected.txt: 14 * fast/forms/validation-custom-message.html: 15 * fast/forms/validation-messages-expected.txt: 16 * fast/forms/validation-messages.html: 17 * fast/forms/validationMessage-expected.txt: 18 1 19 2016-11-19 Joanmarie Diggs <jdiggs@igalia.com> 2 20 -
trunk/LayoutTests/fast/forms/date/input-date-validation-message-expected.txt
r207509 r208930 7 7 PASS testIt("", "", "") is "" 8 8 Value missing 9 FAIL testIt("", "", "") should be value missing. Was Please fill out this field..9 FAIL testIt("", "", "") should be value missing. Was Fill out this field. 10 10 Type mismatch 11 11 PASS testIt("foo", "", "") is "" 12 12 Range overflow 13 FAIL testIt("1982-11-02", "", "1970-12-31") should be range overflow. Was Value must be less than or equal to 1970-12-31. .13 FAIL testIt("1982-11-02", "", "1970-12-31") should be range overflow. Was Value must be less than or equal to 1970-12-31. 14 14 Range underflow 15 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. .15 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. 16 16 Step mismatch 17 FAIL testIt("1982-11-02", "", "", "123") should be step mismatch. Was Please enter a valid value..17 FAIL testIt("1982-11-02", "", "", "123") should be step mismatch. Was Enter a valid value. 18 18 PASS successfullyParsed is true 19 19 -
trunk/LayoutTests/fast/forms/number/number-validation-message-expected.txt
r207509 r208930 7 7 PASS testIt("", "", "") is "" 8 8 Value missing 9 PASS testIt("", "", "") is " Please fill out this field."9 PASS testIt("", "", "") is "Fill out this field" 10 10 Type mismatch 11 11 PASS testIt("foo", "", "") is "" 12 12 Range overflow 13 PASS testIt("200", "", "100") is "Value must be less than or equal to 100 ."13 PASS testIt("200", "", "100") is "Value must be less than or equal to 100" 14 14 Range underflow 15 PASS testIt("10", "50", "100") is "Value must be greater than or equal to 50 ."15 PASS testIt("10", "50", "100") is "Value must be greater than or equal to 50" 16 16 Step mismatch 17 PASS testIt("55", "0", "100", "10") is " Please enter a valid value."17 PASS testIt("55", "0", "100", "10") is "Enter a valid value" 18 18 PASS successfullyParsed is true 19 19 -
trunk/LayoutTests/fast/forms/number/number-validation-message.html
r207509 r208930 26 26 debug('Value missing') 27 27 input.setAttribute("required", ""); 28 shouldBeEqualToString('testIt("", "", "")', ' Please fill out this field.');28 shouldBeEqualToString('testIt("", "", "")', 'Fill out this field'); 29 29 input.removeAttribute("required"); 30 30 … … 33 33 34 34 debug('Range overflow') 35 shouldBeEqualToString('testIt("200", "", "100")', 'Value must be less than or equal to 100 .');35 shouldBeEqualToString('testIt("200", "", "100")', 'Value must be less than or equal to 100'); 36 36 37 37 debug('Range underflow') 38 shouldBeEqualToString('testIt("10", "50", "100")', 'Value must be greater than or equal to 50 .');38 shouldBeEqualToString('testIt("10", "50", "100")', 'Value must be greater than or equal to 50'); 39 39 40 40 debug('Step mismatch') 41 shouldBeEqualToString('testIt("55", "0", "100", "10")', ' Please enter a valid value.');41 shouldBeEqualToString('testIt("55", "0", "100", "10")', 'Enter a valid value'); 42 42 43 43 </script> -
trunk/LayoutTests/fast/forms/validation-custom-message-expected.txt
r208397 r208930 5 5 6 6 PASS validationBubbleContents.message is "This is a custom validity message." 7 PASS validationBubbleContents.message is " Please fill out this field."7 PASS validationBubbleContents.message is "Fill out this field" 8 8 PASS successfullyParsed is true 9 9 -
trunk/LayoutTests/fast/forms/validation-custom-message.html
r208397 r208930 34 34 testRunner.runUIScript(getValidationBubbleContents(), function(result) { 35 35 validationBubbleContents = JSON.parse(result).validationBubble; 36 shouldBeEqualToString("validationBubbleContents.message", " Please fill out this field.");36 shouldBeEqualToString("validationBubbleContents.message", "Fill out this field"); 37 37 finishJSTest(); 38 38 }); -
trunk/LayoutTests/fast/forms/validation-messages-expected.txt
r208361 r208930 4 4 5 5 6 PASS validationBubbleContents.message is " Please fill out this field."7 PASS validationBubbleContents.message is " Please check this box if you want to proceed."8 PASS validationBubbleContents.message is " Please select one of these options."9 PASS validationBubbleContents.message is " Please select a file."10 PASS validationBubbleContents.message is " Please enter an email address."11 PASS validationBubbleContents.message is " Please enter a URL."12 PASS validationBubbleContents.message is " Please match the requested format."13 PASS validationBubbleContents.message is " Please use at least 100 characters."14 PASS validationBubbleContents.message is "Value must be greater than or equal to 5 ."15 PASS validationBubbleContents.message is "Value must be less than or equal to 5 ."16 PASS validationBubbleContents.message is " Please enter a valid value."6 PASS validationBubbleContents.message is "Fill out this field" 7 PASS validationBubbleContents.message is "Check this box" 8 PASS validationBubbleContents.message is "Select one of these options" 9 PASS validationBubbleContents.message is "Select a file" 10 PASS validationBubbleContents.message is "Enter an email address" 11 PASS validationBubbleContents.message is "Enter a URL" 12 PASS validationBubbleContents.message is "Match the requested format" 13 PASS validationBubbleContents.message is "Use at least 100 characters" 14 PASS validationBubbleContents.message is "Value must be greater than or equal to 5" 15 PASS validationBubbleContents.message is "Value must be less than or equal to 5" 16 PASS validationBubbleContents.message is "Enter a valid value" 17 17 PASS successfullyParsed is true 18 18 -
trunk/LayoutTests/fast/forms/validation-messages.html
r208361 r208930 51 51 52 52 var tests = [ 53 ['required_text_input_submit', ' Please fill out this field.'],54 ['required_checkbox_submit', ' Please check this box if you want to proceed.'],55 ['required_radio_submit', ' Please select one of these options.'],56 ['required_file_submit', ' Please select a file.'],57 ['required_email_submit', ' Please enter an email address.'],58 ['required_url_submit', ' Please enter a URL.'],59 ['input_with_pattern_submit', ' Please match the requested format.'],60 ['input_with_minlength_submit', ' Please use at least 100 characters.'],61 ['range_with_min_submit', 'Value must be greater than or equal to 5 .'],62 ['range_with_max_submit', 'Value must be less than or equal to 5 .'],63 ['range_with_step_submit', ' Please enter a valid value.'],53 ['required_text_input_submit', 'Fill out this field'], 54 ['required_checkbox_submit', 'Check this box'], 55 ['required_radio_submit', 'Select one of these options'], 56 ['required_file_submit', 'Select a file'], 57 ['required_email_submit', 'Enter an email address'], 58 ['required_url_submit', 'Enter a URL'], 59 ['input_with_pattern_submit', 'Match the requested format'], 60 ['input_with_minlength_submit', 'Use at least 100 characters'], 61 ['range_with_min_submit', 'Value must be greater than or equal to 5'], 62 ['range_with_max_submit', 'Value must be less than or equal to 5'], 63 ['range_with_step_submit', 'Enter a valid value'], 64 64 ]; 65 65 var currentTestIndex = -1; -
trunk/LayoutTests/fast/forms/validationMessage-expected.txt
r207509 r208930 4 4 5 5 6 input patternMismatch: Please match the requested format.7 input valueMissing: Please fill out this field.8 textarea valueMissing: Please fill out this field.9 select valueMissing: Please select an item in the list.10 input typeMismatch: Please enter an email address.11 input badInput: Please enter a number.6 input patternMismatch: Match the requested format 7 input valueMissing: Fill out this field 8 textarea valueMissing: Fill out this field 9 select valueMissing: Select an item in the list 10 input typeMismatch: Enter an email address 11 input badInput: Enter a number 12 12 badInput and valueMissing: 13 13 PASS numberInput.validationMessage is nonRequiredBadInputMessage -
trunk/LayoutTests/platform/ios-simulator-wk2/fast/forms/validation-messages-expected.txt
r208361 r208930 4 4 5 5 6 PASS validationBubbleContents.message is " Please fill out this field."7 PASS validationBubbleContents.message is " Please check this box if you want to proceed."8 PASS validationBubbleContents.message is " Please select one of these options."9 PASS validationBubbleContents.message is " Please select a file."10 PASS validationBubbleContents.message is " Please enter an email address."11 PASS validationBubbleContents.message is " Please enter a URL."12 PASS validationBubbleContents.message is " Please match the requested format."13 FAIL validationBubbleContents.message should be Please use at least 100 characters.. Was Please fill out this field..14 PASS validationBubbleContents.message is "Value must be greater than or equal to 5 ."15 PASS validationBubbleContents.message is "Value must be less than or equal to 5 ."16 PASS validationBubbleContents.message is " Please enter a valid value."6 PASS validationBubbleContents.message is "Fill out this field" 7 PASS validationBubbleContents.message is "Check this box" 8 PASS validationBubbleContents.message is "Select one of these options" 9 PASS validationBubbleContents.message is "Select a file" 10 PASS validationBubbleContents.message is "Enter an email address" 11 PASS validationBubbleContents.message is "Enter a URL" 12 PASS validationBubbleContents.message is "Match the requested format" 13 FAIL validationBubbleContents.message should be Use at least 100 characters. Was Fill out this field. 14 PASS validationBubbleContents.message is "Value must be greater than or equal to 5" 15 PASS validationBubbleContents.message is "Value must be less than or equal to 5" 16 PASS validationBubbleContents.message is "Enter a valid value" 17 17 PASS successfullyParsed is true 18 18 -
trunk/LayoutTests/platform/mac-elcapitan/fast/forms/validation-message-appearance-expected.txt
r207509 r208930 26 26 RenderBlock {DIV} at (10,10) size 200x64 27 27 RenderBlock {DIV} at (0,0) size 200x16 28 RenderText {#text} at (0,0) size 1 53x1629 text run at (0,0) width 1 53: "Please fill out this field."28 RenderText {#text} at (0,0) size 105x16 29 text run at (0,0) width 105: "Fill out this field" 30 30 RenderBlock {DIV} at (0,16) size 200x48 31 31 RenderText {#text} at (0,0) size 147x16 -
trunk/LayoutTests/platform/mac/fast/forms/validation-message-appearance-expected.txt
r207509 r208930 5 5 RenderBody {BODY} at (8,8) size 784x23 6 6 RenderBlock {FORM} at (0,0) size 784x23 7 RenderTextControl {INPUT} at (2,2) size 1 46x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]8 RenderFlexibleBox {DIV} at (3,3) size 1 40x139 RenderBlock {DIV} at (0,0) size 1 40x1310 RenderText {#text} at (14 9,2) size 5x1811 text run at (14 9,2) width 5: " "12 RenderButton {INPUT} at (1 55,3) size 54x18 [bgcolor=#C0C0C0]13 RenderBlock (anonymous) at (8,2) size 3 7x1314 RenderText at (0,0) size 3 7x1315 text run at (0,0) width 3 7: "Submit"7 RenderTextControl {INPUT} at (2,2) size 137x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] 8 RenderFlexibleBox {DIV} at (3,3) size 131x13 9 RenderBlock {DIV} at (0,0) size 131x13 10 RenderText {#text} at (140,2) size 5x18 11 text run at (140,2) width 5: " " 12 RenderButton {INPUT} at (146,3) size 54x18 [bgcolor=#C0C0C0] 13 RenderBlock (anonymous) at (8,2) size 38x13 14 RenderText at (0,0) size 38x13 15 text run at (0,0) width 38: "Submit" 16 16 RenderText {#text} at (0,0) size 0x0 17 layer at (13,13) size 1 40x1318 RenderBlock {DIV} at (0,0) size 1 40x1317 layer at (13,13) size 130x13 18 RenderBlock {DIV} at (0,0) size 131x13 19 19 layer at (10,29) size 220x100 20 20 RenderBlock (positioned) zI: 2147483647 {DIV} at (10,29) size 220x100 … … 26 26 RenderBlock {DIV} at (10,10) size 200x64 27 27 RenderBlock {DIV} at (0,0) size 200x16 28 RenderText {#text} at (0,0) size 1 52x1629 text run at (0,0) width 1 52: "Please fill out this field."28 RenderText {#text} at (0,0) size 105x16 29 text run at (0,0) width 105: "Fill out this field" 30 30 RenderBlock {DIV} at (0,16) size 200x48 31 RenderText {#text} at (0,0) size 14 5x1632 text run at (0,0) width 14 5: "Needs at least 8 letters."33 RenderBR {BR} at (14 4,0) size 1x1634 RenderText {#text} at (0,16) size 19 2x3235 text run at (0,16) width 19 2: "Should not be identical with the"36 text run at (0,32) width 11 0: "current password."31 RenderText {#text} at (0,0) size 147x16 32 text run at (0,0) width 147: "Needs at least 8 letters." 33 RenderBR {BR} at (146,0) size 1x16 34 RenderText {#text} at (0,16) size 195x32 35 text run at (0,16) width 195: "Should not be identical with the" 36 text run at (0,32) width 112: "current password." 37 37 layer at (42,29) size 18x18 backgroundClip at (10,29) size 220x16 clip at (10,29) size 220x16 38 38 RenderBlock (relative positioned) zI: 2147483645 {DIV} at (0,0) size 18x18 [bgcolor=#F8ECEC] [border: (2px solid #440000) none (2px solid #440000)] -
trunk/Source/WebCore/ChangeLog
r208929 r208930 1 2016-11-19 Chris Dumez <cdumez@apple.com> 2 3 Update HTML form validation messages 4 https://bugs.webkit.org/show_bug.cgi?id=164957 5 <rdar://problem/29338669> 6 7 Reviewed by Darin Adler. 8 9 Update HTML form validation messages as per recent feedback: 10 - Drop the "Please". 11 - Drop the period at the end. 12 - Drop the "if you want to proceed" that was used only for the checkbox. 13 14 No new tests, rebaselined existing tests. 15 16 * English.lproj/Localizable.strings: 17 * platform/LocalizedStrings.cpp: 18 (WebCore::validationMessageValueMissingText): 19 (WebCore::validationMessageValueMissingForCheckboxText): 20 (WebCore::validationMessageValueMissingForFileText): 21 (WebCore::validationMessageValueMissingForRadioText): 22 (WebCore::validationMessageValueMissingForSelectText): 23 (WebCore::validationMessageTypeMismatchText): 24 (WebCore::validationMessageTypeMismatchForEmailText): 25 (WebCore::validationMessageTypeMismatchForURLText): 26 (WebCore::validationMessagePatternMismatchText): 27 (WebCore::validationMessageTooShortText): 28 (WebCore::validationMessageTooLongText): 29 (WebCore::validationMessageRangeUnderflowText): 30 (WebCore::validationMessageRangeOverflowText): 31 (WebCore::validationMessageStepMismatchText): 32 (WebCore::validationMessageBadInputForNumberText): 33 1 34 2016-11-19 Joanmarie Diggs <jdiggs@igalia.com> 2 35 -
trunk/Source/WebCore/English.lproj/Localizable.strings
r207860 r208930 87 87 88 88 /* Menu item title for KEYGEN pop-up menu */ 89 "1024 (Medium Grade)" = "1024 (Medium Grade)";90 91 /* Menu item title for KEYGEN pop-up menu */92 89 "2048 (High Grade)" = "2048 (High Grade)"; 93 94 /* Menu item title for KEYGEN pop-up menu */95 "512 (Low Grade)" = "512 (Low Grade)";96 90 97 91 /* window title for a standalone image (uses multiplication symbol, not x) */ … … 158 152 "Check Spelling While Typing" = "Check Spelling While Typing"; 159 153 154 /* Validation message for required checkboxes that have not be checked */ 155 "Check this box" = "Check this box"; 156 160 157 /* title for a single file chooser button used in HTML forms */ 161 158 "Choose File" = "Choose File"; … … 251 248 "Enter Picture in Picture" = "Enter Picture in Picture"; 252 249 250 /* Validation message for input form controls of type 'url' that have an invalid value */ 251 "Enter a URL" = "Enter a URL"; 252 253 /* Validation message for number fields where the user entered a non-number string */ 254 "Enter a number" = "Enter a number"; 255 256 /* Validation message for input form controls with value not respecting the step attribute */ 257 "Enter a valid value" = "Enter a valid value"; 258 259 /* Validation message for input form controls of type 'email' that have an invalid value */ 260 "Enter an email address" = "Enter an email address"; 261 253 262 /* Video Exit Fullscreen context menu item */ 254 263 "Exit Full Screen" = "Exit Full Screen"; … … 260 269 "Exit Picture in Picture" = "Exit Picture in Picture"; 261 270 271 /* Validation message for required form control elements that have no value */ 272 "Fill out this field" = "Fill out this field"; 273 262 274 /* Default application name for Open With context menu */ 263 275 "Finder" = "Finder"; … … 306 318 307 319 /* Validation message for input form controls with a value not matching type */ 308 "Invalid value ." = "Invalid value.";320 "Invalid value" = "Invalid value"; 309 321 310 322 /* Italic context menu item */ … … 368 380 "Make Upper Case" = "Make Upper Case"; 369 381 382 /* Validation message for input form controls requiring a constrained value according to pattern */ 383 "Match the requested format" = "Match the requested format"; 384 370 385 /* Label text to be used when a plugin is missing */ 371 386 "Missing Plug-in" = "Missing Plug-in"; … … 464 479 "Play movie in fullscreen mode" = "Play movie in fullscreen mode"; 465 480 466 /* Validation message for required checkboxes that have not be checked */467 "Please check this box if you want to proceed." = "Please check this box if you want to proceed.";468 469 /* Validation message for input form controls of type 'url' that have an invalid value */470 "Please enter a URL." = "Please enter a URL.";471 472 /* Validation message for number fields where the user entered a non-number string */473 "Please enter a number." = "Please enter a number.";474 475 /* Validation message for input form controls with value not respecting the step attribute */476 "Please enter a valid value." = "Please enter a valid value.";477 478 /* Validation message for input form controls of type 'email' that have an invalid value */479 "Please enter an email address." = "Please enter an email address.";480 481 /* Validation message for required form control elements that have no value */482 "Please fill out this field." = "Please fill out this field.";483 484 /* Validation message for input form controls requiring a constrained value according to pattern */485 "Please match the requested format." = "Please match the requested format.";486 487 /* Validation message for required file inputs that have no value */488 "Please select a file." = "Please select a file.";489 490 /* Validation message for required menu list controls that have no selection */491 "Please select an item in the list." = "Please select an item in the list.";492 493 /* Validation message for required radio boxes that have no selection */494 "Please select one of these options." = "Please select one of these options.";495 496 /* Validation message for form control elements with a value shorter than minimum allowed length */497 "Please use at least %d characters." = "Please use at least %d characters.";498 499 /* Validation message for form control elements with a value shorter than maximum allowed length */500 "Please use no more than %d characters." = "Please use no more than %d characters.";501 502 481 /* Label text to be used if plugin host process has crashed */ 503 482 "Plug-in Failure" = "Plug-in Failure"; … … 542 521 "Search with Google" = "Search with Google"; 543 522 523 /* Validation message for required file inputs that have no value */ 524 "Select a file" = "Select a file"; 525 526 /* Validation message for required menu list controls that have no selection */ 527 "Select an item in the list" = "Select an item in the list"; 528 529 /* Validation message for required radio boxes that have no selection */ 530 "Select one of these options" = "Select one of these options"; 531 544 532 /* Selection direction context sub-menu item */ 545 533 "Selection Direction" = "Selection Direction"; … … 752 740 "Use Standard Ligatures (Undo action name)" = "Use Standard Ligatures"; 753 741 742 /* Validation message for form control elements with a value shorter than minimum allowed length */ 743 "Use at least %d characters" = "Use at least %d characters"; 744 745 /* Validation message for form control elements with a value shorter than maximum allowed length */ 746 "Use no more than %d characters" = "Use no more than %d characters"; 747 754 748 /* Description of WebCrypto master keys in Keychain */ 755 749 "Used to encrypt WebCrypto keys in persistent storage, such as IndexedDB" = "Used to encrypt WebCrypto keys in persistent storage, such as IndexedDB"; 756 750 757 751 /* Validation message for input form controls with value lower than allowed minimum */ 758 "Value must be greater than or equal to %@ ." = "Value must be greater than or equal to %@.";752 "Value must be greater than or equal to %@" = "Value must be greater than or equal to %@"; 759 753 760 754 /* Validation message for input form controls with value higher than allowed maximum */ 761 "Value must be less than or equal to %@ ." = "Value must be less than or equal to %@.";755 "Value must be less than or equal to %@" = "Value must be less than or equal to %@"; 762 756 763 757 /* Web Inspector window title when inspecting Web Inspector */ … … 845 839 "created" = "created"; 846 840 841 /* The less good value description for a meter element. */ 842 "critical value" = "critical value"; 843 847 844 /* accessibility help text for movie status display */ 848 845 "current movie status" = "current movie status"; … … 935 932 "length required" = "length required"; 936 933 937 /* The less good value description for a meter element. */938 "critical value" = "critical value";939 940 934 /* accessibility role description for link */ 941 935 "link" = "link"; -
trunk/Source/WebCore/platform/LocalizedStrings.cpp
r208858 r208930 1062 1062 String validationMessageValueMissingText() 1063 1063 { 1064 return WEB_UI_STRING(" Please fill out this field.", "Validation message for required form control elements that have no value");1064 return WEB_UI_STRING("Fill out this field", "Validation message for required form control elements that have no value"); 1065 1065 } 1066 1066 1067 1067 String validationMessageValueMissingForCheckboxText() 1068 1068 { 1069 return WEB_UI_STRING(" Please check this box if you want to proceed.", "Validation message for required checkboxes that have not be checked");1069 return WEB_UI_STRING("Check this box", "Validation message for required checkboxes that have not be checked"); 1070 1070 } 1071 1071 1072 1072 String validationMessageValueMissingForFileText() 1073 1073 { 1074 return WEB_UI_STRING(" Please select a file.", "Validation message for required file inputs that have no value");1074 return WEB_UI_STRING("Select a file", "Validation message for required file inputs that have no value"); 1075 1075 } 1076 1076 … … 1082 1082 String validationMessageValueMissingForRadioText() 1083 1083 { 1084 return WEB_UI_STRING(" Please select one of these options.", "Validation message for required radio boxes that have no selection");1084 return WEB_UI_STRING("Select one of these options", "Validation message for required radio boxes that have no selection"); 1085 1085 } 1086 1086 1087 1087 String validationMessageValueMissingForSelectText() 1088 1088 { 1089 return WEB_UI_STRING(" Please select an item in the list.", "Validation message for required menu list controls that have no selection");1089 return WEB_UI_STRING("Select an item in the list", "Validation message for required menu list controls that have no selection"); 1090 1090 } 1091 1091 1092 1092 String validationMessageTypeMismatchText() 1093 1093 { 1094 return WEB_UI_STRING("Invalid value .", "Validation message for input form controls with a value not matching type");1094 return WEB_UI_STRING("Invalid value", "Validation message for input form controls with a value not matching type"); 1095 1095 } 1096 1096 1097 1097 String validationMessageTypeMismatchForEmailText() 1098 1098 { 1099 return WEB_UI_STRING(" Please enter an email address.", "Validation message for input form controls of type 'email' that have an invalid value");1099 return WEB_UI_STRING("Enter an email address", "Validation message for input form controls of type 'email' that have an invalid value"); 1100 1100 } 1101 1101 … … 1107 1107 String validationMessageTypeMismatchForURLText() 1108 1108 { 1109 return WEB_UI_STRING(" Please enter a URL.", "Validation message for input form controls of type 'url' that have an invalid value");1109 return WEB_UI_STRING("Enter a URL", "Validation message for input form controls of type 'url' that have an invalid value"); 1110 1110 } 1111 1111 1112 1112 String validationMessagePatternMismatchText() 1113 1113 { 1114 return WEB_UI_STRING(" Please match the requested format.", "Validation message for input form controls requiring a constrained value according to pattern");1114 return WEB_UI_STRING("Match the requested format", "Validation message for input form controls requiring a constrained value according to pattern"); 1115 1115 } 1116 1116 1117 1117 String validationMessageTooShortText(int, int minLength) 1118 1118 { 1119 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);1119 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); 1120 1120 } 1121 1121 1122 1122 String validationMessageTooLongText(int, int maxLength) 1123 1123 { 1124 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);1124 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); 1125 1125 } 1126 1126 … … 1128 1128 { 1129 1129 #if PLATFORM(COCOA) 1130 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());1130 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()); 1131 1131 #else 1132 1132 UNUSED_PARAM(minimum); … … 1138 1138 { 1139 1139 #if PLATFORM(COCOA) 1140 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());1140 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()); 1141 1141 #else 1142 1142 UNUSED_PARAM(maximum); … … 1147 1147 String validationMessageStepMismatchText(const String&, const String&) 1148 1148 { 1149 return WEB_UI_STRING(" Please enter a valid value.", "Validation message for input form controls with value not respecting the step attribute");1149 return WEB_UI_STRING("Enter a valid value", "Validation message for input form controls with value not respecting the step attribute"); 1150 1150 } 1151 1151 1152 1152 String validationMessageBadInputForNumberText() 1153 1153 { 1154 return WEB_UI_STRING(" Please enter a number.", "Validation message for number fields where the user entered a non-number string");1154 return WEB_UI_STRING("Enter a number", "Validation message for number fields where the user entered a non-number string"); 1155 1155 } 1156 1156
Note: See TracChangeset
for help on using the changeset viewer.