Localize validation messages with user lang files (#15820)

* Localize validation messages with user lang files

* Fixed unit tests

src/Umbraco.Core/Models/Mapping/ContentPropertyDisplayMapper.cs

@@ -86,5 +86,7 @@ internal class ContentPropertyDisplayMapper : ContentPropertyBasicMapper<Content
         // Translate
         dest.Label = _textService.UmbracoDictionaryTranslate(_cultureDictionary, dest.Label);
         dest.Description = _textService.UmbracoDictionaryTranslate(_cultureDictionary, dest.Description);
+        dest.Validation.MandatoryMessage = _textService.UmbracoDictionaryTranslate(_cultureDictionary, dest.Validation.MandatoryMessage);
+        dest.Validation.PatternMessage = _textService.UmbracoDictionaryTranslate(_cultureDictionary, dest.Validation.PatternMessage);
     }
 }

src/Umbraco.Core/Services/PropertyValidationService.cs

@@ -1,5 +1,8 @@
 using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Cms.Core.Dictionary;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Extensions;
@@ -12,17 +15,30 @@ public class PropertyValidationService : IPropertyValidationService
     private readonly PropertyEditorCollection _propertyEditors;
     private readonly ILocalizedTextService _textService;
     private readonly IValueEditorCache _valueEditorCache;
+    private readonly ICultureDictionary _cultureDictionary;
 
+    [Obsolete("Use the constructor that accepts ICultureDictionary. Will be removed in V15.")]
     public PropertyValidationService(
         PropertyEditorCollection propertyEditors,
         IDataTypeService dataTypeService,
         ILocalizedTextService textService,
         IValueEditorCache valueEditorCache)
+        : this(propertyEditors, dataTypeService, textService, valueEditorCache, StaticServiceProvider.Instance.GetRequiredService<ICultureDictionary>())
+    {
+    }
+
+    public PropertyValidationService(
+        PropertyEditorCollection propertyEditors,
+        IDataTypeService dataTypeService,
+        ILocalizedTextService textService,
+        IValueEditorCache valueEditorCache,
+        ICultureDictionary cultureDictionary)
     {
         _propertyEditors = propertyEditors;
         _dataTypeService = dataTypeService;
         _textService = textService;
         _valueEditorCache = valueEditorCache;
+        _cultureDictionary = cultureDictionary;
     }
 
     /// <inheritdoc />
@@ -76,13 +92,13 @@ public class PropertyValidationService : IPropertyValidationService
             if (isRequired && !string.IsNullOrWhiteSpace(isRequiredMessage) &&
                 requiredDefaultMessages.Contains(validationResult.ErrorMessage, StringComparer.OrdinalIgnoreCase))
             {
-                validationResult.ErrorMessage = isRequiredMessage;
+                validationResult.ErrorMessage = _textService.UmbracoDictionaryTranslate(_cultureDictionary, isRequiredMessage);
             }
 
             if (!string.IsNullOrWhiteSpace(validationRegExp) && !string.IsNullOrWhiteSpace(validationRegExpMessage) &&
                 formatDefaultMessages.Contains(validationResult.ErrorMessage, StringComparer.OrdinalIgnoreCase))
             {
-                validationResult.ErrorMessage = validationRegExpMessage;
+                validationResult.ErrorMessage = _textService.UmbracoDictionaryTranslate(_cultureDictionary, validationRegExpMessage);
             }
 
             yield return validationResult;

tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentServiceTests.cs

@@ -7,6 +7,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Dictionary;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
@@ -1195,7 +1196,7 @@ public class ContentServiceTests : UmbracoIntegrationTestWithContent
 
         // content cannot publish values because they are invalid
         var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService,
-            TextService, ValueEditorCache);
+            TextService, ValueEditorCache, Mock.Of<ICultureDictionary>());
         var isValid = propertyValidationService.IsPropertyDataValid(content, out var invalidProperties,
             CultureImpact.Invariant);
         Assert.IsFalse(isValid);

tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs

@@ -5,6 +5,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Dictionary;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -615,6 +616,7 @@ public class VariationTests
             propertyEditorCollection,
             dataTypeService,
             localizedTextService,
-            new ValueEditorCache());
+            new ValueEditorCache(),
+            Mock.Of<ICultureDictionary>());
     }
 }

tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs

@@ -6,6 +6,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Dictionary;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -51,7 +52,7 @@ public class PropertyValidationServiceTests
 
         var propEditors = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
 
-        validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>(), new ValueEditorCache());
+        validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>(), new ValueEditorCache(), Mock.Of<ICultureDictionary>());
     }
 
     [Test]