From 31e39c1ce36cfdd276fde0ae20b52ab212c0b7e3 Mon Sep 17 00:00:00 2001 From: Mladen Macanovic Date: Tue, 27 Oct 2020 11:37:05 +0100 Subject: [PATCH] Updated Blazorise MessageLocalizer according to latest changes --- .../AbpIdentityBlazorMessageLocalizerExtensions.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMessageLocalizerExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMessageLocalizerExtensions.cs index bb5214ac63..18a6242bab 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMessageLocalizerExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorMessageLocalizerExtensions.cs @@ -7,21 +7,11 @@ namespace Volo.Abp.Identity.Blazor { public static class AbpIdentityBlazorMessageLocalizerExtensions { - public static IEnumerable Localize(this IStringLocalizer stringLocalizer, ValidationMessageLocalizerEventArgs eventArgs) - { - return LocalizeMessages(stringLocalizer, eventArgs.Messages?.Select(m => (m.Message, m.MessageArguments)))?.ToArray(); - } - - private static IEnumerable LocalizeMessages(IStringLocalizer stringLocalizer, IEnumerable<(string format, string[] arguments)> messages) - { - return messages?.Select(m => LocalizeMessage(stringLocalizer, m.format, m.arguments)); - } - - private static string LocalizeMessage(IStringLocalizer stringLocalizer, string format, params string[] arguments) + public static string Localize(this IStringLocalizer stringLocalizer, string format, IEnumerable arguments) { try { - return arguments?.Length > 0 + return arguments?.Count() > 0 ? string.Format(stringLocalizer[format], LocalizeMessageArguments(stringLocalizer, arguments)?.ToArray()) : stringLocalizer[format]; }