diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs index 4314b4d145f..4ef66774cee 100644 --- a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs +++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Email/EmailAddressAttribute.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; namespace OrchardCore.Email { @@ -12,20 +13,14 @@ public class EmailAddressAttribute : ValidationAttribute protected override ValidationResult IsValid(object value, ValidationContext validationContext) { var emailAddressValidator = validationContext.GetService(); + var S = validationContext.GetService>(); - if (value == null) + if (value == null || emailAddressValidator.Validate(value.ToString())) { return ValidationResult.Success; } - if (emailAddressValidator.Validate(value.ToString())) - { - return ValidationResult.Success; - } - else - { - return new ValidationResult(ErrorMessage, new[] { nameof(Email) }); - } + return new ValidationResult(S["Invalid email address."], new[] { nameof(Email) }); } } }