From 4a8bcc6f716e06d47ad600e5d842cc52324d2247 Mon Sep 17 00:00:00 2001 From: HonesDK <51191152+HonesDK@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:11:29 +0200 Subject: [PATCH 1/3] Fixed modified by localization, and added DateTimeFormat to localization --- Oqtane.Client/Modules/Controls/AuditInfo.razor | 6 ++++-- Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index d36e7f9a..21d6eb12 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -40,6 +40,8 @@ protected override void OnParametersSet() { + DateTimeFormat = Localizer["DateTimeFormat"]; + _text = string.Empty; if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn.HasValue) { @@ -64,12 +66,12 @@ if (!String.IsNullOrEmpty(ModifiedBy)) { - _text += $" {Localizer["by"]} {ModifiedBy}"; + _text += $" {Localizer["By"]} {ModifiedBy}"; } if (ModifiedOn != null) { - _text += $" {Localizer["on"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["On"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; } _text += "

"; diff --git a/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx index eabb94a1..557ad302 100644 --- a/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx +++ b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx @@ -132,4 +132,7 @@ Deleted + + MMM dd yyyy HH:mm:ss + \ No newline at end of file From dbb58541f2c4d70a4eb3182ce3c018b8b3f1cd39 Mon Sep 17 00:00:00 2001 From: HonesDK <51191152+HonesDK@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:51:21 +0200 Subject: [PATCH 2/3] Revert "Fixed modified by localization, and added DateTimeFormat to localization" This reverts commit 4a8bcc6f716e06d47ad600e5d842cc52324d2247. --- Oqtane.Client/Modules/Controls/AuditInfo.razor | 6 ++---- Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index 21d6eb12..d36e7f9a 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -40,8 +40,6 @@ protected override void OnParametersSet() { - DateTimeFormat = Localizer["DateTimeFormat"]; - _text = string.Empty; if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn.HasValue) { @@ -66,12 +64,12 @@ if (!String.IsNullOrEmpty(ModifiedBy)) { - _text += $" {Localizer["By"]} {ModifiedBy}"; + _text += $" {Localizer["by"]} {ModifiedBy}"; } if (ModifiedOn != null) { - _text += $" {Localizer["On"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["on"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; } _text += "

"; diff --git a/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx index 557ad302..eabb94a1 100644 --- a/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx +++ b/Oqtane.Client/Resources/Modules/Controls/AuditInfo.resx @@ -132,7 +132,4 @@ Deleted - - MMM dd yyyy HH:mm:ss - \ No newline at end of file From b567d02df2da6884a2a905b2afd6e75d13529395 Mon Sep 17 00:00:00 2001 From: HonesDK <51191152+HonesDK@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:52:30 +0200 Subject: [PATCH 3/3] Fixed localization in AuditInfo --- Oqtane.Client/Modules/Controls/AuditInfo.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index d36e7f9a..acbb3dc6 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -64,12 +64,12 @@ if (!String.IsNullOrEmpty(ModifiedBy)) { - _text += $" {Localizer["by"]} {ModifiedBy}"; + _text += $" {Localizer["By"]} {ModifiedBy}"; } if (ModifiedOn != null) { - _text += $" {Localizer["on"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["On"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; } _text += "

";