Merge branch 'dev' of https://github.com/abpframework/abp into dev

modules/blogging/src/Volo.Blogging.Domain.Shared/Volo.Blogging.Domain.Shared.csproj

@@ -9,6 +9,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <content Remove="Volo\Blogging\Localization\Resources\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Blogging\Localization\Resources\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>

modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Blogging.Localization;
 
@@ -14,6 +15,14 @@ namespace Volo.Blogging
             {
                 options.Resources.Add<BloggingResource>("en");
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<BloggingResource>()
+                    .AddBaseTypes(typeof(AbpValidationResource))
+                    .AddVirtualJson("/Localization/Resources");
+            });
         }
     }
 }

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BloggingHttpApiModule.cs

@@ -1,5 +1,8 @@
-using Volo.Abp.AspNetCore.Mvc;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Blogging.Localization;
 
 namespace Volo.Blogging
 {
@@ -9,5 +12,14 @@ namespace Volo.Blogging
     public class BloggingHttpApiModule : AbpModule
     {
 
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<BloggingResource>()
+                    .AddBaseTypes(typeof(AbpUiResource));
+            });
+        }
     }
 }

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -43,14 +43,6 @@ namespace Volo.Blogging
                 options.FileSets.AddEmbedded<BloggingWebModule>("Volo.Blogging");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<BloggingResource>()
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddBaseTypes(typeof(AbpUiResource))
-                    .AddVirtualJson("/Localization/Resources/Blogging/Web");
-            });
 
             Configure<AbpAutoMapperOptions>(options =>
             {

modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj

@@ -22,14 +22,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/cs.json

@@ -5,6 +5,28 @@
     "Permission:Projects": "Projekty",
     "Permission:Edit": "Upravit",
     "Permission:Delete": "Smazat",
-    "Permission:Create": "Vytvořit"
+    "Permission:Create": "Vytvořit",
+    "Menu:DocumentManagement": "Dokumenty",
+    "Menu:ProjectManagement": "Projekty",
+    "CreateANewProject": "Vytvořit nový projekt",
+    "Edit": "Upravit",
+    "Create": "Vytvořit",
+    "Projects": "Projekty",
+    "Name": "Název",
+    "ShortName": "Krátký název",
+    "DocumentStoreType": "Typ uložiště dokumentu",
+    "Format": "Formát",
+    "ShortNameInfoText": "Bude použíto k unikátnímu URL.",
+    "DisplayName:Name": "Název",
+    "DisplayName:ShortName": "Krátký název",
+    "DisplayName:Format": "Formát",
+    "DisplayName:DefaultDocumentName": "Název výchozího dokumentu",
+    "DisplayName:NavigationDocumentName": "Název navigačního dokumentu",
+    "DisplayName:MinimumVersion": "Nejnižší verze",
+    "DisplayName:MainWebsiteUrl": "URL hlavních webových stránek",
+    "DisplayName:LatestVersionBranchName": "Název poslední verze odvětví",
+    "DisplayName:GitHubRootUrl": "GitHub kořenové URL",
+    "DisplayName:GitHubAccessToken": "GitHub přístupový token",
+    "DisplayName:GitHubUserAgent": "GitHub user agent"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json

@@ -5,6 +5,28 @@
     "Permission:Projects": "Projects",
     "Permission:Edit": "Edit",
     "Permission:Delete": "Delete",
-    "Permission:Create": "Create"
+    "Permission:Create": "Create",
+    "Menu:DocumentManagement": "Documents",
+    "Menu:ProjectManagement": "Projects",
+    "CreateANewProject": "Create new project",
+    "Edit": "Edit",
+    "Create": "Create",
+    "Projects": "Projects",
+    "Name": "Name",
+    "ShortName": "ShortName",
+    "DocumentStoreType": "DocumentStoreType",
+    "Format": "Format",
+    "ShortNameInfoText": "Will be used for unique URL.",
+    "DisplayName:Name": "Name",
+    "DisplayName:ShortName": "Short name",
+    "DisplayName:Format": "Format",
+    "DisplayName:DefaultDocumentName": "Default document name",
+    "DisplayName:NavigationDocumentName": "Navigation document name",
+    "DisplayName:MinimumVersion": "Minimum version",
+    "DisplayName:MainWebsiteUrl": "Main web site URL",
+    "DisplayName:LatestVersionBranchName": "Latest version branch name",
+    "DisplayName:GitHubRootUrl": "GitHub root URL",
+    "DisplayName:GitHubAccessToken": "GitHub access token",
+    "DisplayName:GitHubUserAgent": "GitHub user agent"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pl.json

@@ -5,6 +5,28 @@
     "Permission:Projects": "Projekty",
     "Permission:Edit": "Edytuj",
     "Permission:Delete": "Usuń",
-    "Permission:Create": "Utwórz"
+    "Permission:Create": "Utwórz",
+    "Menu:DocumentManagement": "Dokumenty",
+    "Menu:ProjectManagement": "Projekty",
+    "CreateANewProject": "Utwórz nowy projet",
+    "Edit": "Edytuj",
+    "Create": "Utwórz",
+    "Projects": "Projekty",
+    "Name": "Nazwa",
+    "ShortName": "Krótka nazwa",
+    "DocumentStoreType": "Typ zapisu dokumentu",
+    "Format": "Format",
+    "ShortNameInfoText": "Zostanie użyty do unikalnego URL.",
+    "DisplayName:Name": "Nazwa",
+    "DisplayName:ShortName": "Krótka nazwa",
+    "DisplayName:Format": "Format",
+    "DisplayName:DefaultDocumentName": "Domyślna nazwa dokumentu",
+    "DisplayName:NavigationDocumentName": "Nawigacyjna nazwa dokumentu",
+    "DisplayName:MinimumVersion": "Minimalna wersja",
+    "DisplayName:MainWebsiteUrl": "Adres strony głównej",
+    "DisplayName:LatestVersionBranchName": "Nazwa brancha ostatniej wersji",
+    "DisplayName:GitHubRootUrl": "Adres URL do GitHub'a",
+    "DisplayName:GitHubAccessToken": "GitHub access token",
+    "DisplayName:GitHubUserAgent": "GitHub user agent"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json

@@ -5,6 +5,28 @@
     "Permission:Projects": "Projetos",
     "Permission:Edit": "Editar",
     "Permission:Delete": "Excluir",
-    "Permission:Create": "Criar"
+    "Permission:Create": "Criar",
+    "Menu:DocumentManagement": "Documentos",
+    "Menu:ProjectManagement": "Projetos",
+    "CreateANewProject": "Criar um novo projeto",
+    "Edit": "Editar",
+    "Create": "Criar",
+    "Projects": "Projetos",
+    "Name": "Nome",
+    "ShortName": "Nome Curto",
+    "DocumentStoreType": "DocumentStoreType",
+    "Format": "Formato",
+    "ShortNameInfoText": "Será utilizado para URL única.",
+    "DisplayName:Name": "Nome",
+    "DisplayName:ShortName": "Nome Curto",
+    "DisplayName:Format": "Formatar",
+    "DisplayName:DefaultDocumentName": "Nome padrão do documento",
+    "DisplayName:NavigationDocumentName": "Nome de navegação do documento",
+    "DisplayName:MinimumVersion": "VErsão mínima",
+    "DisplayName:MainWebsiteUrl": "URL do site principal",
+    "DisplayName:LatestVersionBranchName": "Nome do branch da última versão",
+    "DisplayName:GitHubRootUrl": "URL raíz do GitHub",
+    "DisplayName:GitHubAccessToken": "Token de acesso do GitHub",
+    "DisplayName:GitHubUserAgent": "Usuário agente do GitHub"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/tr.json

@@ -5,6 +5,27 @@
     "Permission:Projects": "Projeler",
     "Permission:Edit": "Düzenle",
     "Permission:Delete": "Sil",
-    "Permission:Create": "Oluştur"
+    "Permission:Create": "Oluştur",
+    "Menu:DocumentManagement": "Dökümanlar",
+    "Menu:ProjectManagement": "Projeler",
+    "CreateANewProject": "Yeni proje oluştur",
+    "Edit": "Düzenle",
+    "Create": "Yeni oluştur",
+    "Projects": "Projeler",
+    "Name": "İsim",
+    "ShortName": "Kısa isim",
+    "DocumentStoreType": "Döküman saklama tipi",
+    "Format": "Format",
+    "ShortNameInfoText": "URL oluştururken kullanılacak.",
+    "DisplayName:Name": "Adı",
+    "DisplayName:ShortName": "Kısa adı",
+    "DisplayName:Format": "Format",
+    "DisplayName:DefaultDocumentName": "Varsayılan döküman adı",
+    "DisplayName:NavigationDocumentName": "Navigasyon dökümanı adı",
+    "DisplayName:MinimumVersion": "Minimum versiyon",
+    "DisplayName:MainWebsiteUrl": "Ana web site URL",
+    "DisplayName:LatestVersionBranchName": "Son versiyon Branch adı",
+    "DisplayName:GitHubRootUrl": "GitHub kök adresi",
+    "DisplayName:GitHubAccessToken": "GitHub erişim token"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/vi.sjon

@@ -5,6 +5,28 @@
     "Permission:Projects": "Dự án",
     "Permission:Edit": "Sửa",
     "Permission:Delete": "Xóa",
-    "Permission:Create": "Tạo"
+    "Permission:Create": "Tạo",
+    "Menu:DocumentManagement": "Tài liệu",
+    "Menu:ProjectManagement": "Dự án",
+    "CreateANewProject": "Tạo dự án mới",
+    "Edit": "Sửa",
+    "Create": "Tạo",
+    "Projects": "Dự án",
+    "Name": "Tên",
+    "ShortName": "Tên rút gọn",
+    "DocumentStoreType": "DocumentStoreType",
+    "Format": "Định dạng",
+    "ShortNameInfoText": "Sẽ được sử dụng cho URL duy nhất..",
+    "DisplayName:Name": "Tên",
+    "DisplayName:ShortName": "Tên rút gọn",
+    "DisplayName:Format": "Định dạng",
+    "DisplayName:DefaultDocumentName": "Tên tài liệu mặc định",
+    "DisplayName:NavigationDocumentName": "Tên tài liệu điều hướng",
+    "DisplayName:MinimumVersion": "Phiên bản tối thiểu",
+    "DisplayName:MainWebsiteUrl": "URL trang web chính",
+    "DisplayName:LatestVersionBranchName": "Tên nhánh phiên bản mới nhất",
+    "DisplayName:GitHubRootUrl": "URL gốc của GitHub",
+    "DisplayName:GitHubAccessToken": "GitHub access token",
+    "DisplayName:GitHubUserAgent": "GitHub user agent"
   }
 }

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/zh-Hans.json

