From bacfe1c0785833c702a7a8ee2a2a8fd123217321 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sat, 24 Sep 2022 15:40:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=20GetResourcePref?= =?UTF-8?q?ix=20=E9=87=8D=E8=BD=BD=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Json/JsonStringLocalizerFactory.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs b/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs index 921971190..4a907c998 100644 --- a/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs +++ b/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs @@ -87,6 +87,20 @@ internal class JsonStringLocalizerFactory : ResourceManagerStringLocalizerFactor return base.GetResourcePrefix(typeInfo); } + /// + /// GetResourcePrefix 方法 + /// + /// + /// + /// + protected override string GetResourcePrefix(string baseResourceName, string baseNamespace) + { + var resourcePrefix = base.GetResourcePrefix(baseResourceName, baseNamespace); + TypeName = $"{baseNamespace}.{baseResourceName}"; + + return resourcePrefix; + } + private IResourceNamesCache ResourceNamesCache { get; } = new ResourceNamesCache(); /// -- Gitee From ec91804298918f1c739c66251be2502aa4423b8e Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sat, 24 Sep 2022 15:54:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?doc:=20=E5=85=B3=E8=81=94=20Issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Localization/Json/JsonStringLocalizerFactory.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs b/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs index 4a907c998..c0e020a76 100644 --- a/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs +++ b/src/BootstrapBlazor/Localization/Json/JsonStringLocalizerFactory.cs @@ -95,6 +95,7 @@ internal class JsonStringLocalizerFactory : ResourceManagerStringLocalizerFactor /// protected override string GetResourcePrefix(string baseResourceName, string baseNamespace) { + // https://gitee.com/LongbowEnterprise/BootstrapBlazor/issues/I5SRA1 var resourcePrefix = base.GetResourcePrefix(baseResourceName, baseNamespace); TypeName = $"{baseNamespace}.{baseResourceName}"; -- Gitee From bb46db0cd64470eaaefa03df1ebae81cf89003c0 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sat, 24 Sep 2022 15:54:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Localization/JsonStringLocalizerTest.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/UnitTest/Localization/JsonStringLocalizerTest.cs b/test/UnitTest/Localization/JsonStringLocalizerTest.cs index 9e3899dae..d5526982f 100644 --- a/test/UnitTest/Localization/JsonStringLocalizerTest.cs +++ b/test/UnitTest/Localization/JsonStringLocalizerTest.cs @@ -212,6 +212,26 @@ public class JsonStringLocalizerTest : BootstrapBlazorTestBase Assert.Equal("test-name", localizer["test-name"]); } + [Fact] + public void GetResourcePrefix_Ok() + { + // https://gitee.com/LongbowEnterprise/BootstrapBlazor/issues/I5SRA1 + var builder = new TestContext(); + builder.Services.AddConfiguration(); + + // 注入其他 Localization + builder.Services.AddLocalization(); + + // 注入 Bootstrap Localization + builder.Services.AddBootstrapBlazor(); + + var fac = builder.Services.GetRequiredService(); + var l = fac.Create("Lang", "UnitTest"); + var result = l["test"]; + Assert.True(result.ResourceNotFound); + Assert.Equal("test", result.Value); + } + private class MockTypeInfo : TypeDelegator { public override string? FullName => null; -- Gitee