From 255547288bffc25865038a04c1aac370e7e1ad3f Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Fri, 16 Oct 2015 10:45:08 +0200
Subject: [PATCH] Fixed T usage in ValidationRules, round 2.

---
 .../Orchard.DynamicForms/ValidationRules/Compare.cs      | 5 +++--
 .../Orchard.DynamicForms/ValidationRules/EmailAddress.cs | 4 +++-
 .../Orchard.DynamicForms/ValidationRules/Mandatory.cs    | 5 +++--
 .../ValidationRules/OptionRequired.cs                    | 5 +++--
 .../ValidationRules/RegularExpression.cs                 | 5 +++--
 .../Orchard.DynamicForms/ValidationRules/Required.cs     | 5 +++--
 .../Orchard.DynamicForms/ValidationRules/StringLength.cs | 9 +++++----
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
index 41232822d..be86481e8 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
@@ -1,5 +1,4 @@
 using System;
-using Orchard.DynamicForms.Helpers;
 using Orchard.DynamicForms.Services;
 using Orchard.DynamicForms.Services.Models;
 using Orchard.Localization;
@@ -22,7 +21,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} must match the value of {1}.", context.FieldName, TargetName))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("{0} must match the value of {1}.", context.FieldName, TargetName)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
index b664a9fcb..e2795301a 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
@@ -28,7 +28,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is not a valid email address.", context.FieldName))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("{0} is not a valid email address.", context.FieldName)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
index fd645571c..8106d2d56 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
@@ -1,5 +1,4 @@
 using System;
-using Orchard.DynamicForms.Helpers;
 using Orchard.DynamicForms.Services;
 using Orchard.DynamicForms.Services.Models;
 using Orchard.Localization;
@@ -18,7 +17,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is a mandatory field.", context.FieldName))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("{0} is a mandatory field.", context.FieldName)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
index d5a567c25..a83d63544 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
@@ -1,5 +1,4 @@
 using System;
-using Orchard.DynamicForms.Helpers;
 using Orchard.DynamicForms.Services;
 using Orchard.DynamicForms.Services.Models;
 using Orchard.Localization;
@@ -18,7 +17,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("An option is required for {0}.", context.FieldName))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("An option is required for {0}.", context.FieldName)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
index 3aa4093a4..47310833f 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Text.RegularExpressions;
-using Orchard.DynamicForms.Helpers;
 using Orchard.DynamicForms.Services;
 using Orchard.DynamicForms.Services.Models;
 using Orchard.Localization;
@@ -27,7 +26,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} must match the following pattern: {1}.", context.FieldName, Pattern))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("{0} must match the following pattern: {1}.", context.FieldName, Pattern)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
index 151245ccb..c60ece752 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
@@ -1,5 +1,4 @@
 using System;
-using Orchard.DynamicForms.Helpers;
 using Orchard.DynamicForms.Services;
 using Orchard.DynamicForms.Services.Models;
 using Orchard.Localization;
@@ -18,7 +17,9 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is a required field.", context.FieldName))).ToString(), context));
+            return String.IsNullOrWhiteSpace(ErrorMessage)
+                ? T("{0} is a required field.", context.FieldName)
+                : new LocalizedString(Tokenize(ErrorMessage, context));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
index 868aefee9..a3a82e1b8 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
@@ -40,12 +40,13 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            if (!String.IsNullOrWhiteSpace(ErrorMessage))
-                return new LocalizedString(Tokenize(String.Format(T(ErrorMessage).ToString(), context.FieldName, Minimum, Maximum), context));
+            if(!String.IsNullOrWhiteSpace(ErrorMessage))
+                return new LocalizedString(Tokenize(String.Format(ErrorMessage, context.FieldName, Minimum, Maximum), context));
 
-            if(Minimum != null && Maximum != null)
+            if (Minimum != null && Maximum != null)
                 return T("{0} must be between {1} and {2} characters long.", context.FieldName, Minimum, Maximum);
-            else if (Minimum != null)
+
+            if (Minimum != null)
                 return T("{0} must be at least {1} characters long.", context.FieldName, Minimum);
             
             return T("{0} must be at most {1} characters long.", context.FieldName, Maximum);