@@ -1,10 +1,32 @@
 {
     "culture": "zh-Hans",
-    "texts": {
+  "texts": {
-      "Permission:DocumentManagement": "文档管理",
+    "Permission:DocumentManagement": "文档管理",
-      "Permission:Projects": "项目",
+    "Permission:Projects": "项目",
-      "Permission:Edit": "编辑",
+    "Permission:Edit": "编辑",
-      "Permission:Delete": "删除",
+    "Permission:Delete": "删除",
-      "Permission:Create": "创建"
+    "Permission:Create": "创建",
-    }
+    "Menu:DocumentManagement": "文档",
+    "Menu:ProjectManagement": "项目",
+    "CreateANewProject": "创建新项目",
+    "Edit": "编辑",
+    "Create": "创建",
+    "Projects": "项目",
+    "Name": "名称",
+    "ShortName": "简称",
+    "DocumentStoreType": "文件存储类型",
+    "Format": "格式",
+    "ShortNameInfoText": "将用于唯一的URL.",
+    "DisplayName:Name": "名称",
+    "DisplayName:ShortName": "简称",
+    "DisplayName:Format": "格式",
+    "DisplayName:DefaultDocumentName": "默认文档名称",
+    "DisplayName:NavigationDocumentName": "导航文档名称",
+    "DisplayName:MinimumVersion": "最低版本",
+    "DisplayName:MainWebsiteUrl": "主网站网址",
+    "DisplayName:LatestVersionBranchName": "最新版本的分支名称",
+    "DisplayName:GitHubRootUrl": "GitHub根网址",
+    "DisplayName:GitHubAccessToken": "GitHub访问令牌",
+    "DisplayName:GitHubUserAgent": "GitHub用户代理"
+  }
   }

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocsAdminHttpApiModule.cs

