HV-1451 Add @PastOrPresent and @FutureOrPresent messages

engine/src/main/resources/org/hibernate/validator/ValidationMessages.properties

@@ -1,23 +1,25 @@
-javax.validation.constraints.AssertFalse.message    = must be false
-javax.validation.constraints.AssertTrue.message     = must be true
-javax.validation.constraints.DecimalMax.message     = must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
-javax.validation.constraints.DecimalMin.message     = must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
-javax.validation.constraints.Digits.message         = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Email.message          = must be a well-formed email address
-javax.validation.constraints.Future.message         = must be in the future
-javax.validation.constraints.Max.message            = must be less than or equal to {value}
-javax.validation.constraints.Min.message            = must be greater than or equal to {value}
-javax.validation.constraints.Negative.message       = must be less than 0
-javax.validation.constraints.NegativeOrZero.message = must be less than or equal to 0
-javax.validation.constraints.NotBlank.message       = must not be blank
-javax.validation.constraints.NotEmpty.message       = must not be empty
-javax.validation.constraints.NotNull.message        = must not be null
-javax.validation.constraints.Null.message           = must be null
-javax.validation.constraints.Past.message           = must be in the past
-javax.validation.constraints.Pattern.message        = must match "{regexp}"
-javax.validation.constraints.Positive.message       = must be greater than 0
-javax.validation.constraints.PositiveOrZero.message = must be greater than or equal to 0
-javax.validation.constraints.Size.message           = size must be between {min} and {max}
+javax.validation.constraints.AssertFalse.message     = must be false
+javax.validation.constraints.AssertTrue.message      = must be true
+javax.validation.constraints.DecimalMax.message      = must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
+javax.validation.constraints.DecimalMin.message      = must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
+javax.validation.constraints.Digits.message          = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+javax.validation.constraints.Email.message           = must be a well-formed email address
+javax.validation.constraints.Future.message          = must be a future date
+javax.validation.constraints.FutureOrPresent.message = must be a date in the present or in the future
+javax.validation.constraints.Max.message             = must be less than or equal to {value}
+javax.validation.constraints.Min.message             = must be greater than or equal to {value}
+javax.validation.constraints.Negative.message        = must be less than 0
+javax.validation.constraints.NegativeOrZero.message  = must be less than or equal to 0
+javax.validation.constraints.NotBlank.message        = must not be blank
+javax.validation.constraints.NotEmpty.message        = must not be empty
+javax.validation.constraints.NotNull.message         = must not be null
+javax.validation.constraints.Null.message            = must be null
+javax.validation.constraints.Past.message            = must be a past date
+javax.validation.constraints.PastOrPresent.message   = must be a date in the past or in the present
+javax.validation.constraints.Pattern.message         = must match "{regexp}"
+javax.validation.constraints.Positive.message        = must be greater than 0
+javax.validation.constraints.PositiveOrZero.message  = must be greater than or equal to 0
+javax.validation.constraints.Size.message            = size must be between {min} and {max}
 
 org.hibernate.validator.constraints.CreditCardNumber.message        = invalid credit card number
 org.hibernate.validator.constraints.Currency.message                = invalid currency (must be one of {value})
@@ -40,9 +42,9 @@ org.hibernate.validator.constraints.br.CNPJ.message                 = invalid Br
 org.hibernate.validator.constraints.br.CPF.message                  = invalid Brazilian individual taxpayer registry number (CPF)
 org.hibernate.validator.constraints.br.TituloEleitoral.message      = invalid Brazilian Voter ID card number
 
-org.hibernate.validator.constraints.pl.REGON.message = Invalid Polish Taxpayer Identification Number (REGON)
-org.hibernate.validator.constraints.pl.NIP.message = Invalid VAT Identification Number (NIP)
-org.hibernate.validator.constraints.pl.PESEL.message = Invalid Polish National Identification Number (PESEL)
+org.hibernate.validator.constraints.pl.REGON.message                = Invalid Polish Taxpayer Identification Number (REGON)
+org.hibernate.validator.constraints.pl.NIP.message                  = Invalid VAT Identification Number (NIP)
+org.hibernate.validator.constraints.pl.PESEL.message                = Invalid Polish National Identification Number (PESEL)
 
 org.hibernate.validator.constraints.time.DurationMax.message        = must be shorter than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}
 org.hibernate.validator.constraints.time.DurationMin.message        = must be longer than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}

engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties

