diff --git a/CleanArchitecture.Razor.sln b/CleanArchitecture.Razor.sln index 5f4a7909..cbca8015 100644 --- a/CleanArchitecture.Razor.sln +++ b/CleanArchitecture.Razor.sln @@ -24,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartAdmin.WebUI", "src\Sma EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{6BD2EC46-FA8F-44F3-AF33-903BBB347116}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Workflow", "src\Workflow\Workflow.csproj", "{A5A249F5-C62B-4F0E-9715-F8C65D37ACD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Workflow", "src\Workflow\Workflow.csproj", "{A5A249F5-C62B-4F0E-9715-F8C65D37ACD3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Infrastructure/Constants/Localization/LocalizationConstants.cs b/src/Infrastructure/Constants/Localization/LocalizationConstants.cs new file mode 100644 index 00000000..269890e0 --- /dev/null +++ b/src/Infrastructure/Constants/Localization/LocalizationConstants.cs @@ -0,0 +1,34 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CleanArchitecture.Razor.Infrastructure.Constants.Localization +{ + public static class LocalizationConstants + { + public static readonly LanguageCode[] SupportedLanguages = { + new LanguageCode + { + Code = "en-US", + DisplayName= "English" + }, + + new LanguageCode + { + Code = "zh-CN", + DisplayName = "中文" + } + }; + } + + public class LanguageCode + { + public string DisplayName { get; set; } + public string Code { get; set; } + } +} diff --git a/src/SmartAdmin.WebUI/Areas/Identity/Pages/_PageHeader.cshtml b/src/SmartAdmin.WebUI/Areas/Identity/Pages/_PageHeader.cshtml index 3b7fcca0..52fc775b 100644 --- a/src/SmartAdmin.WebUI/Areas/Identity/Pages/_PageHeader.cshtml +++ b/src/SmartAdmin.WebUI/Areas/Identity/Pages/_PageHeader.cshtml @@ -1,4 +1,5 @@ -@{ +@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer _localizer +@{ var pageName = ViewBag.PageName ?? string.Empty; var canLogin = new string[] { "register", "forgotpassword", "lockout", "logout" }.ToList().Contains(pageName); } @@ -8,17 +9,17 @@ @if (canLogin) { - Already a member? + @_localizer["Already a member?"] - Secure Login + @_localizer["Secure Login"] } else { - - Register account - + + @_localizer["Register account"] + } - \ No newline at end of file + diff --git a/src/SmartAdmin.WebUI/Extensions/RequestLocalizationCookiesMiddlewareExtensions.cs b/src/SmartAdmin.WebUI/Extensions/RequestLocalizationCookiesMiddlewareExtensions.cs new file mode 100644 index 00000000..3854b1e7 --- /dev/null +++ b/src/SmartAdmin.WebUI/Extensions/RequestLocalizationCookiesMiddlewareExtensions.cs @@ -0,0 +1,60 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Localization; +using Microsoft.Extensions.Options; + +namespace SmartAdmin.WebUI.Extensions +{ + public static class RequestLocalizationCookiesMiddlewareExtensions + { + public static IApplicationBuilder UseRequestLocalizationCookies(this IApplicationBuilder app) + { + app.UseMiddleware(); + return app; + } + } + + public class RequestLocalizationCookiesMiddleware : IMiddleware + { + public CookieRequestCultureProvider Provider { get; } + + public RequestLocalizationCookiesMiddleware(IOptions requestLocalizationOptions) + { + Provider = + requestLocalizationOptions + .Value + .RequestCultureProviders + .Where(x => x is CookieRequestCultureProvider) + .Cast() + .FirstOrDefault(); + } + + public async Task InvokeAsync(HttpContext context, RequestDelegate next) + { + if (Provider != null) + { + var feature = context.Features.Get(); + + if (feature != null) + { + // remember culture across request + context.Response + .Cookies + .Append( + Provider.CookieName, + CookieRequestCultureProvider.MakeCookieValue(feature.RequestCulture) + ); + } + } + + await next(context); + } + } +} diff --git a/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml b/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml new file mode 100644 index 00000000..c23aa760 --- /dev/null +++ b/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml @@ -0,0 +1,11 @@ +@model SmartAdmin.WebUI.Pages.Shared.Components.LanguageSelector.DefaultModel +
+ @foreach (var culture in Model.SupportedCultures) + { +
+ + @culture.DisplayName +
+ } +
+ diff --git a/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml.cs b/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml.cs new file mode 100644 index 00000000..a95a245c --- /dev/null +++ b/src/SmartAdmin.WebUI/Pages/Shared/Components/LanguageSelector/Default.cshtml.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Threading.Tasks; +using CleanArchitecture.Razor.Infrastructure.Constants.Localization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace SmartAdmin.WebUI.Pages.Shared.Components.LanguageSelector +{ + + public class DefaultModel + { + public CultureInfo CurrentUICulture { get; set; } + public List SupportedCultures { get; set; } + } + +} diff --git a/src/SmartAdmin.WebUI/Pages/Shared/_DropdownMenu.cshtml b/src/SmartAdmin.WebUI/Pages/Shared/_DropdownMenu.cshtml index 07e525dd..b5506f7e 100644 --- a/src/SmartAdmin.WebUI/Pages/Shared/_DropdownMenu.cshtml +++ b/src/SmartAdmin.WebUI/Pages/Shared/_DropdownMenu.cshtml @@ -1,45 +1,40 @@ -
-
- - @(User.GetDisplayName()) - -
-
@(User.GetDisplayName())
- @(User.GetEmail()) -
-
+@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer _localizer +
+
+ + @(User.GetDisplayName()) + +
+
@(User.GetDisplayName())
+ @(User.GetEmail()) +
+
- Reset Layout + @_localizer["Reset Layout"] - Settings + @_localizer["Settings"]
- Fullscreen - F11 + @_localizer["Fullscreen"] + F11 - Print - Ctrl + P + @_localizer["Print"] + Ctrl + P
-
- Language -
-
- Français - English (US) - Español - Русский язык - 日本語 - 中文 -
+
+ @_localizer["Language"] +
+ +
- Logout - @(User.Identity.Name) + @_localizer["Logout"] + @(User.Identity.Name) diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.en.resx new file mode 100644 index 00000000..01c1313e --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.en.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Already a member? + + + Secure Login + + + Register account + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.resx new file mode 100644 index 00000000..d5f0f195 --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Already a member? + + + Register account + + + Secure Login + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.zh-CN.resx new file mode 100644 index 00000000..9a2759ae --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/_PageHeader.zh-CN.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 已经有账号 + + + 登录 + + + 注册新账号 + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.en.resx b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.en.resx new file mode 100644 index 00000000..89fbc384 --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.en.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Logout + + + Reset Layout + + + Settings + + + Print + + + Language + + + Fullscreen + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.resx b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.resx new file mode 100644 index 00000000..f0ed396a --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fullscreen + + + Language + + + Logout + + + Print + + + Reset Layout + + + Settings + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.zh-CN.resx new file mode 100644 index 00000000..48686711 --- /dev/null +++ b/src/SmartAdmin.WebUI/Resources/Pages/Shared/_DropdownMenu.zh-CN.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 全屏 + + + 注销 + + + 重置布局 + + + 个性化设置 + + + 打印 + + + 语言 + + \ No newline at end of file diff --git a/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj b/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj index 7716366b..271a0cb8 100644 --- a/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj +++ b/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj @@ -1,4 +1,4 @@ - + latest diff --git a/src/SmartAdmin.WebUI/Startup.cs b/src/SmartAdmin.WebUI/Startup.cs index d9b8e99c..eab33a6a 100644 --- a/src/SmartAdmin.WebUI/Startup.cs +++ b/src/SmartAdmin.WebUI/Startup.cs @@ -1,12 +1,14 @@ using CleanArchitecture.Razor.Application; using CleanArchitecture.Razor.Application.Common.Interfaces; using CleanArchitecture.Razor.Infrastructure; +using CleanArchitecture.Razor.Infrastructure.Constants.Localization; using CleanArchitecture.Razor.Infrastructure.Identity; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.UI.Services; +using Microsoft.AspNetCore.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -15,9 +17,11 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json.Serialization; +using SmartAdmin.WebUI.Extensions; using SmartAdmin.WebUI.Models; using SmartAdmin.WebUI.Services; using System.IO; +using System.Linq; using System.Text.Json; using System.Text.Json.Serialization; using static IdentityModel.ClaimComparer; @@ -63,9 +67,15 @@ public void ConfigureServices(IServiceCollection services) // fv.DisableDataAnnotationsValidation = false; // fv.ImplicitlyValidateChildProperties = true; //}); - + services.Configure(options => + { + options.AddSupportedUICultures(LocalizationConstants.SupportedLanguages.Select(x=>x.Code).ToArray()); + options.FallBackToParentUICultures = true; + + }); services .AddRazorPages() + .AddViewLocalization() .AddJsonOptions(options => { options.JsonSerializerOptions.PropertyNamingPolicy = null; @@ -84,6 +94,8 @@ public void ConfigureServices(IServiceCollection services) options.LogoutPath = "/Identity/Account/Logout"; options.AccessDeniedPath = "/Identity/Account/AccessDenied"; }); + + services.AddScoped(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -107,6 +119,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), @"Files")), RequestPath = new PathString("/Files") }); + app.UseRequestLocalization(); + app.UseRequestLocalizationCookies(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); diff --git a/src/SmartAdmin.WebUI/ViewComponents/LanguageSelectorViewComponent.cs b/src/SmartAdmin.WebUI/ViewComponents/LanguageSelectorViewComponent.cs new file mode 100644 index 00000000..e5d44373 --- /dev/null +++ b/src/SmartAdmin.WebUI/ViewComponents/LanguageSelectorViewComponent.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using CleanArchitecture.Razor.Infrastructure.Constants.Localization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using SmartAdmin.WebUI.Models; +using SmartAdmin.WebUI.Pages.Shared.Components.LanguageSelector; + +namespace SmartAdmin.WebUI.ViewComponents +{ + public class LanguageSelectorViewComponent : ViewComponent + { + private readonly IOptions _localizationOptions; + + public LanguageSelectorViewComponent( + IOptions localizationOptions + ) + { + _localizationOptions = localizationOptions; + } + public IViewComponentResult Invoke() + { + var cultureFeature = HttpContext.Features.Get(); + var model = new DefaultModel + { + SupportedCultures = _localizationOptions.Value.SupportedUICultures.ToList(), + CurrentUICulture = cultureFeature.RequestCulture.UICulture + }; + return View(model); + } + } +}