HV-1943 french validation message white space fix

hibernate · Jul 31, 2023 · 7df561c · 7df561c
1 parent a1f75c4
commit 7df561c
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 2 deletions.
diff --git a/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties b/engine/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties
@@ -1,7 +1,7 @@
 jakarta.validation.constraints.AssertFalse.message     = doit avoir la valeur faux
 jakarta.validation.constraints.AssertTrue.message      = doit avoir la valeur vrai
-jakarta.validation.constraints.DecimalMax.message      = doit \u00eatre inf\u00e9rieur ${inclusive == true ? 'ou \u00e9gal' : ''} \u00e0 {value}
-jakarta.validation.constraints.DecimalMin.message      = doit \u00eatre sup\u00e9rieur ${inclusive == true ? 'ou \u00e9gal' : ''} \u00e0 {value}
+jakarta.validation.constraints.DecimalMax.message      = doit \u00eatre inf\u00e9rieur${inclusive == true ? ' ou \u00e9gal' : ''} \u00e0 {value}
+jakarta.validation.constraints.DecimalMin.message      = doit \u00eatre sup\u00e9rieur${inclusive == true ? ' ou \u00e9gal' : ''} \u00e0 {value}
 jakarta.validation.constraints.Digits.message          = valeur num\u00e9rique hors limites (<{integer} chiffres>.<{fraction} chiffres> attendu)
 jakarta.validation.constraints.Email.message           = doit \u00eatre une adresse \u00e9lectronique syntaxiquement correcte
 jakarta.validation.constraints.Future.message          = doit \u00eatre une date dans le futur

diff --git a/.../test/internal/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java b/.../test/internal/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java
@@ -9,6 +9,7 @@
 import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertThat;
 import static org.hibernate.validator.testutil.ConstraintViolationAssert.violationOf;
 
+import java.time.Duration;
 import java.util.Locale;
 import java.util.Set;
 
@@ -20,6 +21,8 @@
 import jakarta.validation.constraints.Email;
 
 import org.hibernate.validator.constraints.Range;
+import org.hibernate.validator.constraints.time.DurationMax;
+import org.hibernate.validator.constraints.time.DurationMin;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutils.ValidatorUtil;
@@ -132,6 +135,40 @@ public void testConditionalDecimalMinMessageDependingOnInclusiveFlag() {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HV-1943")
+	public void testConditionalDecimalMinMaxMessagesForFrenchLocale() {
+		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.FRENCH );
+		config.messageInterpolator( new ResourceBundleMessageInterpolator() );
+		Validator validator = config.buildValidatorFactory().getValidator();
+
+
+		Set<ConstraintViolation<DoubleHolder>> constraintViolations = validator.validate( new DoubleHolder() );
+		assertThat( constraintViolations ).containsOnlyViolations(
+				violationOf( DecimalMin.class ).withMessage( "doit être supérieur ou égal à 1.0" ),
+				violationOf( DecimalMin.class ).withMessage( "doit être supérieur à 1.0" ),
+				violationOf( DecimalMax.class ).withMessage( "doit être inférieur ou égal à 1.0" ),
+				violationOf( DecimalMax.class ).withMessage( "doit être inférieur à 1.0" )
+		);
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HV-1943")
+	public void testConditionalDurationMinMaxMessagesForFrenchLocale() {
+		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.FRENCH );
+		config.messageInterpolator( new ResourceBundleMessageInterpolator() );
+		Validator validator = config.buildValidatorFactory().getValidator();
+
+
+		Set<ConstraintViolation<DurationHolder>> constraintViolations = validator.validate( new DurationHolder() );
+		assertThat( constraintViolations ).containsOnlyViolations(
+				violationOf( DurationMin.class ).withMessage( "doit être plus long ou égal à 2 jours" ),
+				violationOf( DurationMin.class ).withMessage( "doit être plus long que 2 jours" ),
+				violationOf( DurationMax.class ).withMessage( "doit être plus court ou égal à 2 jours" ),
+				violationOf( DurationMax.class ).withMessage( "doit être plus court que 2 jours" )
+		);
+	}
+
 	private static class DoubleHolder {
 		@DecimalMax(value = "1.0")
 		private final double inclusiveMaxDouble;
@@ -152,6 +189,26 @@ private DoubleHolder() {
 		}
 	}
 
+	private static class DurationHolder {
+		@DurationMax(days = 2L)
+		private final Duration inclusiveMaxDuration;
+		@DurationMax(days = 2L, inclusive = false)
+		private final Duration exclusiveMaxDuration;
+
+		@DurationMin(days = 2L)
+		private final Duration inclusiveMinDuration;
+		@DurationMin(days = 2L, inclusive = false)
+		private final Duration exclusiveMinDuration;
+
+		private DurationHolder() {
+			this.inclusiveMaxDuration = Duration.ofDays( 3 );
+			this.exclusiveMaxDuration = Duration.ofDays( 2 );
+
+			this.inclusiveMinDuration = Duration.ofDays( 1 );
+			this.exclusiveMinDuration = Duration.ofDays( 2 );
+		}
+	}
+
 	/**
 	 * A message interpolator that enforces one given locale to be used for message
 	 * interpolation.