fixes valdisiljuconoks/LocalizationProvider#272

valdisiljuconoks · Dec 23, 2023 · 6676fd6 · 6676fd6
1 parent e0b1f69
commit 6676fd6
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/DbLocalizationProvider.AspNetCore/DataAnnotations/LocalizedAttributeAdapterBase.cs b/src/DbLocalizationProvider.AspNetCore/DataAnnotations/LocalizedAttributeAdapterBase.cs
@@ -32,16 +32,9 @@ protected LocalizedAttributeAdapterBase(
     /// <inheritdoc />
     public override string GetErrorMessage(ModelValidationContextBase validationContext)
     {
-        if (validationContext == null)
-        {
-            throw new ArgumentNullException(nameof(validationContext));
-        }
+        ArgumentNullException.ThrowIfNull(nameof(validationContext));
 
-        return _stringLocalizer?.GetString(
-            _resourceKeyBuilder.BuildResourceKey(
-                validationContext.ModelMetadata.ContainerType,
-                validationContext.ModelMetadata.PropertyName,
-                Attribute));
+        return GetErrorMessage(validationContext, null);
     }
 
     /// <summary>
@@ -52,9 +45,11 @@ public override string GetErrorMessage(ModelValidationContextBase validationCont
     /// <returns>The localized error message.</returns>
     public string GetErrorMessage(ModelValidationContextBase validationContext, params object[] arguments)
     {
-        if (validationContext == null)
+        ArgumentNullException.ThrowIfNull(nameof(validationContext));
+
+        if (validationContext.ModelMetadata.ContainerType == null || validationContext.ModelMetadata.PropertyName == null)
         {
-            throw new ArgumentNullException(nameof(validationContext));
+            return string.Empty;
         }
 
         return _stringLocalizer?.GetString(