From e4f73df23afbd1e0dcc7c0a33b626442cdeab195 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 1 Aug 2019 15:09:08 +0300
Subject: [PATCH] fixed localizaiton bug

---
 .../Volo/Blogging/BloggingDomainSharedModule.cs          | 7 ++++---
 .../AbpFeatureManagementDomainSharedModule.cs            | 7 ++++---
 .../Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs   | 7 ++++---
 .../AbpPermissionManagementDomainSharedModule.cs         | 8 ++++----
 .../AbpSettingManagementDomainSharedModule.cs            | 9 ++++-----
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs
index 2bce24c505..04c2993860 100644
--- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs
+++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs
@@ -3,6 +3,7 @@ using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Blogging.Localization;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Blogging
 {
@@ -11,15 +12,15 @@ namespace Volo.Blogging
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources.Add<BloggingResource>("en");
+                options.FileSets.AddEmbedded<BloggingDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<BloggingResource>()
+                    .Add<BloggingResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/Resources");
             });
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
index adf6269926..0008faf693 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.FeatureManagement
 {
@@ -12,15 +13,15 @@ namespace Volo.Abp.FeatureManagement
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources.Add<AbpFeatureManagementResource>("en");
+                options.FileSets.AddEmbedded<AbpFeatureManagementDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<AbpFeatureManagementResource>()
+                    .Add<AbpFeatureManagementResource>("en")
                     .AddBaseTypes(
                         typeof(AbpValidationResource)
                     ).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Resources/Domain");
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
index 558f080ea2..5aa0abf998 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs
@@ -3,6 +3,7 @@ using Volo.Abp.Localization;
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.Users;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Identity
 {
@@ -12,15 +13,15 @@ namespace Volo.Abp.Identity
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources.Add<IdentityResource>("en");
+                options.FileSets.AddEmbedded<AbpIdentityDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<IdentityResource>()
+                    .Add<IdentityResource>("en")
                     .AddBaseTypes(
                         typeof(AbpValidationResource)
                     ).AddVirtualJson("/Volo/Abp/Identity/Localization/Domain");
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
index ced458198c..adae510945 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs
@@ -2,6 +2,7 @@
 using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Localization;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.PermissionManagement
 {
@@ -12,16 +13,15 @@ namespace Volo.Abp.PermissionManagement
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources
-                    .Add<AbpPermissionManagementResource>("en");
+                options.FileSets.AddEmbedded<AbpPermissionManagementDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<AbpPermissionManagementResource>()
+                    .Add<AbpPermissionManagementResource>("en")
                     .AddBaseTypes(
                         typeof(AbpValidationResource)
                     ).AddVirtualJson("/Volo/Abp/PermissionManagement/Localization/Domain");
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs
index 7525309a67..5f6f174f82 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs
@@ -1,25 +1,24 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.Localization;
 using Volo.Abp.SettingManagement.Localization;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.SettingManagement
 {
     [DependsOn(typeof(AbpLocalizationModule))]
     public class AbpSettingManagementDomainSharedModule : AbpModule
     {
-
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpLocalizationOptions>(options =>
+            Configure<VirtualFileSystemOptions>(options =>
             {
-                options.Resources
-                    .Add<AbpSettingManagementResource>("en");
+                options.FileSets.AddEmbedded<AbpSettingManagementDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
-                    .Get<AbpSettingManagementResource>()
+                    .Add<AbpSettingManagementResource>("en")
                     .AddVirtualJson("/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement");
             });
         }