From 2528710897c6995eaa6b04a63c1daa8cdffbf29d Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Fri, 25 Oct 2019 18:36:02 +0800 Subject: Add NeutralResourcesLanguage. Conform to best practices. --- Timeline/Models/Validation/UsernameValidator.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'Timeline/Models/Validation/UsernameValidator.cs') diff --git a/Timeline/Models/Validation/UsernameValidator.cs b/Timeline/Models/Validation/UsernameValidator.cs index dc237add..fc6cdf37 100644 --- a/Timeline/Models/Validation/UsernameValidator.cs +++ b/Timeline/Models/Validation/UsernameValidator.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using static Timeline.Resources.Models.Validation.UsernameValidator; namespace Timeline.Models.Validation { @@ -8,33 +9,27 @@ namespace Timeline.Models.Validation public const int MaxLength = 26; [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "Already checked in base class.")] - protected override (bool, ValidationMessageGenerator) DoValidate(string value) + protected override (bool, string) DoValidate(string value) { if (value.Length == 0) { - return (false, factory => - factory?.Create(typeof(UsernameValidator))?["ValidationMessageEmptyString"] - ?? Resources.Models.Validation.UsernameValidator.InvariantValidationMessageEmptyString); + return (false, MessageEmptyString); } if (value.Length > 26) { - return (false, factory => - factory?.Create(typeof(UsernameValidator))?["ValidationMessageTooLong"] - ?? Resources.Models.Validation.UsernameValidator.InvariantValidationMessageTooLong); + return (false, MessageTooLong); } foreach ((char c, int i) in value.Select((c, i) => (c, i))) { if (!(char.IsLetterOrDigit(c) || c == '-' || c == '_')) { - return (false, factory => - factory?.Create(typeof(UsernameValidator))?["ValidationMessageInvalidChar"] - ?? Resources.Models.Validation.UsernameValidator.InvariantValidationMessageInvalidChar); + return (false, MessageInvalidChar); } } - return (true, SuccessMessageGenerator); + return (true, GetSuccessMessage()); } } -- cgit v1.2.3