Merge pull request #9 from GianniDPC/master

Fix custom umbraco dictionary keys not working once again
rasmuseeg · Oct 14, 2019 · 9408e8c · 9408e8c
2 parents 1711cbd + 8daf0e2
commit 9408e8c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoCompareAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoCompareAttribute.cs
@@ -16,11 +16,12 @@ public sealed class UmbracoCompareAttribute : System.ComponentModel.DataAnnotati
         public UmbracoCompareAttribute(string otherProperty)
             : base(otherProperty)
         {
-            ErrorMessageString = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessageString = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             if (metadata.ContainerType != null)
             {
                 if (OtherPropertyDisplayName == null)

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoMaxLengthAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoMaxLengthAttribute.cs
@@ -15,11 +15,12 @@ public sealed class UmbracoMaxLengthAttribute : MaxLengthAttribute, IClientValid
         public UmbracoMaxLengthAttribute(int length)
             : base(length)
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             yield return
                 new ModelClientValidationMaxLengthRule(FormatErrorMessage(metadata.GetDisplayName()), Length);
         }

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoMinLengthAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoMinLengthAttribute.cs
@@ -15,11 +15,12 @@ public sealed class UmbracoMinLengthAttribute : MinLengthAttribute, IClientValid
         public UmbracoMinLengthAttribute(int length)
             : base(length)
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             yield return
                 new ModelClientValidationMinLengthRule(FormatErrorMessage(metadata.GetDisplayName()), Length);
         }

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoRangeAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoRangeAttribute.cs
@@ -12,11 +12,12 @@ public sealed class UmbracoRangeAttribute : RangeAttribute, IClientValidatable,
         public UmbracoRangeAttribute(int minimum, int maximum) 
             : base(minimum, maximum)
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             yield return
                 new ModelClientValidationRangeRule(FormatErrorMessage(metadata.GetDisplayName()), Minimum, Maximum);
         }

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoRegularExpressionAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoRegularExpressionAttribute.cs
@@ -15,11 +15,12 @@ public sealed class UmbracoRegularExpressionAttribute : RegularExpressionAttribu
         public UmbracoRegularExpressionAttribute(string pattern)
             : base(pattern)
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             yield return new ModelClientValidationRegexRule(FormatErrorMessage(metadata.GetDisplayName()), Pattern);
         }
     }

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoRequiredAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoRequiredAttribute.cs
@@ -15,11 +15,11 @@ public sealed class UmbracoRequiredAttribute : RequiredAttribute, IClientValidat
         public UmbracoRequiredAttribute() 
             : base()
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
             yield return new ModelClientValidationRequiredRule(FormatErrorMessage(metadata.GetDisplayName()));
         }
     }

diff --git a/src/Our.Umbraco.DataAnnotations/UmbracoStringLengthAttribute.cs b/src/Our.Umbraco.DataAnnotations/UmbracoStringLengthAttribute.cs
@@ -15,11 +15,12 @@ public sealed class UmbracoStringLengthAttribute : StringLengthAttribute, IClien
         public UmbracoStringLengthAttribute(int maximumLength)
             : base(maximumLength)
         {
-            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
         }
 
         public IEnumerable<ModelClientValidationRule> GetClientValidationRules(ModelMetadata metadata, ControllerContext context)
         {
+            ErrorMessage = UmbracoDictionary.GetDictionaryValue(DictionaryKey);
+
             yield return
                 new ModelClientValidationStringLengthRule(FormatErrorMessage(metadata.GetDisplayName()), MinimumLength, MaximumLength);
         }