@@ -1,5 +1,8 @@
-using Volo.Abp.AspNetCore.Mvc;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Docs.Localization;
 
 namespace Volo.Docs.Admin
 {
@@ -9,6 +12,15 @@ namespace Volo.Docs.Admin
         )]
     public class DocsAdminHttpApiModule : AbpModule
     {
-        
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<DocsResource>()
+                    .AddBaseTypes(typeof(AbpUiResource));
+            });
+        }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs

@@ -40,15 +40,6 @@ namespace Volo.Docs.Admin
                 options.FileSets.AddEmbedded<DocsAdminWebModule>("Volo.Docs.Admin");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<DocsResource>()
-                    .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddBaseTypes(typeof(AbpUiResource))
-                    .AddVirtualJson("/Localization/Resources/Docs/Web");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<DocsAdminWebAutoMapperProfile>(validate: true);

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/cs.json

@@ -1,27 +0,0 @@
-{
-  "culture": "cs",
-  "texts": {
-    "Menu:DocumentManagement": "Dokumenty",
-    "Menu:ProjectManagement": "Projekty",
-    "CreateANewProject": "Vytvořit nový projekt",
-    "Edit": "Upravit",
-    "Create": "Vytvořit",
-    "Projects": "Projekty",
-    "Name": "Název",
-    "ShortName": "Krátký název",
-    "DocumentStoreType": "Typ uložiště dokumentu",
-    "Format": "Formát",
-    "ShortNameInfoText": "Bude použíto k unikátnímu URL.",
-    "DisplayName:Name": "Název",
-    "DisplayName:ShortName": "Krátký název",
-    "DisplayName:Format": "Formát",
-    "DisplayName:DefaultDocumentName": "Název výchozího dokumentu",
-    "DisplayName:NavigationDocumentName": "Název navigačního dokumentu",
-    "DisplayName:MinimumVersion": "Nejnižší verze",
-    "DisplayName:MainWebsiteUrl": "URL hlavních webových stránek",
-    "DisplayName:LatestVersionBranchName": "Název poslední verze odvětví",
-    "DisplayName:GitHubRootUrl": "GitHub kořenové URL",
-    "DisplayName:GitHubAccessToken": "GitHub přístupový token",
-    "DisplayName:GitHubUserAgent": "GitHub user agent"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/en.json

@@ -1,27 +0,0 @@
-{
-  "culture": "en",
-  "texts": {
-    "Menu:DocumentManagement": "Documents",
-    "Menu:ProjectManagement": "Projects",
-    "CreateANewProject": "Create new project",
-    "Edit": "Edit",
-    "Create": "Create",
-    "Projects": "Projects",
-    "Name": "Name",
-    "ShortName": "ShortName",
-    "DocumentStoreType": "DocumentStoreType",
-    "Format": "Format",
-    "ShortNameInfoText": "Will be used for unique URL.",
-    "DisplayName:Name": "Name",
-    "DisplayName:ShortName": "Short name",
-    "DisplayName:Format": "Format",
-    "DisplayName:DefaultDocumentName": "Default document name",
-    "DisplayName:NavigationDocumentName": "Navigation document name",
-    "DisplayName:MinimumVersion": "Minimum version",
-    "DisplayName:MainWebsiteUrl": "Main web site URL",
-    "DisplayName:LatestVersionBranchName": "Latest version branch name",
-    "DisplayName:GitHubRootUrl": "GitHub root URL",
-    "DisplayName:GitHubAccessToken": "GitHub access token",
-    "DisplayName:GitHubUserAgent": "GitHub user agent"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/pl.json

@@ -1,27 +0,0 @@
-{
-  "culture": "pl",
-  "texts": {
-    "Menu:DocumentManagement": "Dokumenty",
-    "Menu:ProjectManagement": "Projekty",
-    "CreateANewProject": "Utwórz nowy projet",
-    "Edit": "Edytuj",
-    "Create": "Utwórz",
-    "Projects": "Projekty",
-    "Name": "Nazwa",
-    "ShortName": "Krótka nazwa",
-    "DocumentStoreType": "Typ zapisu dokumentu",
-    "Format": "Format",
-    "ShortNameInfoText": "Zostanie użyty do unikalnego URL.",
-    "DisplayName:Name": "Nazwa",
-    "DisplayName:ShortName": "Krótka nazwa",
-    "DisplayName:Format": "Format",
-    "DisplayName:DefaultDocumentName": "Domyślna nazwa dokumentu",
-    "DisplayName:NavigationDocumentName": "Nawigacyjna nazwa dokumentu",
-    "DisplayName:MinimumVersion": "Minimalna wersja",
-    "DisplayName:MainWebsiteUrl": "Adres strony głównej",
-    "DisplayName:LatestVersionBranchName": "Nazwa brancha ostatniej wersji",
-    "DisplayName:GitHubRootUrl": "Adres URL do GitHub'a",
-    "DisplayName:GitHubAccessToken": "GitHub access token",
-    "DisplayName:GitHubUserAgent": "GitHub user agent"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/pt-BR.json

@@ -1,27 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-    "Menu:DocumentManagement": "Documentos",
-    "Menu:ProjectManagement": "Projetos",
-    "CreateANewProject": "Criar um novo projeto",
-    "Edit": "Editar",
-    "Create": "Criar",
-    "Projects": "Projetos",
-    "Name": "Nome",
-    "ShortName": "Nome Curto",
-    "DocumentStoreType": "DocumentStoreType",
-    "Format": "Formato",
-    "ShortNameInfoText": "Será utilizado para URL única.",
-    "DisplayName:Name": "Nome",
-    "DisplayName:ShortName": "Nome Curto",
-    "DisplayName:Format": "Formatar",
-    "DisplayName:DefaultDocumentName": "Nome padrão do documento",
-    "DisplayName:NavigationDocumentName": "Nome de navegação do documento",
-    "DisplayName:MinimumVersion": "VErsão mínima",
-    "DisplayName:MainWebsiteUrl": "URL do site principal",
-    "DisplayName:LatestVersionBranchName": "Nome do branch da última versão",
-    "DisplayName:GitHubRootUrl": "URL raíz do GitHub",
-    "DisplayName:GitHubAccessToken": "Token de acesso do GitHub",
-    "DisplayName:GitHubUserAgent": "Usuário agente do GitHub"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json

@@ -1,26 +0,0 @@
-{
-  "culture": "tr",
-  "texts": {
-    "Menu:DocumentManagement": "Dökümanlar",
-    "Menu:ProjectManagement": "Projeler",
-    "CreateANewProject": "Yeni proje oluştur",
-    "Edit": "Düzenle",
-    "Create": "Yeni oluştur",
-    "Projects": "Projeler",
-    "Name": "İsim",
-    "ShortName": "Kısa isim",
-    "DocumentStoreType": "Döküman saklama tipi",
-    "Format": "Format",
-    "ShortNameInfoText": "URL oluştururken kullanılacak.",
-    "DisplayName:Name": "Adı",
-    "DisplayName:ShortName": "Kısa adı",
-    "DisplayName:Format": "Format",
-    "DisplayName:DefaultDocumentName": "Varsayılan döküman adı",
-    "DisplayName:NavigationDocumentName": "Navigasyon dökümanı adı",
-    "DisplayName:MinimumVersion": "Minimum versiyon",
-    "DisplayName:MainWebsiteUrl": "Ana web site URL",
-    "DisplayName:LatestVersionBranchName": "Son versiyon Branch adı",
-    "DisplayName:GitHubRootUrl": "GitHub kök adresi",
-    "DisplayName:GitHubAccessToken": "GitHub erişim token"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/vi.json

@@ -1,27 +0,0 @@
-{
-  "culture": "vi",
-  "texts": {
-    "Menu:DocumentManagement": "Tài liệu",
-    "Menu:ProjectManagement": "Dự án",
-    "CreateANewProject": "Tạo dự án mới",
-    "Edit": "Sửa",
-    "Create": "Tạo",
-    "Projects": "Dự án",
-    "Name": "Tên",
-    "ShortName": "Tên rút gọn",
-    "DocumentStoreType": "DocumentStoreType",
-    "Format": "Định dạng",
-    "ShortNameInfoText": "Sẽ được sử dụng cho URL duy nhất..",
-    "DisplayName:Name": "Tên",
-    "DisplayName:ShortName": "Tên rút gọn",
-    "DisplayName:Format": "Định dạng",
-    "DisplayName:DefaultDocumentName": "Tên tài liệu mặc định",
-    "DisplayName:NavigationDocumentName": "Tên tài liệu điều hướng",
-    "DisplayName:MinimumVersion": "Phiên bản tối thiểu",
-    "DisplayName:MainWebsiteUrl": "URL trang web chính",
-    "DisplayName:LatestVersionBranchName": "Tên nhánh phiên bản mới nhất",
-    "DisplayName:GitHubRootUrl": "URL gốc của GitHub",
-    "DisplayName:GitHubAccessToken": "GitHub access token",
-    "DisplayName:GitHubUserAgent": "GitHub user agent"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/zh-Hans.json

@@ -1,27 +0,0 @@
-{
-    "culture": "zh-Hans",
-    "texts": {
-      "Menu:DocumentManagement": "文档",
-      "Menu:ProjectManagement": "项目",
-      "CreateANewProject": "创建新项目",
-      "Edit": "编辑",
-      "Create": "创建",
-      "Projects": "项目",
-      "Name": "名称",
-      "ShortName": "简称",
-      "DocumentStoreType": "文件存储类型",
-      "Format": "格式",
-      "ShortNameInfoText": "将用于唯一的URL.",
-      "DisplayName:Name": "名称",
-      "DisplayName:ShortName": "简称",
-      "DisplayName:Format": "格式",
-      "DisplayName:DefaultDocumentName": "默认文档名称",
-      "DisplayName:NavigationDocumentName": "导航文档名称",
-      "DisplayName:MinimumVersion": "最低版本",
-      "DisplayName:MainWebsiteUrl": "主网站网址",
-      "DisplayName:LatestVersionBranchName": "最新版本的分支名称",
-      "DisplayName:GitHubRootUrl": "GitHub根网址",
-      "DisplayName:GitHubAccessToken": "GitHub访问令牌",
-      "DisplayName:GitHubUserAgent": "GitHub用户代理"
-  }
-}

modules/docs/src/Volo.Docs.Admin.Web/Volo.Docs.Admin.Web.csproj

@@ -27,7 +27,6 @@
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.css" />
     <EmbeddedResource Include="Pages\**\*.js" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,7 +34,6 @@
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
-    <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="Properties\launchSettings.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.csproj

@@ -11,14 +11,6 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\ApplicationContracts\*.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Remove="Volo\Abp\FeatureManagement\Localization\ApplicationContracts\*.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.FeatureManagement.Domain.Shared\Volo.Abp.FeatureManagement.Domain.Shared.csproj" />
   </ItemGroup>

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs

@@ -1,6 +1,4 @@
 using Volo.Abp.Application;
-using Volo.Abp.FeatureManagement.Localization;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
@@ -18,13 +16,6 @@ namespace Volo.Abp.FeatureManagement
             {
                 options.FileSets.AddEmbedded<AbpFeatureManagementApplicationContractsModule>();
             });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpFeatureManagementResource>()
-                    .AddVirtualJson("/Volo/Abp/FeatureManagement/Localization/ApplicationContracts");
-            });
         }
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/cs.json

@@ -1,6 +0,0 @@
-{
-  "culture": "cs",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/en.json

@@ -1,6 +0,0 @@
-{
-  "culture": "en",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/pl.json

@@ -1,6 +0,0 @@
-{
-  "culture": "pl",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/pt-BR.json

@@ -1,6 +0,0 @@
-{
-  "culture": "pt-BR",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/vi.json

@@ -1,6 +0,0 @@
-{
-  "culture": "vi",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/Localization/ApplicationContracts/zh-Hans.json

@@ -1,6 +0,0 @@
-{
-  "culture": "zh-Hans",
-  "texts": {
-
-  }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj

@@ -7,6 +7,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs

@@ -1,5 +1,6 @@
 using Volo.Abp.FeatureManagement.Localization;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.FeatureManagement
@@ -15,6 +16,15 @@ namespace Volo.Abp.FeatureManagement
             {
                 options.Resources.Add<AbpFeatureManagementResource>("en");
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpFeatureManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource)
+                    ).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Resources/Domain");
+            });
         }
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/AbpFeatureManagementHttpApiModule.cs

@@ -1,4 +1,7 @@
-using Volo.Abp.AspNetCore.Mvc;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.FeatureManagement
@@ -8,6 +11,14 @@ namespace Volo.Abp.FeatureManagement
         typeof(AbpAspNetCoreMvcModule))]
     public class AbpFeatureManagementHttpApiModule : AbpModule
     {
-        
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpFeatureManagementResource>()
+                    .AddBaseTypes(typeof(AbpUiResource));
+            });
+        }
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs

@@ -34,16 +34,6 @@ namespace Volo.Abp.FeatureManagement
                 options.FileSets.AddEmbedded<AbpFeatureManagementWebModule>("Volo.Abp.FeatureManagement");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpFeatureManagementResource>()
-                    .AddBaseTypes(
-                        typeof(AbpValidationResource),
-                        typeof(AbpUiResource)
-                    ).AddVirtualJson("/Localization/Resources/FeatureManagement");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<FeatureManagementWebAutoMapperProfile>(validate: true);

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj

@@ -14,11 +14,9 @@
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo.Abp.Identity.Domain.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -13,6 +13,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <content Remove="Volo\Abp\Identity\Localization\Domain\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\Identity\Localization\Domain\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\users\src\Volo.Abp.Users.Domain.Shared\Volo.Abp.Users.Domain.Shared.csproj" />
     

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs

@@ -1,5 +1,6 @@
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.Users;
 
@@ -15,6 +16,15 @@ namespace Volo.Abp.Identity
             {
                 options.Resources.Add<IdentityResource>("en");
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<IdentityResource>()
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource)
+                    ).AddVirtualJson("/Volo/Abp/Identity/Localization/Domain");
+            });
         }
     }
 }

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/AbpIdentityHttpApiModule.cs

