Rename multilanguage objects.

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

framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IHasMultiLingual.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.MultiLingualObject
-{
-    public interface IHasMultiLingual<TTranslation>
-        where TTranslation : class, IMultiLingualTranslation
-    {
-        ICollection<TTranslation> Translations { get; set; }
-    }
-}

framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualTranslation.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.MultiLingualObject
-{
-    public interface IMultiLingualTranslation
-    {
-        string Language { get; set; }
-    }
-}

framework/src/Volo.Abp.MultiLingualObject/Volo.Abp.MultiLingualObject.csproj → framework/src/Volo.Abp.MultiLingualObjects/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>

framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/AbpMultiLingualObjectModule.cs → framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/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
     {
     }
 }

framework/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; }
+    }
+}

framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/IMultiLingualObjectManager.cs → framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Volo.Abp.MultiLingualObject
+namespace Volo.Abp.MultiLingualObjects
 {
     public interface IMultiLingualObjectManager
     {
@@ -8,7 +8,7 @@ namespace Volo.Abp.MultiLingualObject
             TMultiLingual multiLingual,
             string culture = null,
             bool fallbackToParentCultures = true)
-            where TMultiLingual : IHasMultiLingual<TTranslation>
+            where TMultiLingual : IMultiLingualObject<TTranslation>
-            where TTranslation : class, IMultiLingualTranslation;
+            where TTranslation : class, IObjectTranslation;
     }
 }

framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IObjectTranslation.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.MultiLingualObjects
+{
+    public interface IObjectTranslation
+    {
+        string Language { get; set; }
+    }
+}

framework/src/Volo.Abp.MultiLingualObject/Volo/Abp/MultiLingualObject/MultiLingualObjectManager.cs → framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Localization;
 using Volo.Abp.Settings;
-using Volo.Abp.Threading;
 
-namespace Volo.Abp.MultiLingualObject
+namespace Volo.Abp.MultiLingualObjects
 {
     public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientDependency
     {
@@ -25,8 +24,8 @@ namespace Volo.Abp.MultiLingualObject
             TMultiLingual multiLingual,
             string culture = null,
             bool fallbackToParentCultures = true)
-            where TMultiLingual : IHasMultiLingual<TTranslation>
+            where TMultiLingual : IMultiLingualObject<TTranslation>
-            where TTranslation : class, IMultiLingualTranslation
+            where TTranslation : class, IObjectTranslation
         {
             culture ??= CultureInfo.CurrentUICulture.Name;
 
@@ -69,7 +68,7 @@ namespace Volo.Abp.MultiLingualObject
 
         protected virtual TTranslation GetTranslationBasedOnCulturalRecursive<TTranslation>(
             CultureInfo culture, ICollection<TTranslation> translations, int currentDepth)
-            where TTranslation : class, IMultiLingualTranslation
+            where TTranslation : class, IObjectTranslation
         {
             if (culture == null ||
                 culture.Name.IsNullOrWhiteSpace() ||

framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj

@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\test\Volo.Abp.ObjectExtending.Tests\Volo.Abp.ObjectExtending.Tests.csproj" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
-    <ProjectReference Include="..\Volo.Abp.MultiLingualObject.Tests\Volo.Abp.MultiLingualObject.Tests.csproj" />
+    <ProjectReference Include="..\Volo.Abp.MultiLingualObjects.Tests\Volo.Abp.MultiLingualObjects.Tests.csproj" />
   </ItemGroup>
 
 </Project>

framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperTestModule.cs

@@ -1,5 +1,4 @@
 using Volo.Abp.Modularity;
-using Volo.Abp.MultiLingualObject;
 using Volo.Abp.ObjectExtending;
 
 namespace Volo.Abp.AutoMapper

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/TestObjects/MultiLingualBookTranslation.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Volo.Abp.MultiLingualObject.TestObjects
-{
-    public class MultiLingualBookTranslation : IMultiLingualTranslation
-    {
-        public string Name { get; set; }
-
-        public string Language { get; set; }
-    }
-}

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo.Abp.MultiLingualObject.Tests.csproj → framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo.Abp.MultiLingualObjects.Tests.csproj

@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-        <ProjectReference Include="..\..\src\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj" />
+        <ProjectReference Include="..\..\src\Volo.Abp.MultiLingualObjects\Volo.Abp.MultiLingualObjects.csproj" />
         <ProjectReference Include="..\..\src\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
         <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/AbpMultiLingualObjectTestModule.cs → framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/AbpMultiLingualObjectsTestModule.cs

@@ -1,21 +1,20 @@
-using Autofac.Extensions.DependencyInjection;
+using Volo.Abp.Autofac;
-using Volo.Abp.Autofac;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Settings;
 
-namespace Volo.Abp.MultiLingualObject
+namespace Volo.Abp.MultiLingualObjects
 {
     [DependsOn(
         typeof(AbpAutofacModule),
         typeof(AbpLocalizationModule),
         typeof(AbpSettingsModule),
         typeof(AbpObjectMappingModule),
-        typeof(AbpMultiLingualObjectModule),
+        typeof(AbpMultiLingualObjectsModule),
         typeof(AbpTestBaseModule)
     )]
-    public class AbpMultiLingualObjectTestModule : AbpModule
+    public class AbpMultiLingualObjectsTestModule : AbpModule
     {
     }
 }

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/MultiLingualObjectManager_Tests.cs → framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs

@@ -4,13 +4,13 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
 using Volo.Abp.Localization;
-using Volo.Abp.MultiLingualObject.TestObjects;
+using Volo.Abp.MultiLingualObjects.TestObjects;
 using Volo.Abp.Testing;
 using Xunit;
 
-namespace Volo.Abp.MultiLingualObject
+namespace Volo.Abp.MultiLingualObjects
 {
-    public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingualObjectTestModule>
+    public class MultiLingualObjectManager_Tests : AbpIntegratedTest<AbpMultiLingualObjectsTestModule>
     {
         private readonly IMultiLingualObjectManager _multiLingualObjectManager;
         private readonly MultiLingualBook _book;

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/TestObjects/MultiLingualBook.cs → framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/TestObjects/MultiLingualBook.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.Abp.MultiLingualObject.TestObjects
+namespace Volo.Abp.MultiLingualObjects.TestObjects
 {
-    public class MultiLingualBook :  IHasMultiLingual<MultiLingualBookTranslation>
+    public class MultiLingualBook :  IMultiLingualObject<MultiLingualBookTranslation>
     {
         public MultiLingualBook(Guid id, decimal price)
         {

framework/test/Volo.Abp.MultiLingualObject.Tests/Volo/Abp/MultiLingualObject/TestObjects/MultiLingualBookDto.cs → framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/TestObjects/MultiLingualBookDto.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.Abp.MultiLingualObject.TestObjects
+namespace Volo.Abp.MultiLingualObjects.TestObjects
 {
     public class MultiLingualBookDto
     {

framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/TestObjects/MultiLingualBookTranslation.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.MultiLingualObjects.TestObjects
+{
+    public class MultiLingualBookTranslation : IObjectTranslation
+    {
+        public string Name { get; set; }
+
+        public string Language { get; set; }
+    }
+}