From d72c98e012ae5aaecc7ed5f16187b1bf752e47e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 1 Aug 2019 14:57:12 +0300
Subject: [PATCH] Fix localization problem for
 AbpTenantManagementDomainSharedModule

---
 .../AbpTenantManagementDomainSharedModule.cs  | 10 ++++----
 .../TenantManagement/Localization_Tests.cs    | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/Localization_Tests.cs

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
index 8b0e9bbec7..873593f9ca 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
@@ -1,8 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Localization;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.TenantManagement
 {
@@ -10,15 +10,15 @@ namespace Volo.Abp.TenantManagement
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources.Add<AbpTenantManagementResource>("en");
+                options.FileSets.AddEmbedded<AbpTenantManagementDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<AbpTenantManagementResource>()
+                    .Add<AbpTenantManagementResource>("en")
                     .AddBaseTypes(
                         typeof(AbpValidationResource)
                     ).AddVirtualJson("/Volo/Abp/TenantManagement/Localization/Resources");
diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/Localization_Tests.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/Localization_Tests.cs
new file mode 100644
index 0000000000..2718512641
--- /dev/null
+++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.Domain.Tests/Volo/Abp/TenantManagement/Localization_Tests.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.Localization;
+using Shouldly;
+using Volo.Abp.TenantManagement.Localization;
+using Xunit;
+
+namespace Volo.Abp.TenantManagement
+{
+    public class Localization_Tests : AbpTenantManagementDomainTestBase
+    {
+        private readonly IStringLocalizer<AbpTenantManagementResource> _stringLocalizer;
+
+        public Localization_Tests()
+        {
+            _stringLocalizer = GetRequiredService<IStringLocalizer<AbpTenantManagementResource>>();
+        }
+
+        [Fact]
+        public void Test()
+        {
+            _stringLocalizer["TenantDeletionConfirmationMessage"].Value
+                .ShouldBe("Tenant '{0}' will be deleted. Do you confirm that?");
+        }
+    }
+}