From 054925c297d0dfdbc53ea0abe339638694780671 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Thu, 15 Oct 2015 21:46:50 +0200
Subject: [PATCH] Fixed T usage in ValidationRules.

---
 .../Modules/Orchard.DynamicForms/Services/ValidationRule.cs     | 1 -
 .../Modules/Orchard.DynamicForms/ValidationRules/Compare.cs     | 2 +-
 .../Orchard.DynamicForms/ValidationRules/EmailAddress.cs        | 2 +-
 .../Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs   | 2 +-
 .../Orchard.DynamicForms/ValidationRules/OptionRequired.cs      | 2 +-
 .../Orchard.DynamicForms/ValidationRules/RegularExpression.cs   | 2 +-
 .../Modules/Orchard.DynamicForms/ValidationRules/Required.cs    | 2 +-
 .../Orchard.DynamicForms/ValidationRules/StringLength.cs        | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ValidationRule.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ValidationRule.cs
index 699059c3b..88312b93d 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ValidationRule.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Services/ValidationRule.cs
@@ -1,5 +1,4 @@
 using Orchard.DynamicForms.Services.Models;
-using Orchard.Localization;
 using Orchard.Tokens;
 
 namespace Orchard.DynamicForms.Services {
diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
index b9a195df1..41232822d 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
@@ -22,7 +22,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} must match the value of {1}.", context.FieldName, TargetName)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} must match the value of {1}.", context.FieldName, TargetName))).ToString(), 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 68744f43e..b664a9fcb 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
@@ -28,7 +28,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} is not a valid email address.", context.FieldName)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is not a valid email address.", context.FieldName))).ToString(), 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 25158ecc9..fd645571c 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
@@ -18,7 +18,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} is a mandatory field.", context.FieldName)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is a mandatory field.", context.FieldName))).ToString(), 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 ea5e5173c..d5a567c25 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
@@ -18,7 +18,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("An option is required for {0}.", context.FieldName)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("An option is required for {0}.", context.FieldName))).ToString(), 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 72c3f6100..3aa4093a4 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
@@ -27,7 +27,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} must match the following pattern: {1}.", context.FieldName, Pattern)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} must match the following pattern: {1}.", context.FieldName, Pattern))).ToString(), 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 fee4900d0..151245ccb 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
@@ -18,7 +18,7 @@ namespace Orchard.DynamicForms.ValidationRules {
         }
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
-            return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} is a required field.", context.FieldName)), context));
+            return new LocalizedString(Tokenize(T(ErrorMessage.WithDefault(String.Format("{0} is a required field.", context.FieldName))).ToString(), 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 3445893a3..868aefee9 100644
--- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
+++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
@@ -41,7 +41,7 @@ namespace Orchard.DynamicForms.ValidationRules {
 
         private LocalizedString GetValidationMessage(ValidationContext context) {
             if (!String.IsNullOrWhiteSpace(ErrorMessage))
-                return T(Tokenize(String.Format(ErrorMessage, context.FieldName, Minimum, Maximum), context));
+                return new LocalizedString(Tokenize(String.Format(T(ErrorMessage).ToString(), context.FieldName, Minimum, Maximum), context));
 
             if(Minimum != null && Maximum != null)
                 return T("{0} must be between {1} and {2} characters long.", context.FieldName, Minimum, Maximum);