diff --git a/src/Symfony/Component/Validator/Constraints/Blank.php b/src/Symfony/Component/Validator/Constraints/Blank.php index 2ceb43ea04..b6db62a796 100644 --- a/src/Symfony/Component/Validator/Constraints/Blank.php +++ b/src/Symfony/Component/Validator/Constraints/Blank.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Blank extends Constraint { - public $message = 'This value should be blank'; + public $message = 'This value should be blank.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Choice.php b/src/Symfony/Component/Validator/Constraints/Choice.php index 209bb9b211..b73bd77ca3 100644 --- a/src/Symfony/Component/Validator/Constraints/Choice.php +++ b/src/Symfony/Component/Validator/Constraints/Choice.php @@ -26,10 +26,10 @@ class Choice extends Constraint public $strict = false; public $min = null; public $max = null; - public $message = 'The value you selected is not a valid choice'; - public $multipleMessage = 'One or more of the given values is invalid'; - public $minMessage = 'You must select at least {{ limit }} choices'; - public $maxMessage = 'You must select at most {{ limit }} choices'; + public $message = 'The value you selected is not a valid choice.'; + public $multipleMessage = 'One or more of the given values is invalid.'; + public $minMessage = 'You must select at least {{ limit }} choices.'; + public $maxMessage = 'You must select at most {{ limit }} choices.'; /** * {@inheritDoc} diff --git a/src/Symfony/Component/Validator/Constraints/Collection.php b/src/Symfony/Component/Validator/Constraints/Collection.php index 5740b98d34..c2c6a06d4e 100644 --- a/src/Symfony/Component/Validator/Constraints/Collection.php +++ b/src/Symfony/Component/Validator/Constraints/Collection.php @@ -23,8 +23,8 @@ class Collection extends Constraint public $fields; public $allowExtraFields = false; public $allowMissingFields = false; - public $extraFieldsMessage = 'This field was not expected'; - public $missingFieldsMessage = 'This field is missing'; + public $extraFieldsMessage = 'This field was not expected.'; + public $missingFieldsMessage = 'This field is missing.'; /** * {@inheritDoc} diff --git a/src/Symfony/Component/Validator/Constraints/Country.php b/src/Symfony/Component/Validator/Constraints/Country.php index a3c2a2ae7e..5e81df4534 100644 --- a/src/Symfony/Component/Validator/Constraints/Country.php +++ b/src/Symfony/Component/Validator/Constraints/Country.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Country extends Constraint { - public $message = 'This value is not a valid country'; + public $message = 'This value is not a valid country.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Date.php b/src/Symfony/Component/Validator/Constraints/Date.php index 7668109100..c34851e286 100644 --- a/src/Symfony/Component/Validator/Constraints/Date.php +++ b/src/Symfony/Component/Validator/Constraints/Date.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Date extends Constraint { - public $message = 'This value is not a valid date'; + public $message = 'This value is not a valid date.'; } diff --git a/src/Symfony/Component/Validator/Constraints/DateTime.php b/src/Symfony/Component/Validator/Constraints/DateTime.php index e8fcb5adb9..a2059b03e9 100644 --- a/src/Symfony/Component/Validator/Constraints/DateTime.php +++ b/src/Symfony/Component/Validator/Constraints/DateTime.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class DateTime extends Constraint { - public $message = 'This value is not a valid datetime'; + public $message = 'This value is not a valid datetime.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php index a1265e37cc..db250dfc4d 100644 --- a/src/Symfony/Component/Validator/Constraints/Email.php +++ b/src/Symfony/Component/Validator/Constraints/Email.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint; */ class Email extends Constraint { - public $message = 'This value is not a valid email address'; + public $message = 'This value is not a valid email address.'; public $checkMX = false; public $checkHost = false; } diff --git a/src/Symfony/Component/Validator/Constraints/False.php b/src/Symfony/Component/Validator/Constraints/False.php index eb5d7ea475..1a1f1636f3 100644 --- a/src/Symfony/Component/Validator/Constraints/False.php +++ b/src/Symfony/Component/Validator/Constraints/False.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class False extends Constraint { - public $message = 'This value should be false'; + public $message = 'This value should be false.'; } diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php index 3abd7e2b71..06d6e7ed28 100644 --- a/src/Symfony/Component/Validator/Constraints/File.php +++ b/src/Symfony/Component/Validator/Constraints/File.php @@ -22,17 +22,17 @@ class File extends Constraint { public $maxSize = null; public $mimeTypes = array(); - public $notFoundMessage = 'The file could not be found'; - public $notReadableMessage = 'The file is not readable'; - public $maxSizeMessage = 'The file is too large ({{ size }}). Allowed maximum size is {{ limit }}'; - public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}'; + public $notFoundMessage = 'The file could not be found.'; + public $notReadableMessage = 'The file is not readable.'; + public $maxSizeMessage = 'The file is too large ({{ size }}). Allowed maximum size is {{ limit }}.'; + public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.'; - public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }}'; - public $uploadFormSizeErrorMessage = 'The file is too large'; - public $uploadPartialErrorMessage = 'The file was only partially uploaded'; - public $uploadNoFileErrorMessage = 'No file was uploaded'; - public $uploadNoTmpDirErrorMessage = 'No temporary folder was configured in php.ini'; - public $uploadCantWriteErrorMessage = 'Cannot write temporary file to disk'; - public $uploadExtensionErrorMessage = 'A PHP extension caused the upload to fail'; - public $uploadErrorMessage = 'The file could not be uploaded'; + public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }}.'; + public $uploadFormSizeErrorMessage = 'The file is too large.'; + public $uploadPartialErrorMessage = 'The file was only partially uploaded.'; + public $uploadNoFileErrorMessage = 'No file was uploaded.'; + public $uploadNoTmpDirErrorMessage = 'No temporary folder was configured in php.ini.'; + public $uploadCantWriteErrorMessage = 'Cannot write temporary file to disk.'; + public $uploadExtensionErrorMessage = 'A PHP extension caused the upload to fail.'; + public $uploadErrorMessage = 'The file could not be uploaded.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Image.php b/src/Symfony/Component/Validator/Constraints/Image.php index 6f65540fbe..a23106489f 100644 --- a/src/Symfony/Component/Validator/Constraints/Image.php +++ b/src/Symfony/Component/Validator/Constraints/Image.php @@ -24,10 +24,10 @@ class Image extends File public $maxHeight = null; public $minHeight = null; - public $mimeTypesMessage = 'This file is not a valid image'; - public $sizeNotDetectedMessage = 'The size of the image could not be detected'; - public $maxWidthMessage = 'The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px'; - public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px'; - public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px'; - public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px'; + public $mimeTypesMessage = 'This file is not a valid image.'; + public $sizeNotDetectedMessage = 'The size of the image could not be detected.'; + public $maxWidthMessage = 'The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.'; + public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.'; + public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.'; + public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php index b8c3abf0f1..f064e32168 100644 --- a/src/Symfony/Component/Validator/Constraints/Ip.php +++ b/src/Symfony/Component/Validator/Constraints/Ip.php @@ -64,7 +64,7 @@ class Ip extends Constraint public $version = self::V4; - public $message = 'This is not a valid IP address'; + public $message = 'This is not a valid IP address.'; /** * {@inheritDoc} diff --git a/src/Symfony/Component/Validator/Constraints/Language.php b/src/Symfony/Component/Validator/Constraints/Language.php index 78d64d46f6..a0a099bac7 100644 --- a/src/Symfony/Component/Validator/Constraints/Language.php +++ b/src/Symfony/Component/Validator/Constraints/Language.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Language extends Constraint { - public $message = 'This value is not a valid language'; + public $message = 'This value is not a valid language.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Locale.php b/src/Symfony/Component/Validator/Constraints/Locale.php index eaa1a58ab0..9a9025e361 100644 --- a/src/Symfony/Component/Validator/Constraints/Locale.php +++ b/src/Symfony/Component/Validator/Constraints/Locale.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Locale extends Constraint { - public $message = 'This value is not a valid locale'; + public $message = 'This value is not a valid locale.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Max.php b/src/Symfony/Component/Validator/Constraints/Max.php index c0ff8fcb89..ffb958e85b 100644 --- a/src/Symfony/Component/Validator/Constraints/Max.php +++ b/src/Symfony/Component/Validator/Constraints/Max.php @@ -20,8 +20,8 @@ use Symfony\Component\Validator\Constraint; */ class Max extends Constraint { - public $message = 'This value should be {{ limit }} or less'; - public $invalidMessage = 'This value should be a valid number'; + public $message = 'This value should be {{ limit }} or less.'; + public $invalidMessage = 'This value should be a valid number.'; public $limit; /** diff --git a/src/Symfony/Component/Validator/Constraints/MaxLength.php b/src/Symfony/Component/Validator/Constraints/MaxLength.php index 49d7b441c4..c928bd5bfd 100644 --- a/src/Symfony/Component/Validator/Constraints/MaxLength.php +++ b/src/Symfony/Component/Validator/Constraints/MaxLength.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint; */ class MaxLength extends Constraint { - public $message = 'This value is too long. It should have {{ limit }} characters or less'; + public $message = 'This value is too long. It should have {{ limit }} characters or less.'; public $limit; public $charset = 'UTF-8'; diff --git a/src/Symfony/Component/Validator/Constraints/Min.php b/src/Symfony/Component/Validator/Constraints/Min.php index becd0e5bdd..78a4833296 100644 --- a/src/Symfony/Component/Validator/Constraints/Min.php +++ b/src/Symfony/Component/Validator/Constraints/Min.php @@ -20,8 +20,8 @@ use Symfony\Component\Validator\Constraint; */ class Min extends Constraint { - public $message = 'This value should be {{ limit }} or more'; - public $invalidMessage = 'This value should be a valid number'; + public $message = 'This value should be {{ limit }} or more.'; + public $invalidMessage = 'This value should be a valid number.'; public $limit; /** diff --git a/src/Symfony/Component/Validator/Constraints/MinLength.php b/src/Symfony/Component/Validator/Constraints/MinLength.php index f25e43d99c..1ee15906a6 100644 --- a/src/Symfony/Component/Validator/Constraints/MinLength.php +++ b/src/Symfony/Component/Validator/Constraints/MinLength.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint; */ class MinLength extends Constraint { - public $message = 'This value is too short. It should have {{ limit }} characters or more'; + public $message = 'This value is too short. It should have {{ limit }} characters or more.'; public $limit; public $charset = 'UTF-8'; diff --git a/src/Symfony/Component/Validator/Constraints/NotBlank.php b/src/Symfony/Component/Validator/Constraints/NotBlank.php index ea2bda94f3..c3281ad715 100644 --- a/src/Symfony/Component/Validator/Constraints/NotBlank.php +++ b/src/Symfony/Component/Validator/Constraints/NotBlank.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class NotBlank extends Constraint { - public $message = 'This value should not be blank'; + public $message = 'This value should not be blank.'; } diff --git a/src/Symfony/Component/Validator/Constraints/NotNull.php b/src/Symfony/Component/Validator/Constraints/NotNull.php index 2a49a1f3cf..2608ab3c0f 100644 --- a/src/Symfony/Component/Validator/Constraints/NotNull.php +++ b/src/Symfony/Component/Validator/Constraints/NotNull.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class NotNull extends Constraint { - public $message = 'This value should not be null'; + public $message = 'This value should not be null.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Null.php b/src/Symfony/Component/Validator/Constraints/Null.php index a64331726e..e110bf8549 100644 --- a/src/Symfony/Component/Validator/Constraints/Null.php +++ b/src/Symfony/Component/Validator/Constraints/Null.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Null extends Constraint { - public $message = 'This value should be null'; + public $message = 'This value should be null.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Regex.php b/src/Symfony/Component/Validator/Constraints/Regex.php index 702a51dfd8..73f8b7b332 100644 --- a/src/Symfony/Component/Validator/Constraints/Regex.php +++ b/src/Symfony/Component/Validator/Constraints/Regex.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint; */ class Regex extends Constraint { - public $message = 'This value is not valid'; + public $message = 'This value is not valid.'; public $pattern; public $match = true; diff --git a/src/Symfony/Component/Validator/Constraints/Size.php b/src/Symfony/Component/Validator/Constraints/Size.php index d350c78052..627f5a9f6e 100644 --- a/src/Symfony/Component/Validator/Constraints/Size.php +++ b/src/Symfony/Component/Validator/Constraints/Size.php @@ -20,9 +20,9 @@ use Symfony\Component\Validator\Constraint; */ class Size extends Constraint { - public $minMessage = 'This value should be {{ limit }} or more'; - public $maxMessage = 'This value should be {{ limit }} or less'; - public $invalidMessage = 'This value should be a valid number'; + public $minMessage = 'This value should be {{ limit }} or more.'; + public $maxMessage = 'This value should be {{ limit }} or less.'; + public $invalidMessage = 'This value should be a valid number.'; public $min; public $max; diff --git a/src/Symfony/Component/Validator/Constraints/SizeLength.php b/src/Symfony/Component/Validator/Constraints/SizeLength.php index 7d599e6b21..3704c66a2a 100644 --- a/src/Symfony/Component/Validator/Constraints/SizeLength.php +++ b/src/Symfony/Component/Validator/Constraints/SizeLength.php @@ -20,9 +20,9 @@ use Symfony\Component\Validator\Constraint; */ class SizeLength extends Constraint { - public $minMessage = 'This value is too short. It should have {{ limit }} characters or more'; - public $maxMessage = 'This value is too long. It should have {{ limit }} characters or less'; - public $exactMessage = 'This value should have exactly {{ limit }} characters'; + public $minMessage = 'This value is too short. It should have {{ limit }} characters or more.'; + public $maxMessage = 'This value is too long. It should have {{ limit }} characters or less.'; + public $exactMessage = 'This value should have exactly {{ limit }} characters.'; public $min; public $max; public $charset = 'UTF-8'; diff --git a/src/Symfony/Component/Validator/Constraints/Time.php b/src/Symfony/Component/Validator/Constraints/Time.php index a1f0b398f1..3ff8a50b18 100644 --- a/src/Symfony/Component/Validator/Constraints/Time.php +++ b/src/Symfony/Component/Validator/Constraints/Time.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class Time extends Constraint { - public $message = 'This value is not a valid time'; + public $message = 'This value is not a valid time.'; } diff --git a/src/Symfony/Component/Validator/Constraints/True.php b/src/Symfony/Component/Validator/Constraints/True.php index 504b70924e..a5bfc85832 100644 --- a/src/Symfony/Component/Validator/Constraints/True.php +++ b/src/Symfony/Component/Validator/Constraints/True.php @@ -20,5 +20,5 @@ use Symfony\Component\Validator\Constraint; */ class True extends Constraint { - public $message = 'This value should be true'; + public $message = 'This value should be true.'; } diff --git a/src/Symfony/Component/Validator/Constraints/Type.php b/src/Symfony/Component/Validator/Constraints/Type.php index c0419f90a5..11dec3c983 100644 --- a/src/Symfony/Component/Validator/Constraints/Type.php +++ b/src/Symfony/Component/Validator/Constraints/Type.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint; */ class Type extends Constraint { - public $message = 'This value should be of type {{ type }}'; + public $message = 'This value should be of type {{ type }}.'; public $type; /** diff --git a/src/Symfony/Component/Validator/Constraints/Url.php b/src/Symfony/Component/Validator/Constraints/Url.php index 655453aa86..4b4e96cdc5 100644 --- a/src/Symfony/Component/Validator/Constraints/Url.php +++ b/src/Symfony/Component/Validator/Constraints/Url.php @@ -20,6 +20,6 @@ use Symfony\Component\Validator\Constraint; */ class Url extends Constraint { - public $message = 'This value is not a valid URL'; + public $message = 'This value is not a valid URL.'; public $protocols = array('http', 'https'); }