Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,7 +25,8 @@ public RegisterModel(
UserManager<IdentityUser> userManager,
SignInManager<IdentityUser> signInManager,
ILogger<RegisterModel> logger,
IEmailSender emailSender)
IEmailSender emailSender
)
{
_userManager = userManager;
_signInManager = signInManager;
Expand Down
2 changes: 1 addition & 1 deletion src/Services/auth/O2NextGen.Auth.Web/Data/AuthDbContext.cs
Original file line number Diff line number Diff line change
@@ -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<O2User>
{
Expand Down
2 changes: 1 addition & 1 deletion src/Services/auth/O2NextGen.Auth.Web/Data/O2User.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;

namespace O2NextGen.Auth.Data
namespace O2NextGen.Auth.Web.Data
{
public class O2User: IdentityUser
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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<RequestLocalizationOptions>(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;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
40 changes: 39 additions & 1 deletion src/Services/auth/O2NextGen.Auth.Web/O2NextGen.Auth.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,50 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<RootNamespace>O2NextGen.Auth</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\Pages\Account\Register.en.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Register.en.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources\SharedResource.ru.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>SharedResource.ru.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Pages\Account\Register.de.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Register.de.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Compile Update="Resources\Pages\Account\Register.en.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Register.en.resx</DependentUpon>
</Compile>
<Compile Update="Resources\Resources.Designer.cs">
<DependentUpon>Resources.ru</DependentUpon>
</Compile>
<Compile Update="Resources\SharedResource.ru.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>SharedResource.ru.resx</DependentUpon>
</Compile>
<Compile Update="Resources\Pages\Account\Register.de.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Register.de.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<None Remove="Resources\SharedResource.en" />
<None Remove="Resources\Resources.ru" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
@page
@model RegisterModel

@inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer

<div class="row">
<div class="col-md-4">
<form asp-route-returnUrl="@Model.ReturnUrl" method="post">
<h4>Create a new account.</h4>
<h4>@Localizer["CreateNewUser"]</h4>
<hr />
<div ></div>
<div >
<label asp-for="Input.Email"></label>
<label asp-for="Input.Email">@Localizer["Email"]</label>
<input asp-for="Input.Email" />
<span asp-validation-for="Input.Email" ></span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<label asp-for="Input.Password">@Localizer["Password"]</label>
<input asp-for="Input.Password" />
<span asp-validation-for="Input.Password" ></span>
</div>
<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<label asp-for="Input.ConfirmPassword">@Localizer["ConfirmPassword"]</label>
<input asp-for="Input.ConfirmPassword" />
<span asp-validation-for="Input.ConfirmPassword" ></span>
</div>
<button type="submit" >Register</button>
<button type="submit" >@Localizer["Register"]</button>
</form>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
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.Data;
using O2NextGen.Auth.Web.Data;
using O2NextGen.Auth.Web.Resources;

namespace O2NextGen.Auth.Pages
namespace O2NextGen.Auth.Web.Pages.Account
{
[AllowAnonymous]
public class RegisterModel : PageModel
Expand All @@ -18,17 +20,20 @@ public class RegisterModel : PageModel
private readonly UserManager<O2User> _userManager;
private readonly ILogger<RegisterModel> _logger;
private readonly IEmailSender _emailSender;
private readonly IStringLocalizer<SharedResource> _sharedLocalizer;

public RegisterModel(
UserManager<O2User> userManager,
SignInManager<O2User> signInManager,
ILogger<RegisterModel> logger,
IEmailSender emailSender)
IEmailSender emailSender,
IStringLocalizer<SharedResource> sharedLocalizer)
{
_userManager = userManager;
_signInManager = signInManager;
_logger = logger;
_emailSender = emailSender;
_sharedLocalizer = sharedLocalizer;
}

[BindProperty]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@using Microsoft.AspNetCore.Identity
@using O2NextGen.Auth.Pages
@using O2NextGen.Auth.Web.Pages.Account
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

2 changes: 1 addition & 1 deletion src/Services/auth/O2NextGen.Auth.Web/Program.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;

namespace O2NextGen.Auth
namespace O2NextGen.Auth.Web
{
public class Program
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>

<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">

</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CreateNewUser" xml:space="preserve">
<value>Neuen Benutzer erstellen.</value>
</data>
<data name="Register" xml:space="preserve">
<value>Registrieren</value>
</data>
<data name="Email" xml:space="preserve">
<value>Email</value>
</data>
<data name="Password" xml:space="preserve">
<value>Passwort</value>
</data>
<data name="ConfirmPassword" xml:space="preserve">
<value>Kennwort bestätigen</value>
</data>
</root>
Loading