From 2aa70bf9cb89e2c09ba2cbf0d048b5427c2b28db Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 11 Oct 2019 11:43:34 +0300
Subject: [PATCH] Feature Management localization fixes

---
 .../Volo.Abp.FeatureManagement.Domain.Shared.csproj  |  2 +-
 .../AbpFeatureManagementDomainSharedModule.cs        |  2 +-
 .../FeatureManagement/Localization/Domain/en.json    |  2 +-
 .../Volo.Abp.FeatureManagement.Domain.csproj         |  5 -----
 .../AbpFeatureManagementDomainModule.cs              | 12 ------------
 .../FeatureManagement/Localization/Domain/cs.json    |  6 ------
 .../FeatureManagement/Localization/Domain/en.json    |  6 ------
 .../FeatureManagement/Localization/Domain/pl.json    |  6 ------
 .../FeatureManagement/Localization/Domain/pt-BR.json |  6 ------
 .../FeatureManagement/Localization/Domain/tr.json    |  6 ------
 .../FeatureManagement/Localization/Domain/vi.json    |  6 ------
 .../Localization/Domain/zh-Hans.json                 |  6 ------
 12 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/cs.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/en.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pl.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/vi.json
 delete mode 100644 modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj
index 1772c74748..5990dc210c 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
     <EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
+    <content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
   </ItemGroup>
 
   <ItemGroup>
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 0008faf693..95bff48f2e 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
@@ -24,7 +24,7 @@ namespace Volo.Abp.FeatureManagement
                     .Add<AbpFeatureManagementResource>("en")
                     .AddBaseTypes(
                         typeof(AbpValidationResource)
-                    ).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Resources/Domain");
+                    ).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Domain");
             });
         }
     }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
index 2e8812968d..e5a2406aaf 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
@@ -2,6 +2,6 @@
   "culture": "en",
   "texts": {
     "Features": "Features",
-    "NoFeatureFoundMessage": "There is't any available feature."
+    "NoFeatureFoundMessage": "There isn't any available feature."
   }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.csproj
index 15145798e2..8b29b704ce 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.csproj
@@ -13,11 +13,6 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
-    <Content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.FeatureManagement.Domain.Shared\Volo.Abp.FeatureManagement.Domain.Shared.csproj" />
   </ItemGroup>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
index 0958746237..22b845eeaa 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
@@ -27,18 +27,6 @@ namespace Volo.Abp.FeatureManagement
                 options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures";
             });
 
-            Configure<VirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<AbpFeatureManagementDomainModule>();
-            });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpFeatureManagementResource>()
-                    .AddVirtualJson("/Volo/Abp/FeatureManagement/Localization/Domain");
-            });
-
             Configure<ExceptionLocalizationOptions>(options =>
             {
                 options.MapCodeNamespace("AbpFeatureManagement", typeof(AbpFeatureManagementResource));
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/cs.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/cs.json
deleted file mode 100644
index 6a060a54c1..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/cs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "cs",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/en.json
deleted file mode 100644
index 92e4e9582b..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "en",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pl.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pl.json
deleted file mode 100644
index 2ea227cbf3..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pl.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "pl",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
deleted file mode 100644
index 6d746df04c..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/tr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
deleted file mode 100644
index 3f906a3cdc..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "tr",
-  "texts": {
-
-  }
-}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/vi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/vi.json
deleted file mode 100644
index d8eb5f3c75..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/vi.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "vi",
-  "texts": {
-
-  }
-}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
deleted file mode 100644
index 25137f1ee3..0000000000
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "culture": "zh-Hans",
-  "texts": {
-
-  }
-}
\ No newline at end of file