Ajustes gerais

Author: dliocode

src/core/DataValidator.Context.pas

@@ -357,11 +357,9 @@ function TDataValidatorContext<T>.Contains(const AValueContains: string; const A
 
 function TDataValidatorContext<T>.Contains(const AValueContains: TArray<string>; const ACaseSensitive: Boolean): T;
 var
-  LValue: string;
   LMessage: string;
 begin
   LMessage := String.Join(' ', AValueContains);
-
   Result := Add(TValidatorContains.Create(AValueContains, ACaseSensitive, Format('Value not contains %s!', [LMessage])));
 end;
 
@@ -372,11 +370,9 @@ function TDataValidatorContext<T>.EndsWith(const AValueEndsWith: string; const A
 
 function TDataValidatorContext<T>.EndsWith(const AValueEndsWith: TArray<string>; const ACaseSensitive: Boolean = False): T;
 var
-  LValue: string;
   LMessage: string;
 begin
   LMessage := String.Join(' ', AValueEndsWith);
-
   Result := Add(TValidatorEndsWith.Create(AValueEndsWith, ACaseSensitive, Format('Value does not end with %s!', [LMessage])));
 end;
 
@@ -517,11 +513,9 @@ function TDataValidatorContext<T>.IsEquals(const AValueEquals: string; const ACa
 
 function TDataValidatorContext<T>.IsEquals(const AValueEquals: TArray<string>; const ACaseSensitive: Boolean): T;
 var
-  LValue: string;
   LMessage: string;
 begin
   LMessage := String.Join(' ', AValueEquals);
-
   Result := Add(TValidatorIsEquals.Create(AValueEquals, ACaseSensitive, Format('Value is not equals %s!', [LMessage])));
 end;
 

src/core/DataValidator.ItemBase.pas

@@ -65,7 +65,6 @@ interface
   TDataValidatorItemBase = class(TInterfacedObject, IDataValidatorItemBase)
   private
     FMessage: TDataValidatorMessage;
-
     function GetAdjustedMessage(const AMessage: string): string;
   protected
     FLocaleLanguage: TDataValidatorLocaleLanguage;
@@ -211,12 +210,12 @@ function TDataValidatorItemBase.GetAdjustedMessage(const AMessage: string): stri
   LValue := GetValueAsString;
 
   LMessage := AMessage;
-  LMessage := LMessage.Replace('${key}', LKey, [rfReplaceAll]);
-  LMessage := LMessage.Replace('${keyupper}', UpperCase(LKey), [rfReplaceAll]);
-  LMessage := LMessage.Replace('${keylower}', LowerCase(LKey), [rfReplaceAll]);
-  LMessage := LMessage.Replace('${value}', LValue, [rfReplaceAll]);
-  LMessage := LMessage.Replace('${valueupper}', UpperCase(LValue), [rfReplaceAll]);
-  LMessage := LMessage.Replace('${valuelower}', LowerCase(LValue), [rfReplaceAll]);
+  LMessage := LMessage.Replace('${key}', LKey, [rfReplaceAll, rfIgnoreCase]);
+  LMessage := LMessage.Replace('${keyupper}', UpperCase(LKey), [rfReplaceAll, rfIgnoreCase]);
+  LMessage := LMessage.Replace('${keylower}', LowerCase(LKey), [rfReplaceAll, rfIgnoreCase]);
+  LMessage := LMessage.Replace('${value}', LValue, [rfReplaceAll, rfIgnoreCase]);
+  LMessage := LMessage.Replace('${valueupper}', UpperCase(LValue), [rfReplaceAll, rfIgnoreCase]);
+  LMessage := LMessage.Replace('${valuelower}', LowerCase(LValue), [rfReplaceAll, rfIgnoreCase]);
 
   Result := LMessage;
 end;