From 14c2ee794409382ef13ae225b54cddfd5ebd55ba Mon Sep 17 00:00:00 2001 From: Jamie Phillips Date: Tue, 20 Oct 2015 20:34:23 -0400 Subject: [PATCH] Updating Validation Message for URL Field This change is made to now be in sync with the recent changes to how validation messages are being handled. --- .../Orchard.DynamicForms/ValidationRules/UrlAddress.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/UrlAddress.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/UrlAddress.cs index 664f6e3a8..3ee7e985d 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/UrlAddress.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/UrlAddress.cs @@ -34,7 +34,9 @@ namespace Orchard.DynamicForms.ValidationRules private LocalizedString GetValidationMessage(ValidationContext context) { - return T(Tokenize(ErrorMessage.WithDefault(String.Format("{0} is not a valid url.", context.FieldName)), context)); + return String.IsNullOrWhiteSpace(ErrorMessage) + ? T("{0} is not a valid URL.", context.FieldName) + : new LocalizedString(Tokenize(ErrorMessage, context)); } } -} \ No newline at end of file +}