Refactor & Release 2.0

maliming · maliming · commit 2a51401cf89a · 2020-08-31T20:45:39.000+08:00
diff --git a/README.md b/README.md
@@ -21,31 +21,31 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 		options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
 		options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
 	});
-	
-	Configure<OwlCultureMapOptions>(options =>
-	{
-		//Map some language-specific codes to zh-Hans.
-		var maps = new Dictionary<string, string>
-		{
-			{"zh", "zh-Hans"},
-			{"zh-CN", "zh-Hans"},
-			{"zh-Hant", "zh-Hans"},
-			{"zh-TW", "zh-Hans"}
-		};
-		
-		options.CulturesMaps = maps;
-		options.UiCulturesMaps = maps;
-	});
+
+    Configure<OwlCultureMapOptions>(options =>
+    {
+        var zhHansCultureMapInfo = new CultureMapInfo
+        {
+            TargetCulture = "zh-Hans",
+            SourceCultures = new List<string>
+            {
+                "zh", "zh-CN"
+            }
+        };
+
+        options.CulturesMaps.Add(zhHansCultureMapInfo);
+        options.UiCulturesMaps.Add(zhHansCultureMapInfo);
+    });
 }
-		
+
 public override void OnApplicationInitialization(ApplicationInitializationContext context)
 {
 	var app = context.GetApplicationBuilder();
-	
+
 	//...
 
 	app.UseOwlRequestLocalization();
-	
+
 	//...
 }
 ```
diff --git a/example/BookStore/BookStore.csproj b/example/BookStore/BookStore.csproj
@@ -5,8 +5,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.Autofac" Version="3.0.4" />
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.4" />
+        <PackageReference Include="Volo.Abp.Autofac" Version="3.0.5" />
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="3.0.5" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/example/BookStore/BookStoreWebModule.cs b/example/BookStore/BookStoreWebModule.cs
@@ -38,16 +38,17 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             Configure<OwlCultureMapOptions>(options =>
             {
-                var maps = new Dictionary<string, string>
+                var zhHansCultureMapInfo = new CultureMapInfo
                 {
-                    {"zh", "zh-Hans"},
-                    {"zh-CN", "zh-Hans"},
-                    {"zh-Hant", "zh-Hans"},
-                    {"zh-TW", "zh-Hans"}
+                    TargetCulture = "zh-Hans",
+                    SourceCultures = new List<string>
+                    {
+                        "zh", "zh-CN", "zh-Hant", "zh-TW"
+                    }
                 };
 
-                options.CulturesMaps = maps;
-                options.UiCulturesMaps = maps;
+                options.CulturesMaps.Add(zhHansCultureMapInfo);
+                options.UiCulturesMaps.Add(zhHansCultureMapInfo);
             });
         }
 
diff --git a/src/Owl.Abp.CultureMap/Owl.Abp.CultureMap.csproj b/src/Owl.Abp.CultureMap/Owl.Abp.CultureMap.csproj
@@ -9,7 +9,7 @@
         <IsPackable>true</IsPackable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <OutputType>Library</OutputType>
-        <PackageVersion>1.1.0</PackageVersion>
+        <PackageVersion>2.0.0</PackageVersion>
         
         <Authors>maliming</Authors>
         <RepositoryUrl>https://github.com/maliming/Owl.Abp.CultureMap</RepositoryUrl>
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Volo.Abp.AspNetCore" Version="3.0.4" />
+        <PackageReference Include="Volo.Abp.AspNetCore" Version="3.0.5" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/CultureMapInfo.cs b/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/CultureMapInfo.cs
@@ -0,0 +1,11 @@
+﻿using System.Collections.Generic;
+
+namespace Owl.Abp.CultureMap
+{
+    public class CultureMapInfo
+    {
+        public string TargetCulture { get; set; }
+
+        public List<string> SourceCultures { get; set; }
+    }
+}
diff --git a/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlApplicationBuilderExtensions.cs b/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlApplicationBuilderExtensions.cs
@@ -10,9 +10,9 @@ public static IApplicationBuilder UseOwlRequestLocalization(this IApplicationBui
         {
             return app.UseAbpRequestLocalization(options =>
             {
-                optionsAction?.Invoke(options);
                 options.RequestCultureProviders.Insert(0, new OwlCultureMapRequestCultureProvider());
+                optionsAction?.Invoke(options);
             });
         }
     }
-}
+}
diff --git a/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlCultureMapOptions.cs b/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlCultureMapOptions.cs
@@ -4,8 +4,8 @@ namespace Owl.Abp.CultureMap
 {
     public class OwlCultureMapOptions
     {
-        public Dictionary<string, string> CulturesMaps = new Dictionary<string, string>();
-        
-        public Dictionary<string, string> UiCulturesMaps = new Dictionary<string, string>();
+        public readonly List<CultureMapInfo> CulturesMaps = new List<CultureMapInfo>();
+
+        public readonly List<CultureMapInfo> UiCulturesMaps = new List<CultureMapInfo>();
     }
-}
+}
diff --git a/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlCultureMapRequestCultureProvider.cs b/src/Owl.Abp.CultureMap/Owl/Abp/CultureMap/OwlCultureMapRequestCultureProvider.cs
@@ -25,10 +25,8 @@ public override async Task<ProviderCultureResult> DetermineProviderCultureResult
             var mapCultures = new List<StringSegment>();
             var mapUiCultures = new List<StringSegment>();
 
-            var requestLocalizationOptionsProvider =
-                httpContext.RequestServices.GetRequiredService<IAbpRequestLocalizationOptionsProvider>();
-            foreach (var provider in (await requestLocalizationOptionsProvider.GetLocalizationOptionsAsync())
-                .RequestCultureProviders)
+            var requestLocalizationOptionsProvider = httpContext.RequestServices.GetRequiredService<IAbpRequestLocalizationOptionsProvider>();
+            foreach (var provider in (await requestLocalizationOptionsProvider.GetLocalizationOptionsAsync()).RequestCultureProviders)
             {
                 if (provider == this)
                 {
@@ -41,28 +39,21 @@ public override async Task<ProviderCultureResult> DetermineProviderCultureResult
                     continue;
                 }
 
-                var cultures = providerCultureResult.Cultures;
-                var uiCultures = providerCultureResult.UICultures;
-
-                mapCultures.AddRange(cultures.Where(x => x.HasValue)
-                    .Select(culture => option.CulturesMaps.ContainsKey(culture.Value)
-                        ? new StringSegment(option.CulturesMaps[culture.Value])
-                        : culture));
-
-                mapUiCultures.AddRange(uiCultures.Where(x => x.HasValue)
-                    .Select(culture => option.UiCulturesMaps.ContainsKey(culture.Value)
-                        ? new StringSegment(option.UiCulturesMaps[culture.Value])
-                        : culture));
-
-                if (mapCultures.Any() || mapUiCultures.Any())
-                {
-                    break;
-                }
-            }
-
-            if (mapCultures.IsNullOrEmpty() || mapUiCultures.IsNullOrEmpty())
-            {
-                return await NullProviderCultureResult;
+                mapCultures.AddRange(providerCultureResult.Cultures.Where(x => x.HasValue)
+                    .Select(culture =>
+                    {
+                        var map = option.CulturesMaps.FirstOrDefault(x =>
+                            x.SourceCultures.Contains(culture.Value, StringComparer.OrdinalIgnoreCase));
+                        return new StringSegment(map?.TargetCulture ?? culture.Value);
+                    }));
+
+                mapUiCultures.AddRange(providerCultureResult.UICultures.Where(x => x.HasValue)
+                    .Select(culture =>
+                    {
+                        var map = option.UiCulturesMaps.FirstOrDefault(x =>
+                            x.SourceCultures.Contains(culture.Value, StringComparer.OrdinalIgnoreCase));
+                        return new StringSegment(map?.TargetCulture ?? culture.Value);
+                    }));
             }
 
             return new ProviderCultureResult(mapCultures, mapUiCultures);

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ public static IApplicationBuilder UseOwlRequestLocalization(this IApplicationBui`
`10`	`10`	`{`
`11`	`11`	`return app.UseAbpRequestLocalization(options =>`
`12`	`12`	`{`
`13`		`- optionsAction?.Invoke(options);`
`14`	`13`	`options.RequestCultureProviders.Insert(0, new OwlCultureMapRequestCultureProvider());`
	`14`	`+ optionsAction?.Invoke(options);`
`15`	`15`	`});`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace Owl.Abp.CultureMap`
`4`	`4`	`{`
`5`	`5`	`public class OwlCultureMapOptions`
`6`	`6`	`{`
`7`		`- public Dictionary<string, string> CulturesMaps = new Dictionary<string, string>();`
`8`		`-`
`9`		`- public Dictionary<string, string> UiCulturesMaps = new Dictionary<string, string>();`
	`7`	`+ public readonly List<CultureMapInfo> CulturesMaps = new List<CultureMapInfo>();`
	`8`	`+`
	`9`	`+ public readonly List<CultureMapInfo> UiCulturesMaps = new List<CultureMapInfo>();`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`