From a2e2bdb0238e3b329a4be527a930595921e1344b Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Sun, 14 Nov 2021 04:55:18 +0300 Subject: [PATCH 1/2] issue-31: add localization for page register --- .../Identity/Pages/Account/Register.cshtml.cs | 4 +- .../O2NextGen.Auth.Web/Data/AuthDbContext.cs | 2 +- .../auth/O2NextGen.Auth.Web/Data/O2User.cs | 2 +- .../Extensions/LocalizationExtensions.cs | 36 +++++++++ .../20211107024126_InitDb.Designer.cs | 2 +- .../Migrations/AuthDbContextModelSnapshot.cs | 2 +- .../O2NextGen.Auth.Web.csproj | 40 +++++++++- .../Pages/{ => Account}/Register.cshtml | 12 +-- .../Pages/{ => Account}/Register.cshtml.cs | 4 +- .../Pages/_ViewImports.cshtml | 3 +- .../auth/O2NextGen.Auth.Web/Program.cs | 2 +- .../Pages/Account/Register.de.Designer.cs | 78 +++++++++++++++++++ .../Resources/Pages/Account/Register.de.resx | 36 +++++++++ .../Pages/Account/Register.en.Designer.cs | 78 +++++++++++++++++++ .../Resources/Pages/Account/Register.en.resx | 36 +++++++++ .../Resources/Pages/Account/Register.ru.resx | 29 +++++++ .../Resources/Resources.Designer.cs | 48 ++++++++++++ .../Resources/SharedResource.cs | 9 +++ .../Resources/SharedResource.en.resx | 17 ++++ .../Resources/SharedResource.ru.Designer.cs | 51 ++++++++++++ .../Resources/SharedResource.ru.resx | 24 ++++++ .../auth/O2NextGen.Auth.Web/Startup.cs | 19 +++-- .../InputModelTests.cs | 2 +- 23 files changed, 512 insertions(+), 24 deletions(-) create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Extensions/LocalizationExtensions.cs rename src/Services/auth/O2NextGen.Auth.Web/Pages/{ => Account}/Register.cshtml (62%) rename src/Services/auth/O2NextGen.Auth.Web/Pages/{ => Account}/Register.cshtml.cs (97%) create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.Designer.cs create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.resx create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.Designer.cs create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.resx create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.ru.resx create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/Resources.Designer.cs create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.en.resx create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.Designer.cs create mode 100644 src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.resx diff --git a/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs index c441aea7..c36c0111 100644 --- a/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; namespace O2NextGen.Auth.Sample.Areas.Identity.Pages.Account @@ -24,7 +25,8 @@ public class RegisterModel : PageModel UserManager userManager, SignInManager signInManager, ILogger logger, - IEmailSender emailSender) + IEmailSender emailSender, + IStringLocalizer sharedLocalizer) { _userManager = userManager; _signInManager = signInManager; diff --git a/src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs b/src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs index 665d9a20..aaf1be7a 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -namespace O2NextGen.Auth.Data +namespace O2NextGen.Auth.Web.Data { public class AuthDbContext : IdentityDbContext { diff --git a/src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs b/src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs index 470947fb..0cb75510 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace O2NextGen.Auth.Data +namespace O2NextGen.Auth.Web.Data { public class O2User: IdentityUser { diff --git a/src/Services/auth/O2NextGen.Auth.Web/Extensions/LocalizationExtensions.cs b/src/Services/auth/O2NextGen.Auth.Web/Extensions/LocalizationExtensions.cs new file mode 100644 index 00000000..c4d1e916 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Extensions/LocalizationExtensions.cs @@ -0,0 +1,36 @@ +using System.Globalization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.Mvc.Razor; +using Microsoft.Extensions.DependencyInjection; + +namespace O2NextGen.Auth.Web.Extensions +{ + public static class LocalizationExtensions + { + public static IServiceCollection AddConfiguredLocalization(this IServiceCollection services) + { + services.AddLocalization(options => options.ResourcesPath = "Resources"); + services.AddMvc() + .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) + .AddDataAnnotationsLocalization(); + services + .Configure(options => + { + var cultures = new[] + { + new CultureInfo("en"), + new CultureInfo("ru"), + new CultureInfo("de"), + new CultureInfo("tr"), + new CultureInfo("he"), + }; + options.DefaultRequestCulture = new RequestCulture("ru"); + options.SupportedCultures = cultures; + options.SupportedUICultures = cultures; + }); + + return services; + } + } +} \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs index 79045a45..21264536 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Migrations/20211107024126_InitDb.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using O2NextGen.Auth.Data; +using O2NextGen.Auth.Web.Data; namespace O2NextGen.Auth.Migrations { diff --git a/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs b/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs index 0ca88d1f..a2607fd2 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Migrations/AuthDbContextModelSnapshot.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using O2NextGen.Auth.Data; +using O2NextGen.Auth.Web.Data; namespace O2NextGen.Auth.Migrations { diff --git a/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj index 13e90c26..7672afbd 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj +++ b/src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj @@ -3,12 +3,50 @@ netcoreapp2.2 InProcess - O2NextGen.Auth + + + ResXFileCodeGenerator + Register.en.Designer.cs + + + ResXFileCodeGenerator + SharedResource.ru.Designer.cs + + + ResXFileCodeGenerator + Register.de.Designer.cs + + + + + True + True + Register.en.resx + + + Resources.ru + + + True + True + SharedResource.ru.resx + + + True + True + Register.de.resx + + + + + + + diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml similarity index 62% rename from src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml rename to src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml index 94145fbb..765d1e0f 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml +++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml @@ -1,29 +1,29 @@ @page @model RegisterModel - +@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
-

Create a new account.

+

@Localizer["CreateNewUser"]

- +
- +
- +
- +
\ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs similarity index 97% rename from src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs rename to src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs index ecc549df..a2d442b6 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -using O2NextGen.Auth.Data; +using O2NextGen.Auth.Web.Data; -namespace O2NextGen.Auth.Pages +namespace O2NextGen.Auth.Web.Pages.Account { [AllowAnonymous] public class RegisterModel : PageModel diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml index 8868e54e..78702ae5 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml +++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/_ViewImports.cshtml @@ -1,4 +1,3 @@ @using Microsoft.AspNetCore.Identity -@using O2NextGen.Auth.Pages +@using O2NextGen.Auth.Web.Pages.Account @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - diff --git a/src/Services/auth/O2NextGen.Auth.Web/Program.cs b/src/Services/auth/O2NextGen.Auth.Web/Program.cs index e66155ee..0ccd3ea9 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Program.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Program.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; -namespace O2NextGen.Auth +namespace O2NextGen.Auth.Web { public class Program { diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.Designer.cs new file mode 100644 index 00000000..549dda9e --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.Designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace O2NextGen.Auth.Web.Resources.Pages.Account { + using System; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Register_de { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Register_de() { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("O2NextGen.Auth.Web.Resources.Pages.Account.Register_de", typeof(Register_de).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static string CreateNewUser { + get { + return ResourceManager.GetString("CreateNewUser", resourceCulture); + } + } + + internal static string Register { + get { + return ResourceManager.GetString("Register", resourceCulture); + } + } + + internal static string Email { + get { + return ResourceManager.GetString("Email", resourceCulture); + } + } + + internal static string Password { + get { + return ResourceManager.GetString("Password", resourceCulture); + } + } + + internal static string ConfirmPassword { + get { + return ResourceManager.GetString("ConfirmPassword", resourceCulture); + } + } + } +} diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.resx b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.resx new file mode 100644 index 00000000..112b796a --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.de.resx @@ -0,0 +1,36 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Neuen Benutzer erstellen. + + + Registrieren + + + Email + + + Passwort + + + Kennwort bestätigen + + \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.Designer.cs new file mode 100644 index 00000000..893efa87 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.Designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace O2NextGen.Auth.Web.Resources.Pages.Account { + using System; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Register_en { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Register_en() { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("O2NextGen.Auth.Web.Resources.Pages.Account.Register_en", typeof(Register_en).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static string CreateNewUser { + get { + return ResourceManager.GetString("CreateNewUser", resourceCulture); + } + } + + internal static string Register { + get { + return ResourceManager.GetString("Register", resourceCulture); + } + } + + internal static string Email { + get { + return ResourceManager.GetString("Email", resourceCulture); + } + } + + internal static string Password { + get { + return ResourceManager.GetString("Password", resourceCulture); + } + } + + internal static string ConfirmPassword { + get { + return ResourceManager.GetString("ConfirmPassword", resourceCulture); + } + } + } +} diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.resx b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.resx new file mode 100644 index 00000000..30832959 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.en.resx @@ -0,0 +1,36 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Create new user. + + + Register + + + Email + + + Password + + + Confirm Password + + \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.ru.resx b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.ru.resx new file mode 100644 index 00000000..2063c23d --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Pages/Account/Register.ru.resx @@ -0,0 +1,29 @@ + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Регистрация + + + Создать нового пользователя. + + + Эл.почта + + + Пароль + + + Подтвердите пароль + + \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/Resources.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/Resources.Designer.cs new file mode 100644 index 00000000..5edef742 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/Resources.Designer.cs @@ -0,0 +1,48 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace O2NextGen.Auth.Resources { + using System; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources_ru { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources_ru() { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("O2NextGen.Auth.Resources.Resources_ru", typeof(Resources_ru).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs new file mode 100644 index 00000000..361cd8f4 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs @@ -0,0 +1,9 @@ +namespace O2NextGen.Auth.Web.Resources +{ + public class SharedResource + { + public SharedResource() + { + } + } +} diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.en.resx b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.en.resx new file mode 100644 index 00000000..d848f8ea --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.en.resx @@ -0,0 +1,17 @@ + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dd + + \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.Designer.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.Designer.cs new file mode 100644 index 00000000..6232f264 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.Designer.cs @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace O2NextGen.Auth.Web.Resources { + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class SharedResource_ru { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal SharedResource_ru() { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("O2NextGen.Auth.Resources.SharedResource_ru", typeof(SharedResource_ru).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static string SimpleTest { + get { + return ResourceManager.GetString("SimpleTest", resourceCulture); + } + } + } +} diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.resx b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.resx new file mode 100644 index 00000000..a1691f66 --- /dev/null +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.ru.resx @@ -0,0 +1,24 @@ + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ru + + \ No newline at end of file diff --git a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs index 482d91af..a6de3e13 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs @@ -1,21 +1,24 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using O2NextGen.Auth.Data; +using Microsoft.Extensions.Options; +using O2NextGen.Auth.Web.Data; +using O2NextGen.Auth.Web.Extensions; -namespace O2NextGen.Auth +namespace O2NextGen.Auth.Web { public class Startup { public void ConfigureServices(IServiceCollection services) { - services.AddMvc(); + + services.AddConfiguredLocalization(); + services.AddDbContext(options => options.UseSqlServer("Server=localhost;Initial Catalog=O2NextGen.AuthDb;Persist Security Info=False;User ID=sa;Password=your@Password;Connection Timeout=30;")); @@ -23,7 +26,8 @@ public void ConfigureServices(IServiceCollection services) .AddIdentity() .AddEntityFrameworkStores() .AddDefaultTokenProviders(); - + + services.AddSingleton(); } @@ -33,8 +37,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) { app.UseDeveloperExceptionPage(); } - + app.UseStaticFiles(); + var v = app.ApplicationServices + .GetRequiredService>().Value; + app.UseRequestLocalization(v); app.UseAuthentication(); app.UseMvcWithDefaultRoute(); diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs index 14291209..514d1004 100644 --- a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs +++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using O2NextGen.Auth.Pages; +using O2NextGen.Auth.Web.Pages.Account; namespace Tests.O2NextGen.Auth.Web { From 298ae231adc5f0fa2562fe9856da232c951bcb35 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Sun, 14 Nov 2021 05:38:56 +0300 Subject: [PATCH 2/2] issue-32: update registermodel(o2-auth) --- .../Areas/Identity/Pages/Account/Register.cshtml.cs | 6 +++--- .../O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs | 7 ++++++- .../auth/O2NextGen.Auth.Web/Resources/SharedResource.cs | 3 --- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs index c36c0111..36a2df29 100644 --- a/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/src/Services/auth/O2NextGen.Auth.Sample/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; namespace O2NextGen.Auth.Sample.Areas.Identity.Pages.Account @@ -25,8 +25,8 @@ public class RegisterModel : PageModel UserManager userManager, SignInManager signInManager, ILogger logger, - IEmailSender emailSender, - IStringLocalizer sharedLocalizer) + IEmailSender emailSender + ) { _userManager = userManager; _signInManager = signInManager; diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs index a2d442b6..a784c8aa 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Account/Register.cshtml.cs @@ -6,8 +6,10 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; using O2NextGen.Auth.Web.Data; +using O2NextGen.Auth.Web.Resources; namespace O2NextGen.Auth.Web.Pages.Account { @@ -18,17 +20,20 @@ public class RegisterModel : PageModel private readonly UserManager _userManager; private readonly ILogger _logger; private readonly IEmailSender _emailSender; + private readonly IStringLocalizer _sharedLocalizer; public RegisterModel( UserManager userManager, SignInManager signInManager, ILogger logger, - IEmailSender emailSender) + IEmailSender emailSender, + IStringLocalizer sharedLocalizer) { _userManager = userManager; _signInManager = signInManager; _logger = logger; _emailSender = emailSender; + _sharedLocalizer = sharedLocalizer; } [BindProperty] diff --git a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs index 361cd8f4..28fa6b3c 100644 --- a/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs +++ b/src/Services/auth/O2NextGen.Auth.Web/Resources/SharedResource.cs @@ -2,8 +2,5 @@ { public class SharedResource { - public SharedResource() - { - } } }