@@ -1,11 +1,24 @@
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Identity.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Localization.Resources.AbpUi;
 
 namespace Volo.Abp.Identity
 {
     [DependsOn(typeof(AbpIdentityApplicationContractsModule), typeof(AbpAspNetCoreMvcModule))]
     public class AbpIdentityHttpApiModule : AbpModule
     {
-        
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<IdentityResource>()
+                    .AddBaseTypes(
+                        typeof(AbpUiResource)
+                    );
+            });
+        }
     }
 }

modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs

@@ -45,16 +45,6 @@ namespace Volo.Abp.Identity.Web
                 options.FileSets.AddEmbedded<AbpIdentityWebModule>("Volo.Abp.Identity.Web");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<IdentityResource>()
-                    .AddBaseTypes(
-                        typeof(AbpValidationResource),
-                        typeof(AbpUiResource)
-                    ).AddVirtualJson("/Localization/Resources/AbpIdentity");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<AbpIdentityWebAutoMapperProfile>(validate: true);

modules/identity/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj

@@ -16,14 +16,12 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
     <Content Remove="Properties\launchSettings.json" />

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo.Abp.PermissionManagement.Domain.Shared.csproj

@@ -13,6 +13,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <content Remove="Volo\Abp\PermissionManagement\Localization\Domain\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\PermissionManagement\Localization\Domain\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs

