Move localization to domain.shared

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/cs.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/en.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/pl.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/pt-BR.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Localization/MyProjectName/ApplicationContracts/vi.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj

@@ -15,9 +15,4 @@
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Localization\MyProjectName\ApplicationContracts\*.json" />
-    <Content Remove="Localization\MyProjectName\ApplicationContracts\*.json" />
-  </ItemGroup>
-
 </Project>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj

@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\MyProjectName\DomainShared\*.json" />
-    <Content Remove="Localization\MyProjectName\DomainShared\*.json" />
+    <EmbeddedResource Include="Localization\MyProjectName\*.json" />
+    <Content Remove="Localization\MyProjectName\*.json" />
   </ItemGroup>
 
 </Project>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs

@@ -24,7 +24,7 @@ namespace MyCompanyName.MyProjectName
                 options.Resources
                     .Add<MyProjectNameResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/MyProjectName/DomainShared");
+                    .AddVirtualJson("/Localization/MyProjectName");
             });
 
             Configure<ExceptionLocalizationOptions>(options =>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/cs.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/en.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/pl.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/pt-BR.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Localization/MyProjectName/Web/vi.json

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

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -20,10 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\MyProjectName\Web\*.json" />
     <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
-    <Content Remove="Localization\MyProjectName\Web\*.json" />
     <Content Remove="Pages\**\*.cshtml" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -1,11 +1,9 @@
-using Localization.Resources.AbpUi;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Localization;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -39,14 +37,6 @@ namespace MyCompanyName.MyProjectName.Web
                 options.FileSets.AddEmbedded<MyProjectNameWebModule>("MyCompanyName.MyProjectName");
             });
 
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                    .Get<MyProjectNameResource>()
-                    .AddBaseTypes(typeof(AbpUiResource))
-                    .AddVirtualJson("/Localization/MyProjectName/Web");
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 /* Using `true` for the `validate` parameter to