From 9bdc3a133e20e5d7e3e89a26aa756f126f278bdf Mon Sep 17 00:00:00 2001 From: neozhu Date: Tue, 31 Aug 2021 09:54:15 +0800 Subject: [PATCH] WIP: add language resource --- .../Areas/Identity/Pages/Account/Lockout.cshtml | 3 +++ .../Identity/Pages/Account/Lockout.cshtml.cs | 17 +++++++++++------ .../Identity/Pages/Account/Login.cshtml.cs | 4 ++-- .../Areas/Identity/Pages/Account/Logout.cshtml | 2 +- .../ForgotPasswordConfirmation.en.resx | 0 .../ForgotPasswordConfirmation.resx | 0 .../ForgotPasswordConfirmation.zh-CN.resx | 0 .../{ => Account}/ForgotPasswordModel.en.resx | 0 .../{ => Account}/ForgotPasswordModel.resx | 0 .../ForgotPasswordModel.zh-CN.resx | 0 .../Pages/{ => Account}/LockoutModel.en.resx | 0 .../Pages/{ => Account}/LockoutModel.resx | 0 .../Pages/{ => Account}/LockoutModel.zh-CN.resx | 0 .../Pages/{ => Account}/LoginModel.en.resx | 4 ++-- .../Pages/{ => Account}/LoginModel.resx | 4 ++-- .../Pages/{ => Account}/LoginModel.zh-CN.resx | 2 +- .../Pages/{ => Account}/LogoutModel.en.resx | 0 .../Pages/{ => Account}/LogoutModel.resx | 0 .../Pages/{ => Account}/LogoutModel.zh-CN.resx | 0 .../Pages/{ => Account}/RegisterModel.en.resx | 0 .../Pages/{ => Account}/RegisterModel.resx | 0 .../{ => Account}/RegisterModel.zh-CN.resx | 0 .../ResetPasswordConfirmationModel.en.resx | 0 .../ResetPasswordConfirmationModel.resx | 0 .../ResetPasswordConfirmationModel.zh-CN.resx | 0 .../{ => Account}/ResetPasswordModel.en.resx | 0 .../Pages/{ => Account}/ResetPasswordModel.resx | 0 .../{ => Account}/ResetPasswordModel.zh-CN.resx | 0 28 files changed, 22 insertions(+), 14 deletions(-) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordConfirmation.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordConfirmation.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordConfirmation.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ForgotPasswordModel.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LockoutModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LockoutModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LockoutModel.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LoginModel.en.resx (98%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LoginModel.resx (98%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LoginModel.zh-CN.resx (99%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LogoutModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LogoutModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/LogoutModel.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/RegisterModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/RegisterModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/RegisterModel.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordConfirmationModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordConfirmationModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordConfirmationModel.zh-CN.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordModel.en.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordModel.resx (100%) rename src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/{ => Account}/ResetPasswordModel.zh-CN.resx (100%) diff --git a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml index a380c397..68959af9 100644 --- a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml +++ b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml @@ -8,6 +8,9 @@
+ + +
thumbnail
diff --git a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml.cs index e3a5eb1f..ff043f04 100644 --- a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml.cs +++ b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Lockout.cshtml.cs @@ -20,7 +20,11 @@ public class LockoutModel : PageModel [BindProperty] public InputModel Input { get; set; } - + [BindProperty] + [Required] + public string UserName { get; set; } + [BindProperty] + public string ReturnUrl { get; set; } public class InputModel { [Required] @@ -43,12 +47,13 @@ public LockoutModel( _logger = logger; } - public async Task OnGetAsync() + public async Task OnGetAsync(string userName="", string returnUrl="") { - var userId = _currentUserService.UserId; - if (!string.IsNullOrEmpty(userId)) + UserName= userName; + ReturnUrl = returnUrl; + if (!string.IsNullOrEmpty(UserName)) { - var user = await _userManager.FindByIdAsync(userId); + var user = await _userManager.FindByNameAsync(UserName); if (user != null) { Input = new InputModel() @@ -89,7 +94,7 @@ public async Task OnPostAsync(string returnUrl = null) if (result.IsLockedOut) { _logger.LogWarning("User account locked out."); - return RedirectToPage("./Lockout"); + return RedirectToPage("./Lockout", new { userName = Input.UserName, ReturnUrl = returnUrl }); } else { diff --git a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Login.cshtml.cs b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Login.cshtml.cs index 16facf2c..1d37adea 100644 --- a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Login.cshtml.cs +++ b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Login.cshtml.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; @@ -91,7 +91,7 @@ public async Task OnPostAsync(string returnUrl = null) if (result.IsLockedOut) { _logger.LogWarning("User account locked out."); - return RedirectToPage("./Lockout"); + return RedirectToPage("./Lockout",new {userName= Input.UserName, ReturnUrl = returnUrl }); } else { diff --git a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Logout.cshtml b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Logout.cshtml index 6032ec98..6c246660 100644 --- a/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Logout.cshtml +++ b/src/SmartAdmin.WebUI/Areas/Identity/Pages/Account/Logout.cshtml @@ -1,6 +1,6 @@ @page @using System.Web -@inject Microsoft.Extensions.Localization.IStringLocalizer _localizer +@inject Microsoft.Extensions.Localization.IStringLocalizer _localizer @model LogoutModel @{ ViewData["PageName"] = "logout"; diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordConfirmation.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ForgotPasswordModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ForgotPasswordModel.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LockoutModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LockoutModel.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.en.resx similarity index 98% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.en.resx index 5ae85a1d..2037a755 100644 --- a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.en.resx +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.en.resx @@ -120,8 +120,8 @@ Forgot your password? - - login + + Login Password diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.resx similarity index 98% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.resx index 5ae85a1d..2037a755 100644 --- a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.resx +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.resx @@ -120,8 +120,8 @@ Forgot your password? - - login + + Login Password diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.zh-CN.resx similarity index 99% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.zh-CN.resx index d96c93c2..f29deb7b 100644 --- a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LoginModel.zh-CN.resx +++ b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LoginModel.zh-CN.resx @@ -120,7 +120,7 @@ 忘记你的密码？ - + 登录 diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/LogoutModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/LogoutModel.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/RegisterModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/RegisterModel.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordConfirmationModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordConfirmationModel.zh-CN.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.en.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.en.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.en.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.en.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.resx diff --git a/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.zh-CN.resx b/src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.zh-CN.resx similarity index 100% rename from src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/ResetPasswordModel.zh-CN.resx rename to src/SmartAdmin.WebUI/Resources/Areas/Identity/Pages/Account/ResetPasswordModel.zh-CN.resx