From 2ea0b7199b6b3c65b9218a3e6486a1dea32e35e6 Mon Sep 17 00:00:00 2001 From: hishamco Date: Fri, 27 Nov 2020 21:48:52 +0300 Subject: [PATCH 1/4] Localize log messages --- Oqtane.Server/Infrastructure/LogManager.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 52a4736a..19f579ee 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -1,15 +1,14 @@ -using Oqtane.Shared; using System; -using Oqtane.Models; -using System.Text.Json; -using Microsoft.Extensions.Configuration; -using Microsoft.AspNetCore.Http; using System.Collections.Generic; +using System.Text.Json; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Localization; using Oqtane.Enums; +using Oqtane.Models; using Oqtane.Repository; using Oqtane.Security; -// ReSharper disable StringIndexOfIsCultureSpecific.2 -// ReSharper disable StringIndexOfIsCultureSpecific.1 +using Oqtane.Shared; namespace Oqtane.Infrastructure { @@ -20,14 +19,16 @@ namespace Oqtane.Infrastructure private readonly IConfigurationRoot _config; private readonly IUserPermissions _userPermissions; private readonly IHttpContextAccessor _accessor; + private readonly IStringLocalizer _localizer; - public LogManager(ILogRepository logs, ITenantResolver tenantResolver, IConfigurationRoot config, IUserPermissions userPermissions, IHttpContextAccessor accessor) + public LogManager(ILogRepository logs, ITenantResolver tenantResolver, IConfigurationRoot config, IUserPermissions userPermissions, IHttpContextAccessor accessor, IStringLocalizer localizer) { _logs = logs; _tenantResolver = tenantResolver; _config = config; _userPermissions = userPermissions; _accessor = accessor; + _localizer = localizer; } public void Log(LogLevel level, object @class, LogFunction function, string message, params object[] args) @@ -123,6 +124,7 @@ namespace Oqtane.Infrastructure log.LogDate = DateTime.UtcNow; log.Server = Environment.MachineName; log.MessageTemplate = log.Message; + log.Message = _localizer[log.Message]; log = ProcessStructuredLog(log); try { From d5e48296edb68539704e08b4e4e2228f263c5372 Mon Sep 17 00:00:00 2001 From: hishamco Date: Fri, 27 Nov 2020 22:06:40 +0300 Subject: [PATCH 2/4] Set RootNamespace --- Oqtane.Server/AssemblyInfo.cs | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Oqtane.Server/AssemblyInfo.cs diff --git a/Oqtane.Server/AssemblyInfo.cs b/Oqtane.Server/AssemblyInfo.cs new file mode 100644 index 00000000..d598bfb9 --- /dev/null +++ b/Oqtane.Server/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using Microsoft.Extensions.Localization; + +[assembly: RootNamespace("Oqtane")] From d964c25596608003cf7eb1fb4851e32126b240f4 Mon Sep 17 00:00:00 2001 From: hishamco Date: Fri, 27 Nov 2020 22:06:54 +0300 Subject: [PATCH 3/4] Add Resources folder --- Oqtane.Server/Resources/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Oqtane.Server/Resources/.gitkeep diff --git a/Oqtane.Server/Resources/.gitkeep b/Oqtane.Server/Resources/.gitkeep new file mode 100644 index 00000000..e69de29b From e9a58138fc8003697fea4f2b91a09493426af6c4 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 30 Nov 2020 18:59:44 -0500 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 356567ac..5a7477a6 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ This project is a work in progress and the schedule for implementing enhancement V.2.1.0 ( Q1 2021 ) - [ ] Complete Static Localization of Admin UI +- [ ] Cross Platform Database Support ( ie. SQLite ) - [ ] EF Core Migrations for Database Installation/Upgrade -- [ ] Support for Multiple Relational Databases ( ie. SQLite ) V.2.0.0 ( released in conjuntion with .NET 5 on Nov 11, 2020 ) - [x] Migration to .NET 5