Merge pull request #8271 from abpframework/multi-lingual-refactor

Remove multi-lingual objects feature
abpframework · Mar 30, 2021 · 62c86c4 · 62c86c4
2 parents d771426 + e0f3ecc
commit 62c86c4
Show file tree

Hide file tree

Showing 32 changed files with 75 additions and 524 deletions.
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
@@ -376,10 +376,6 @@
                   "text": "Entities & Aggregate Roots",
                   "path": "Entities.md"
                 },
-                {
-                  "text": "Multi-Lingual-Entities",
-                  "path": "Multi-Lingual-Entities.md"
-                },
                 {
                   "text": "Value Objects",
                   "path": "Value-Objects.md"

diff --git a/docs/zh-Hans/Multi-Lingual-Entities.md b/docs/zh-Hans/Multi-Lingual-Entities.md
diff --git a/docs/zh-Hans/docs-nav.json b/docs/zh-Hans/docs-nav.json
@@ -354,10 +354,6 @@
                   "text": "实体&聚合根",
                   "path": "Entities.md"
                 },
-                {
-                  "text": "多语言实体",
-                  "path": "Multi-Lingual-Entities.md"
-                },
                 {
                   "text": "值对象"
                 },

diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
@@ -331,9 +331,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.GlobalFeatures", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.GlobalFeatures.Tests", "test\Volo.Abp.GlobalFeatures.Tests\Volo.Abp.GlobalFeatures.Tests.csproj", "{231F1581-AA21-44C3-BF27-51EB3AD5355C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiLingualObject", "src\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj", "{C9142DED-1F6C-4385-A37D-81E46B233306}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiLingualObjects", "src\Volo.Abp.MultiLingualObjects\Volo.Abp.MultiLingualObjects.csproj", "{C9142DED-1F6C-4385-A37D-81E46B233306}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiLingualObject.Tests", "test\Volo.Abp.MultiLingualObject.Tests\Volo.Abp.MultiLingualObject.Tests.csproj", "{A30D63B0-E952-4052-BAEE-38B8BF924093}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiLingualObjects.Tests", "test\Volo.Abp.MultiLingualObjects.Tests\Volo.Abp.MultiLingualObjects.Tests.csproj", "{A30D63B0-E952-4052-BAEE-38B8BF924093}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Client.IdentityModel.WebAssembly", "src\Volo.Abp.Http.Client.IdentityModel.WebAssembly\Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj", "{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8}"
 EndProject

diff --git a/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs b/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs
diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Auditing\Volo.Abp.Auditing.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
   </ItemGroup>

diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs
@@ -27,8 +27,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             context.Services.AddSingleton<MapperAccessor>(CreateMappings);
             context.Services.AddSingleton<IMapperAccessor>(provider => provider.GetRequiredService<MapperAccessor>());
-
-            context.Services.AddTransient(typeof(AbpMultiLingualMapperAction<,,>));
         }
 
         private MapperAccessor CreateMappings(IServiceProvider serviceProvider)

diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj b/framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj
@@ -20,7 +20,6 @@
     <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
     <ProjectReference Include="..\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj" />
     <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj" />

diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs
@@ -6,7 +6,6 @@
 using Volo.Abp.ExceptionHandling;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
-using Volo.Abp.MultiLingualObject;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Specifications;
@@ -26,7 +25,6 @@ namespace Volo.Abp.Domain
         typeof(AbpTimingModule),
         typeof(AbpUnitOfWorkModule),
         typeof(AbpObjectMappingModule),
-        typeof(AbpMultiLingualObjectModule),
         typeof(AbpExceptionHandlingModule),
         typeof(AbpSpecificationsModule)
         )]

diff --git a/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IHasMultiLingual.cs b/framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IHasMultiLingual.cs
diff --git a/...src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs b/...src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs
diff --git a/...k/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualTranslation.cs b/...k/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualTranslation.cs
diff --git a/...lo.Abp.MultiLingualObject/FodyWeavers.xml → ...o.Abp.MultiLingualObjects/FodyWeavers.xml b/...lo.Abp.MultiLingualObject/FodyWeavers.xml → ...o.Abp.MultiLingualObjects/FodyWeavers.xml
diff --git a/...lo.Abp.MultiLingualObject/FodyWeavers.xsd → ...o.Abp.MultiLingualObjects/FodyWeavers.xsd b/...lo.Abp.MultiLingualObject/FodyWeavers.xsd → ...o.Abp.MultiLingualObjects/FodyWeavers.xsd
diff --git a/...Object/Volo.Abp.MultiLingualObject.csproj → ...jects/Volo.Abp.MultiLingualObjects.csproj b/...Object/Volo.Abp.MultiLingualObject.csproj → ...jects/Volo.Abp.MultiLingualObjects.csproj
@@ -5,7 +5,6 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Volo.Abp.MultiLingualObject</AssemblyName>
         <PackageId>Volo.Abp.MultiLingualObject</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
         <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

diff --git a/...gualObject/AbpMultiLingualObjectModule.cs → ...alObjects/AbpMultiLingualObjectsModule.cs b/...gualObject/AbpMultiLingualObjectModule.cs → ...alObjects/AbpMultiLingualObjectsModule.cs
@@ -1,11 +1,11 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 
-namespace Volo.Abp.MultiLingualObject
+namespace Volo.Abp.MultiLingualObjects
 {
     [DependsOn(
         typeof(AbpLocalizationModule))]
-    public class AbpMultiLingualObjectModule : AbpModule
+    public class AbpMultiLingualObjectsModule : AbpModule
     {
     }
 }
diff --git a/...work/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObject.cs b/...work/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObject.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.MultiLingualObjects
+{
+    public interface IMultiLingualObject<TTranslation>
+        where TTranslation : class, IObjectTranslation
+    {
+        ICollection<TTranslation> Translations { get; set; }
+    }
+}
diff --git a/...c/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs b/...c/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs
@@ -0,0 +1,14 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.MultiLingualObjects
+{
+    public interface IMultiLingualObjectManager
+    {
+        Task<TTranslation> GetTranslationAsync<TMultiLingual, TTranslation>(
+            TMultiLingual multiLingual,
+            string culture = null,
+            bool fallbackToParentCultures = true)
+            where TMultiLingual : IMultiLingualObject<TTranslation>
+            where TTranslation : class, IObjectTranslation;
+    }
+}
diff --git a/...ework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IObjectTranslation.cs b/...ework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IObjectTranslation.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.MultiLingualObjects
+{
+    public interface IObjectTranslation
+    {
+        string Language { get; set; }
+    }
+}