@@ -1,23 +1,25 @@
-javax.validation.constraints.AssertFalse.message    = doit \u00EAtre faux
-javax.validation.constraints.AssertTrue.message     = doit \u00EAtre vrai
-javax.validation.constraints.DecimalMax.message     = doit \u00EAtre ${inclusive == false ? 'strictement ' : ''}inf\u00E9rieur ${inclusive == true ? 'ou \u00E9gal ' : ''}\u00E0 {value}
-javax.validation.constraints.DecimalMin.message     = doit \u00EAtre ${inclusive == false ? 'strictement ' : ''}sup\u00E9rieur ${inclusive == true ? 'ou \u00E9gal ' : ''}\u00E0 {value}
-javax.validation.constraints.Digits.message         = valeur num\u00E9rique hors limite (<{integer} chiffres>.<{fraction} chiffres> attendu)
-javax.validation.constraints.Email.message          = doit \u00EAtre une adresse email bien form\u00E9e
-javax.validation.constraints.Future.message         = doit \u00EAtre dans le futur
-javax.validation.constraints.Max.message            = doit \u00EAtre au maximum \u00E9gal \u00E0 {value}
-javax.validation.constraints.Min.message            = doit \u00EAtre au minimum \u00E9gal \u00E0 {value}
-javax.validation.constraints.Negative.message       = doit \u00EAtre strictement n\u00E9gatif
-javax.validation.constraints.NegativeOrZero.message = doit \u00EAtre n\u00E9gatif ou \u00E9gal à 0
-javax.validation.constraints.NotBlank.message       = ne peut pas \u00EAtre vide
-javax.validation.constraints.NotEmpty.message       = ne peut pas \u00EAtre vide
-javax.validation.constraints.NotNull.message        = ne peut pas \u00EAtre nul
-javax.validation.constraints.Null.message           = doit \u00EAtre nul
-javax.validation.constraints.Past.message           = doit \u00EAtre dans le pass\u00E9
-javax.validation.constraints.Pattern.message        = doit respecter "{regexp}"
-javax.validation.constraints.Positive.message       = doit \u00EAtre strictement positif
-javax.validation.constraints.PositiveOrZero.message = doit \u00EAtre positif ou \u00E9gal à 0
-javax.validation.constraints.Size.message           = la taille doit \u00EAtre comprise entre {min} et {max}
+javax.validation.constraints.AssertFalse.message     = doit \u00EAtre faux
+javax.validation.constraints.AssertTrue.message      = doit \u00EAtre vrai
+javax.validation.constraints.DecimalMax.message      = doit \u00EAtre ${inclusive == false ? 'strictement ' : ''}inf\u00E9rieur ${inclusive == true ? 'ou \u00E9gal ' : ''}\u00E0 {value}
+javax.validation.constraints.DecimalMin.message      = doit \u00EAtre ${inclusive == false ? 'strictement ' : ''}sup\u00E9rieur ${inclusive == true ? 'ou \u00E9gal ' : ''}\u00E0 {value}
+javax.validation.constraints.Digits.message          = valeur num\u00E9rique hors limite (<{integer} chiffres>.<{fraction} chiffres> attendu)
+javax.validation.constraints.Email.message           = doit \u00EAtre une adresse email bien form\u00E9e
+javax.validation.constraints.Future.message          = doit \u00EAtre dans le futur
+javax.validation.constraints.FutureOrPresent.message = doit \u00EAtre dans le pr\u00E9sent ou dans le futur
+javax.validation.constraints.Max.message             = doit \u00EAtre au maximum \u00E9gal \u00E0 {value}
+javax.validation.constraints.Min.message             = doit \u00EAtre au minimum \u00E9gal \u00E0 {value}
+javax.validation.constraints.Negative.message        = doit \u00EAtre strictement n\u00E9gatif
+javax.validation.constraints.NegativeOrZero.message  = doit \u00EAtre n\u00E9gatif ou \u00E9gal à 0
+javax.validation.constraints.NotBlank.message        = ne peut pas \u00EAtre vide
+javax.validation.constraints.NotEmpty.message        = ne peut pas \u00EAtre vide
+javax.validation.constraints.NotNull.message         = ne peut pas \u00EAtre nul
+javax.validation.constraints.Null.message            = doit \u00EAtre nul
+javax.validation.constraints.Past.message            = doit \u00EAtre dans le pass\u00E9
+javax.validation.constraints.PastOrPresent.message   = doit \u00EAtre dans le pass\u00E9 ou dans le pr\u00E9sent
+javax.validation.constraints.Pattern.message         = doit respecter "{regexp}"
+javax.validation.constraints.Positive.message        = doit \u00EAtre strictement positif
+javax.validation.constraints.PositiveOrZero.message  = doit \u00EAtre positif ou \u00E9gal à 0
+javax.validation.constraints.Size.message            = la taille doit \u00EAtre comprise entre {min} et {max}
 
 org.hibernate.validator.constraints.CreditCardNumber.message = num\u00E9ro de carte de cr\u00E9dit invalide
 org.hibernate.validator.constraints.Currency.message         = devise invalide (doit faire partie de {value})

engine/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java

@@ -210,7 +210,7 @@ public void testInheritedConstraint() {
 
 		Set<ConstraintViolation<Marathon>> violations = validator.validate( marathon );
 		assertThat( violations ).containsOnlyViolations(
-				violationOf( Future.class ).withMessage( "must be in the future" )
+				violationOf( Future.class ).withMessage( "must be a future date" )
 		);
 	}