move AbpValidationResource to Volo.Abp.Validation from Volo.Abp.Localization

framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj

@@ -14,6 +14,7 @@
   </PropertyGroup>
   
   <ItemGroup>
+    <None Remove="Volo\Abp\Localization\Resources\**\*.json" />
     <EmbeddedResource Include="Volo\Abp\Localization\Resources\**\*.json" />
   </ItemGroup>
   

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs

@@ -1,4 +1,5 @@
-using Volo.Abp.Localization.Resources.AbpValidation;
+using Volo.Abp.Localization.Resources.AbpLocalization;
+using Volo.Abp.Localization.Resources.AbpValidation;
 using Volo.Abp.Modularity;
 using Volo.Abp.Settings;
 using Volo.Abp.VirtualFileSystem;
@@ -27,10 +28,16 @@ namespace Volo.Abp.Localization
                     .Resources
                     .Add<DefaultResource>("en");
 
+                //TODO: Obsolete, Remove in the future version
                 options
                     .Resources
                     .Add<AbpValidationResource>("en")
-                    .AddVirtualJson("/Localization/Resources/AbpValidation");
+                    .AddVirtualJson("/Volo/Abp/Validation/Localization");//load from Volo.Abp.Validation
+
+                options
+                    .Resources
+                    .Add<AbpLocalizationResource>("en")
+                    .AddVirtualJson("/Localization/Resources/AbpLocalization");
             });
         }
     }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/AbpLocalizationResource.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Volo.Abp.Localization.Resources.AbpLocalization
+{
+    [LocalizationResourceName("AbpLocalization")]
+    public class AbpLocalizationResource
+    {
+        
+    }
+}

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/en.json

@@ -0,0 +1,7 @@
+{
+  "culture": "en",
+  "texts": {
+    "DisplayName:Abp.Localization.DefaultLanguage": "Default language",
+    "Description:Abp.Localization.DefaultLanguage": "The default language of the application."
+  }
+}

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpLocalization/zh-Hans.json

@@ -0,0 +1,7 @@
+{
+  "culture": "zh-Hans",
+  "texts": {
+    "DisplayName:Abp.Localization.DefaultLanguage": "默认语言",
+    "Description:Abp.Localization.DefaultLanguage": "应用程序的默认语言."
+  }
+}

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpValidation/AbpValidationResource.cs

@@ -1,8 +1,11 @@
-namespace Volo.Abp.Localization.Resources.AbpValidation
+using System;
+
+namespace Volo.Abp.Localization.Resources.AbpValidation
 {
     //TODO: Move to Volo.Abp.Validation!
 
     [LocalizationResourceName("AbpValidation")]
+    [Obsolete("This resource is obsolete.Use Volo.Abp.Validation.Localization.AbpValidationResource instead.", false)]
     public class AbpValidationResource
     {
         

framework/src/Volo.Abp.Validation/Volo.Abp.Validation.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\common.props" />
 
@@ -13,8 +13,14 @@
     <RootNamespace />
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Volo\Abp\Validation\Localization\*.json" />
+    <EmbeddedResource Include="Volo\Abp\Validation\Localization\*.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/AbpValidationModule.cs

@@ -1,10 +1,16 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.Validation.Localization;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Validation
 {
+    [DependsOn(
+        typeof(AbpLocalizationModule)
+        )]
     public class AbpValidationModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
@@ -12,6 +18,20 @@ namespace Volo.Abp.Validation
             context.Services.OnRegistred(ValidationInterceptorRegistrar.RegisterIfNeeded);
             AutoAddObjectValidationContributors(context.Services);
         }
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpValidationResource>();
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<AbpValidationResource>("en")
+                    .AddVirtualJson("/Volo/Abp/Validation/Localization");
+            });
+        }
 
         private static void AutoAddObjectValidationContributors(IServiceCollection services)
         {

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/AbpValidationResource.cs

@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.Validation.Localization
+{
+    [LocalizationResourceName("AbpValidation")]
+    public class AbpValidationResource
+    {
+        
+    }
+}

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpValidation/en.json → framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/en.json

@@ -29,8 +29,6 @@
     "ThisFieldMustBeAStringWithAMaximumLengthOf{0}": "This field must be a string with a maximum length of {0}.",
     "ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}": "This field must be a string with a minimum length of {1} and a maximum length of {0}.",
     "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "This field is not a valid fully-qualified http, https, or ftp URL.",
-    "ThisFieldIsInvalid.": "This field is invalid.",
+    "ThisFieldIsInvalid.": "This field is invalid."
-    "DisplayName:Abp.Localization.DefaultLanguage": "Default language",
-    "Description:Abp.Localization.DefaultLanguage": "The default language of the application."
   }
 }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/Resources/AbpValidation/zh-Hans.json → framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/zh-Hans.json

@@ -29,8 +29,6 @@
     "ThisFieldMustBeAStringWithAMaximumLengthOf{0}": "字段必须是长度为{0}的字符串.",
     "ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}": "字段必须是最小长度为{1}并且最大长度{*}的字符串.",
     "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "字段{0}不是有效的完全限定的http,https或ftp URL.",
-    "ThisFieldIsInvalid.": "该字段无效.",
+    "ThisFieldIsInvalid.": "该字段无效."
-    "DisplayName:Abp.Localization.DefaultLanguage": "默认语言",
-    "Description:Abp.Localization.DefaultLanguage": "应用程序的默认语言."
   }
 }