@@ -1,4 +1,5 @@
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Localization;
 
@@ -16,6 +17,15 @@ namespace Volo.Abp.PermissionManagement
                 options.Resources
                     .Add<AbpPermissionManagementResource>("en");
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpPermissionManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource)
+                    ).AddVirtualJson("/Volo/Abp/PermissionManagement/Localization/Domain");
+            });
         }
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/AbpPermissionManagementHttpApiModule.cs

@@ -1,5 +1,8 @@
-using Volo.Abp.AspNetCore.Mvc;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.Localization;
 
 namespace Volo.Abp.PermissionManagement.HttpApi
 {
@@ -9,6 +12,16 @@ namespace Volo.Abp.PermissionManagement.HttpApi
         )]
     public class AbpPermissionManagementHttpApiModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpPermissionManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpUiResource)
+                    );
+            });
+        }
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs

@@ -32,16 +32,6 @@ namespace Volo.Abp.PermissionManagement.Web
                 options.FileSets.AddEmbedded<AbpPermissionManagementWebModule>("Volo.Abp.PermissionManagement.Web");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpPermissionManagementResource>()
-                    .AddBaseTypes(
-                        typeof(AbpValidationResource),
-                        typeof(AbpUiResource)
-                     ).AddVirtualJson("/Localization/Resources/AbpPermissionManagement");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<AbpPermissionManagementWebAutoMapperProfile>(validate: true);

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Volo.Abp.PermissionManagement.Web.csproj

