Added public DictionaryKey property to all attributes

* Updated readme.md

Author: rasmuseeg

.gitignore

@@ -258,4 +258,10 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+
+# UmbracoCms
+umbraco/
+umbraco_client/
+App_Data/
+App_Code

README.md

@@ -150,10 +150,7 @@ public string Username { get; set; }
 
 Example:
 ```c#
-[UmbracoRequired]
-[UmbracoEmailAddress]
-[UmbracoDisplayName(nameof(Email))]
-[DataType(DataType.EmailAddress)]
+[UmbracoEmailAddress(DictionaryKey = "MyCustomKey")]
 public string Email { get; set; }
 ```
 
@@ -165,7 +162,7 @@ public string Email { get; set; }
 
 Example:
 ```C#
-[UmbracoMinLength(20)]
+[UmbracoMinLength(20, DictionaryKey = "MyCustomKey")]
 property string MyProperty { get; set; }
 ```
 
@@ -177,7 +174,7 @@ property string MyProperty { get; set; }
 
 Example:
 ```C#
-[UmbracoMaxLength(120)]
+[UmbracoMaxLength(120, DictionaryKey = "MyCustomKey")]
 property string MyProperty { get; set; }
 ```
 
@@ -190,7 +187,7 @@ property string MyProperty { get; set; }
 
 Example:
 ```C#
-[UmbracoStringLength(120, MinimumLength = 30)]
+[UmbracoStringLength(120, MinimumLength = 30, DictionaryKey = "MyCustomKey")]
 property string Message { get; set; }
 ```
 
@@ -201,7 +198,7 @@ property string Message { get; set; }
 
 Example:
 ```C#
-[MustBeTrue]
+[UmbracoMustBeTrue(DictionaryKey = "MyCustomKey")]
 property boool Consent { get; set; }
 ```
 
@@ -215,7 +212,11 @@ property boool Consent { get; set; }
 
 Example:
 ```C#
-[UmbracoPassword]
+[UmbracoPassword(DictionaryKey = "CustomPasswordKey", 
+    MinPasswordLengthDictionaryKey = "CustomMinPasswordLengthKey", 
+    MinNonAlphanumericCharactersDictionaryKey = "MyCustomMinNonAlphanumericCharactersKey", 
+    PasswordStrengthDictionaryKey = "MyCustomPasswordStrengtKey",
+    PasswordStrengthRegexTimeout = 360)]
 property string Password { get; set; }
 ```
 
@@ -225,14 +226,25 @@ There are no default keys for this attribute, since each regex validation is uni
 
 Example:
 ```C#
-[UmbracoRegularExpression()]
+[UmbracoRegularExpression(DictionaryKey = "MyCustomRegexKey")]
 property string Password { get; set; }
 ```
 
 ### UmbracoRequired
 
 Example:
 ```C#
-[UmbracoRequired]
+[UmbracoRequired(DictionaryKey = "MyCustomRequiredKey")]
+property string MyProperty { get; set; }
+```
+
+## Custom dictionary keys
+Each Attribute, has a public property `DictionaryKey` which can be set like this:
+```
+[UmbracoReguired(DictionaryKey = "MyCustomKey")]
+[UmbracoRegularExpression(DictionaryKey = "MyCustomRegexKey")]
+[UmbracoRegularExpression(DictionaryKey = "MyCustomRegexKey")]
 property string MyProperty { get; set; }
-```
+```
+
+Not setting a custom key, will fallback to the default dictionary key.

src/Our.Umbraco.DataAnnotations.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2048
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29403.142
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.DataAnnotations", "Our.Umbraco.DataAnnotations\Our.Umbraco.DataAnnotations.csproj", "{C808941C-0685-4F06-80CE-81AE4E8B82E3}"
 EndProject
@@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{041121B7
 		Our.Umbraco.DataAnnotations\Our.Umbraco.DataAnnotations.nuspec = Our.Umbraco.DataAnnotations\Our.Umbraco.DataAnnotations.nuspec
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UmbracoCms", "UmbracoCms\UmbracoCms.csproj", "{03A5C03C-2BF9-4EF5-9473-867F2D31BFC6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,6 +31,10 @@ Global
 		{C808941C-0685-4F06-80CE-81AE4E8B82E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C808941C-0685-4F06-80CE-81AE4E8B82E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C808941C-0685-4F06-80CE-81AE4E8B82E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03A5C03C-2BF9-4EF5-9473-867F2D31BFC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03A5C03C-2BF9-4EF5-9473-867F2D31BFC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03A5C03C-2BF9-4EF5-9473-867F2D31BFC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03A5C03C-2BF9-4EF5-9473-867F2D31BFC6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Our.Umbraco.DataAnnotations/ConditionalValidationAttributes.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Our.Umbraco.DataAnnotations.Interfaces
+{
+    public interface IUmbracoValidationAttribute
+    {
+        string DictionaryKey { get; set; }
+    }
+}

src/Our.Umbraco.DataAnnotations/CreateDictionaryKeys.cs

@@ -221,6 +221,7 @@
   <ItemGroup>
     <Compile Include="Conditionals\ConditionalValidationAttributes.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Interfaces\IUmbracoValidationAttribute.cs" />
     <Compile Include="Migrations\CreateDictionaryKeys.cs" />
     <Compile Include="Migrations\Runner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />