feat(i18n): Fix ValidatorMiddleware error & Fix I18n errors (#333)

* fix: Fix ValidatorMiddleware error * fix: Fix I18n errors
masastack · Nov 15, 2022 · b34148a · b34148a
1 parent f284bab
commit b34148a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/...patcher/Masa.Contrib.Dispatcher.Events.FluentValidation/Middleware/ValidatorMiddleware.cs b/...patcher/Masa.Contrib.Dispatcher.Events.FluentValidation/Middleware/ValidatorMiddleware.cs
@@ -36,7 +36,7 @@ public override async Task HandleAsync(TEvent @event, EventHandlerDelegate next)
                 @event,
                 failures);
 
-            var validationException = new ValidationException("Validation exception", failures);
+            var validationException = new ValidationException(failures);
             throw new MasaValidatorException(validationException.Message);
         }
 

diff --git a/...ion/Masa.Contrib.Globalization.I18n.AspNetCore/Extensions/ApplicationBuilderExtensions.cs b/...ion/Masa.Contrib.Globalization.I18n.AspNetCore/Extensions/ApplicationBuilderExtensions.cs
@@ -20,14 +20,17 @@ public static IApplicationBuilder UseI18n(this IApplicationBuilder app, string?
 
         var requestLocalization = new RequestLocalizationOptions();
 
-        var cultures = settings.SupportedCultures.Select(x => x.Culture).ToArray();
-        requestLocalization
-            .AddSupportedCultures(cultures)
-            .AddSupportedUICultures(cultures);
-        requestLocalization.SetDefaultCulture(!string.IsNullOrWhiteSpace(defaultCulture) ? defaultCulture : cultures.FirstOrDefault()!);
-
-        requestLocalization.ApplyCurrentCultureToResponseHeaders = true;
-        app.UseRequestLocalization(requestLocalization);
+        if (settings.SupportedCultures.Any())
+        {
+            var cultures = settings.SupportedCultures.Select(x => x.Culture).ToArray();
+            requestLocalization
+                .AddSupportedCultures(cultures)
+                .AddSupportedUICultures(cultures);
+            requestLocalization.SetDefaultCulture(!string.IsNullOrWhiteSpace(defaultCulture) ? defaultCulture : cultures.FirstOrDefault()!);
+
+            requestLocalization.ApplyCurrentCultureToResponseHeaders = true;
+            app.UseRequestLocalization(requestLocalization);
+        }
         return app;
     }
 }