@@ -15,11 +15,9 @@
     <EmbeddedResource Include="Pages\**\*.cshtml" />
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Pages\**\*.css" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo.Abp.SettingManagement.Domain.Shared.csproj

@@ -14,7 +14,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <Content Remove="Volo\Abp\SettingManagement\Localization\Resources\AbpSettingManagement\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\SettingManagement\Localization\Resources\AbpSettingManagement\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
 </Project>

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs

@@ -1,9 +1,27 @@
 using Volo.Abp.Modularity;
+using Volo.Abp.Localization;
+using Volo.Abp.SettingManagement.Localization;
 
 namespace Volo.Abp.SettingManagement
 {
+    [DependsOn(typeof(AbpLocalizationModule))]
     public class AbpSettingManagementDomainSharedModule : AbpModule
     {
-        
+
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<AbpSettingManagementResource>("en");
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpSettingManagementResource>()
+                    .AddVirtualJson("/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement");
+            });
+        }
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs

@@ -1,7 +1,5 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Volo.Abp.SettingManagement.Localization;
 using Volo.Abp.SettingManagement.Web.Navigation;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -9,7 +7,8 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.SettingManagement.Web
 {
     [DependsOn(
-        typeof(AbpAspNetCoreMvcUiThemeSharedModule)
+        typeof(AbpAspNetCoreMvcUiThemeSharedModule),
+        typeof(AbpSettingManagementDomainSharedModule)
         )]
     public class AbpSettingManagementWebModule : AbpModule
     {
@@ -24,19 +23,6 @@ namespace Volo.Abp.SettingManagement.Web
             {
                 options.FileSets.AddEmbedded<AbpSettingManagementWebModule>("Volo.Abp.SettingManagement.Web");
             });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Add<AbpSettingManagementResource>("en");
-            });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpSettingManagementResource>()
-                    .AddVirtualJson("/Localization/Resources/AbpSettingManagement");
-            });
         }
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs

