fix error message for RiddleSolutionInvalidLengthError

jheinath · Jul 30, 2023 · 426f9bd · 426f9bd
1 parent 11c97fa
commit 426f9bd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/Domain/EscapeGames/Errors/RiddleSolutionInvalidLengthError.cs b/Domain/EscapeGames/Errors/RiddleSolutionInvalidLengthError.cs
@@ -4,7 +4,7 @@ namespace Domain.EscapeGames.Errors;
 
 public class RiddleSolutionInvalidLengthError : Error
 {
-    public RiddleSolutionInvalidLengthError(int expectedLength)
-        : base(string.Format(_Errors.RiddleSolutionInvalidLengthErrorMessage, expectedLength))
+    public RiddleSolutionInvalidLengthError(params int[] expectedLengths)
+        : base(string.Format(_Errors.RiddleSolutionInvalidLengthErrorMessage, string.Join(", ", expectedLengths)))
     { }
 }
diff --git a/Domain/EscapeGames/Errors/_Errors.Designer.cs b/Domain/EscapeGames/Errors/_Errors.Designer.cs
diff --git a/Domain/EscapeGames/Errors/_Errors.de.resx b/Domain/EscapeGames/Errors/_Errors.de.resx
@@ -40,7 +40,7 @@
         <value>Die Rätsellösung darf nur Zahlen von 0-9 enthalten.</value>
     </data>
     <data name="RiddleSolutionInvalidLengthErrorMessage" xml:space="preserve">
-        <value>Die Rätsellösung muss {0} Zeichen lang sein.</value>
+        <value>Die Rätsellösungen müssen eine der folgenden Längen haben: {0}</value>
     </data>
     <data name="RiddleSolutionMustNotBeEmptyErrorMessage" xml:space="preserve">
         <value>Die Rästellösungen dürfen nicht leer sein.</value>

diff --git a/Domain/EscapeGames/Errors/_Errors.fr.resx b/Domain/EscapeGames/Errors/_Errors.fr.resx
@@ -39,7 +39,7 @@
         <value>La solution de l'énigme ne peut contenir que des chiffres de 0 à 9.</value>
     </data>
     <data name="RiddleSolutionInvalidLengthErrorMessage" xml:space="preserve">
-        <value>La solution de l'énigme doit comporter {0} caractères.</value>
+        <value>Les solutions de l'énigme doivent avoir l'une des longueurs suivantes : {0}</value>
     </data>
     <data name="RiddleSolutionIsNotCorrectErrorMessage" xml:space="preserve">
         <value>La solution n'est pas correcte.</value>

diff --git a/Domain/EscapeGames/Errors/_Errors.resx b/Domain/EscapeGames/Errors/_Errors.resx
@@ -19,7 +19,7 @@
         <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
     <data name="RiddleSolutionInvalidLengthErrorMessage" xml:space="preserve">
-        <value>Riddle solution must have length {0}.</value>
+        <value>Riddle solutions must have one of the following lengths: {0}</value>
     </data>
     <data name="RiddleSolutionMustNotBeEmptyErrorMessage" xml:space="preserve">
         <value>Riddle solutions must not be empty.</value>

diff --git a/Domain/EscapeGames/ValueObjects/RiddleSolution.cs b/Domain/EscapeGames/ValueObjects/RiddleSolution.cs
@@ -26,7 +26,7 @@ public static Result<RiddleSolution> Create(string? riddleSolution)
 
         var length = riddleSolution?.Trim().Length ?? 0;
         if (!AllowedSolutionLengths.Contains(length))
-            result.WithError(new RiddleSolutionInvalidLengthError(expectedLength: 3));
+            result.WithError(new RiddleSolutionInvalidLengthError(AllowedSolutionLengths.ToArray()));
 
         if (result.IsFailed)
             return result;

diff --git a/LockEscape.sln.DotSettings.user b/LockEscape.sln.DotSettings.user
@@ -8,7 +8,7 @@
 
 
 
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Domain_002FEscapeGames_002FErrors_002F_005FErrors/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Domain_002FEscapeGames_002FErrors_002F_005FErrors/@EntryIndexedValue">True</s:Boolean>
 
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=LockEscape_002FPages_002FComponents_002F_005FPopup/@EntryIndexedValue">False</s:Boolean>