diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..f3517506 Binary files /dev/null and b/.DS_Store differ diff --git a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/AuditLog.cshtml b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/AuditLog.cshtml index 14400545..056a5b8a 100644 --- a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/AuditLog.cshtml +++ b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/AuditLog.cshtml @@ -2,37 +2,38 @@ @model AspNetCoreHero.Boilerplate.Web.Areas.Identity.Pages.Account.AuditLogModel @{ - ViewData["Title"] = localizer["Audit Log"]; - ViewData["Caption"] = localizer["View your Recent 250 Logs here"]; + ViewData["Title"] = localizer.GetLocalizedHtmlString("Audit Log"); + ViewData["Caption"] = localizer.GetLocalizedHtmlString("View your Recent 250 Logs here"); } +@inject AspNetCoreHero.Boilerplate.Web.Services.SharedResourceLocalizer localizer;
diff --git a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Login.cshtml b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Login.cshtml index 87809ba0..118f0156 100644 --- a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Login.cshtml +++ b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Login.cshtml @@ -5,6 +5,7 @@ Layout = null; } @using AspNetCoreHero.Boilerplate.Web.Views.Shared.Components.Culture; +@inject AspNetCoreHero.Boilerplate.Web.Services.SharedResourceLocalizer localizer; @@ -26,7 +27,7 @@ @@ -46,11 +47,11 @@
-

@localizer["Login"]

+

@localizer.GetLocalizedHtmlString("Login")

- +
@@ -60,11 +61,11 @@
- +
@*
@@ -76,10 +77,10 @@
- @localizer["Forgot Password?"] + @localizer.GetLocalizedHtmlString("Forgot Password?")
- @localizer["Create an Account!"] + @localizer.GetLocalizedHtmlString("Create an Account!")
@@ -92,7 +93,7 @@
-
@localizer["Default Credentials"]
+
@localizer.GetLocalizedHtmlString("Default Credentials")
diff --git a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Register.cshtml b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Register.cshtml index 2b0d1d13..8b97a474 100644 --- a/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Register.cshtml +++ b/AspNetCoreHero.Boilerplate.Web/Areas/Identity/Pages/Account/Register.cshtml @@ -5,6 +5,7 @@ ViewData["Title"] = "Register"; Layout = null; } +@inject AspNetCoreHero.Boilerplate.Web.Services.SharedResourceLocalizer localizer; @@ -26,7 +27,7 @@
    - +
@@ -46,36 +47,36 @@
-

@localizer["Register"]

+

@localizer.GetLocalizedHtmlString("Register")
- +
- +
- +
- +
- +
- @localizer["Forgot Password?"] + @localizer.GetLocalizedHtmlString("Forgot Password?")
- @localizer["Already have an account? Login!"] + @localizer.GetLocalizedHtmlString("Already have an account? Login!")
diff --git a/AspNetCoreHero.Boilerplate.Web/Extensions/ServiceCollectionExtensions.cs b/AspNetCoreHero.Boilerplate.Web/Extensions/ServiceCollectionExtensions.cs index c15b1229..871a6c5d 100644 --- a/AspNetCoreHero.Boilerplate.Web/Extensions/ServiceCollectionExtensions.cs +++ b/AspNetCoreHero.Boilerplate.Web/Extensions/ServiceCollectionExtensions.cs @@ -21,7 +21,7 @@ public static class ServiceCollectionExtensions public static void AddMultiLingualSupport(this IServiceCollection services) { #region Registering ResourcesPath - + services.AddSingleton(); services.AddLocalization(options => options.ResourcesPath = "Resources"); #endregion Registering ResourcesPath diff --git a/AspNetCoreHero.Boilerplate.Web/Services/SharedResourceLocalizer.cs b/AspNetCoreHero.Boilerplate.Web/Services/SharedResourceLocalizer.cs new file mode 100644 index 00000000..aa5e8db1 --- /dev/null +++ b/AspNetCoreHero.Boilerplate.Web/Services/SharedResourceLocalizer.cs @@ -0,0 +1,29 @@ +using System; +using System.Reflection; +using Microsoft.Extensions.Localization; + +namespace AspNetCoreHero.Boilerplate.Web.Services +{ + public class SharedResourceLocalizer + { + public readonly IStringLocalizer _localizer; + + public SharedResourceLocalizer(IStringLocalizerFactory factory) + { + var type = typeof(SharedResource); + var assemblyName = new AssemblyName(type.GetTypeInfo().Assembly.FullName); + _localizer = factory.Create("SharedResource", assemblyName.Name); + } + + public LocalizedString GetLocalizedHtmlString(string key) + { + return _localizer[key]; + } + + public LocalizedString GetLocalizedHtmlString(string key, string parameter) + { + return _localizer[key, parameter]; + } + + } +}
- @localizer["Id"] + @localizer.GetLocalizedHtmlString("Id") - @localizer["Date"] + @localizer.GetLocalizedHtmlString("Date") - @localizer["Action"] + @localizer.GetLocalizedHtmlString("Action") - @localizer["Module"] + @localizer.GetLocalizedHtmlString("Module") - @localizer["Key"] + @localizer.GetLocalizedHtmlString("Key") - @localizer["Affected Columns"] + @localizer.GetLocalizedHtmlString("Affected Columns") - @localizer["Old Values"] + @localizer.GetLocalizedHtmlString("Old Values") - @localizer["New Values"] + @localizer.GetLocalizedHtmlString("New Values")