@@ -4,9 +4,9 @@ using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using System.Linq;
 using System.Threading.Tasks;
-using Volo.Abp.SettingManagement.Localization;
 using Volo.Abp.SettingManagement.Web.Pages.SettingManagement;
 using Volo.Abp.UI.Navigation;
+using Volo.Abp.SettingManagement.Localization;
 
 namespace Volo.Abp.SettingManagement.Web.Navigation
 {

modules/setting-management/src/Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj

@@ -15,18 +15,17 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
+    <ProjectReference Include="..\Volo.Abp.SettingManagement.Domain.Shared\Volo.Abp.SettingManagement.Domain.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
-    <EmbeddedResource Include="Localization\Resources\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="Properties\launchSettings.json" />
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo.Abp.TenantManagement.Domain.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -13,6 +13,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Remove="Volo\Abp\TenantManagement\Localization\Resources\*.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Volo\Abp\TenantManagement\Localization\Resources\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Localization;
 
@@ -13,6 +14,15 @@ namespace Volo.Abp.TenantManagement
             {
                 options.Resources.Add<AbpTenantManagementResource>("en");
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpTenantManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpValidationResource)
+                    ).AddVirtualJson("/Volo/Abp/TenantManagement/Localization/Resources");
+            });
         }
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo.Abp.TenantManagement.HttpApi.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\..\common.props" />
 
