lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removed tokenization from dynamic form error messages.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-11-03 22:34:11 +01:00
parent 61c91ff858
commit 06ee7849c1
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
View File

@@ -23,7 +23,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("{0} must match the value of {1}.", context.FieldName, TargetName)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage, context);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
View File

@@ -30,7 +30,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("{0} is not a valid email address.", context.FieldName)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("{0} is a mandatory field.", context.FieldName)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("An option is required for {0}.", context.FieldName)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage, context);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("{0} must match the following pattern: {1}.", context.FieldName, Pattern)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
return String.IsNullOrWhiteSpace(ErrorMessage)
? T("{0} is a required field.", context.FieldName)
: new LocalizedString(Tokenize(ErrorMessage, context));
: T(ErrorMessage);
}
}
}

2
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
View File

@@ -41,7 +41,7 @@ namespace Orchard.DynamicForms.ValidationRules {
private LocalizedString GetValidationMessage(ValidationContext context) {
if(!String.IsNullOrWhiteSpace(ErrorMessage))
return new LocalizedString(Tokenize(String.Format(ErrorMessage, context.FieldName, Minimum, Maximum), context));
return T(ErrorMessage, context.FieldName, Minimum, Maximum);
if (Minimum != null && Maximum != null)
return T("{0} must be between {1} and {2} characters long.", context.FieldName, Minimum, Maximum);