@@ -17,6 +17,7 @@
     <ProjectReference Include="..\Volo.Abp.TenantManagement.Application.Contracts\Volo.Abp.TenantManagement.Application.Contracts.csproj" />
 
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\..\..\feature-management\src\Volo.Abp.FeatureManagement.HttpApi\Volo.Abp.FeatureManagement.HttpApi.csproj" />
   </ItemGroup>
 
 </Project>

modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/AbpTenantManagementHttpApiModule.cs

@@ -1,14 +1,30 @@
-using Volo.Abp.AspNetCore.Mvc;
+using Localization.Resources.AbpUi;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.FeatureManagement;
+using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.TenantManagement.Localization;
 
 namespace Volo.Abp.TenantManagement
 {
     [DependsOn(
         typeof(AbpTenantManagementApplicationContractsModule),
+        typeof(AbpFeatureManagementHttpApiModule),
         typeof(AbpAspNetCoreMvcModule)
         )]
     public class AbpTenantManagementHttpApiModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Get<AbpTenantManagementResource>()
+                    .AddBaseTypes(
+                        typeof(AbpFeatureManagementResource),
+                        typeof(AbpUiResource));
+            });
+        }
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs

@@ -42,17 +42,6 @@ namespace Volo.Abp.TenantManagement.Web
                 options.FileSets.AddEmbedded<AbpTenantManagementWebModule>("Volo.Abp.TenantManagement.Web");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<AbpTenantManagementResource>()
-                    .AddBaseTypes(
-                        typeof(AbpValidationResource),
-                        typeof(AbpFeatureManagementResource),
-                        typeof(AbpUiResource)
-                    ).AddVirtualJson("/Localization/Resources/AbpTenantManagement/Web");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<AbpTenantManagementWebAutoMapperProfile>(validate: true);

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj

@@ -13,14 +13,12 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
-    <EmbeddedResource Include="Localization\Resources\AbpTenantManagement\Web\*.json" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
-    <Content Remove="Localization\Resources\**\*.json" />
     <Content Remove="compilerconfig.json" />
     <Content Remove="compilerconfig.json.defaults" />
     <Content Remove="Properties\launchSettings.json" />