From d8d1412a8f28d9813fcebdb8625a3d8809fa9003 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 22:28:17 +0300 Subject: [PATCH 01/19] Fallback to English as default culture --- .../Modules/Controls/ActionDialog.razor | 4 ++-- Oqtane.Client/Modules/Controls/Label.razor | 10 ++++++++-- .../Modules/Controls/LocalizableComponent.cs | 17 ++++++++++++++++- Oqtane.Client/Modules/Controls/Section.razor | 4 ++-- Oqtane.Client/Modules/Controls/TabPanel.razor | 4 ++-- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index fa992e97..ac7e4690 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -99,8 +99,8 @@ if (IsLocalizable) { - Header = Localize(nameof(Header)); - Message = Localize(nameof(Message)); + Header = Localize(nameof(Header), Header); + Message = Localize(nameof(Message), Message); } _authorized = IsAuthorized(); diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor index 3869d8b4..85e65d14 100644 --- a/Oqtane.Client/Modules/Controls/Label.razor +++ b/Oqtane.Client/Modules/Controls/Label.razor @@ -45,8 +45,14 @@ else if (IsLocalizable) { - ChildContent =@@Localize("Text"); - HelpText = Localize(nameof(HelpText)); + var value = Localize("Text"); + var key = $"{ResourceKey}.Text"; + if (!value.Equals(key)) + { + ChildContent =@@Localize("Text"); + } + + HelpText = Localize(nameof(HelpText), HelpText); } } } diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs index 80222e66..657494d7 100644 --- a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs +++ b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs @@ -24,10 +24,25 @@ namespace Oqtane.Modules.Controls { return name; } - + return _localizer?[key] ?? name; } + protected string Localize(string name, string defaultValue) + { + var key = $"{ResourceKey}.{name}"; + var value = Localize(name); + + if (value == key) + { + return defaultValue; + } + else + { + return value; + } + } + protected override void OnParametersSet() { if (!String.IsNullOrEmpty(ResourceKey)) diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor index 573a536b..fd8b9a52 100644 --- a/Oqtane.Client/Modules/Controls/Section.razor +++ b/Oqtane.Client/Modules/Controls/Section.razor @@ -49,8 +49,8 @@ if (IsLocalizable) { _heading = !string.IsNullOrEmpty(Heading) - ? Localize(nameof(Heading)) - : Localize(nameof(Name)); + ? Localize(nameof(Heading), Heading) + : Localize(nameof(Name), Name); } } } diff --git a/Oqtane.Client/Modules/Controls/TabPanel.razor b/Oqtane.Client/Modules/Controls/TabPanel.razor index 9472bab3..7c2eaa24 100644 --- a/Oqtane.Client/Modules/Controls/TabPanel.razor +++ b/Oqtane.Client/Modules/Controls/TabPanel.razor @@ -44,11 +44,11 @@ else { if (string.IsNullOrEmpty(Heading)) { - Name = Localize(nameof(Name)); + Name = Localize(nameof(Name), Name); } else { - Heading = Localize(nameof(Heading)); + Heading = Localize(nameof(Heading), Heading); } } } From 16b5dd99cc80cfbddf4b26198eaae5b2a378c660 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 22:39:38 +0300 Subject: [PATCH 02/19] Localize components for the roles pages --- Oqtane.Client/Modules/Admin/Roles/Add.razor | 6 +++--- Oqtane.Client/Modules/Admin/Roles/Edit.razor | 6 +++--- Oqtane.Client/Modules/Admin/Roles/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Roles/Users.razor | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index 34e93e2d..1f6c520f 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -6,7 +6,7 @@ - +
- + @@ -14,7 +14,7 @@
- + @@ -22,7 +22,7 @@
- + - - - + + + diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index a583aedc..e7ccd726 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -12,7 +12,7 @@ else
- + @@ -14,7 +14,7 @@
- + @@ -22,7 +22,7 @@
- + Name @context.Name
+ diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor index 3a920652..7afebdf1 100644 --- a/Oqtane.Client/_Imports.razor +++ b/Oqtane.Client/_Imports.razor @@ -7,6 +7,7 @@ @using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web +@using Microsoft.Extensions.Localization @using Microsoft.JSInterop @using Oqtane.Models From 261f48e842e52bcda9f9c219063dce43563d6a21 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 22:56:41 +0300 Subject: [PATCH 05/19] Localize components for the users pages --- Oqtane.Client/Modules/Admin/Users/Add.razor | 6 +++--- Oqtane.Client/Modules/Admin/Users/Edit.razor | 6 +++--- Oqtane.Client/Modules/Admin/Users/Index.razor | 10 +++++----- Oqtane.Client/Modules/Admin/Users/Roles.razor | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 4b15ce82..3df78894 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Users +@namespace Oqtane.Modules.Admin.Users @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService @@ -6,7 +6,7 @@ @inject ISettingService SettingService - + @if (profiles != null) {
- + @@ -20,7 +20,7 @@ else
- +
- + @@ -42,7 +42,7 @@ else
- + From c70f37d33c33bc6ef929588135060ac59bb01bd4 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 22:43:53 +0300 Subject: [PATCH 03/19] Fix resource keys --- Oqtane.Client/Modules/Admin/Roles/Users.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index e7ccd726..17028d43 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -12,7 +12,7 @@ else - + diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index 17028d43..ecd7cb91 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -1,11 +1,12 @@ -@namespace Oqtane.Modules.Admin.Roles +@namespace Oqtane.Modules.Admin.Roles @inherits ModuleBase @inject IRoleService RoleService @inject IUserRoleService UserRoleService +@inject IStringLocalizer Localizer @if (userroles == null) { -

Loading...

+

@Localizer["Loading..."]

} else { @@ -49,20 +50,20 @@ else
- + @@ -20,7 +20,7 @@ else
- + @@ -26,16 +27,16 @@
- -Cancel + +@Localizer["Cancel"] -@code { +@code { private string _name = string.Empty; private string _description = string.Empty; private string _isautoassigned = "False"; diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index e8af37fe..2598c810 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -1,7 +1,8 @@ -@namespace Oqtane.Modules.Admin.Roles +@namespace Oqtane.Modules.Admin.Roles @inherits ModuleBase @inject NavigationManager NavigationManager @inject IRoleService RoleService +@inject IStringLocalizer Localizer @@ -26,14 +27,14 @@
- -Cancel + +@Localizer["Cancel"] @code { private int _roleid; diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index 727dc184..6344925d 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -1,10 +1,11 @@ -@namespace Oqtane.Modules.Admin.Roles +@namespace Oqtane.Modules.Admin.Roles @inherits ModuleBase @inject IRoleService RoleService +@inject IStringLocalizer Localizer @if (_roles == null) { -

Loading...

+

@Localizer["Loading..."]

} else { @@ -15,7 +16,7 @@ else 		     Name@Localizer["Name"]
- - Cancel + + @Localizer["Cancel"]

-
Users@Localizer["Users"]   @context.User.DisplayName - +
@@ -53,7 +53,7 @@
} - + @if (profiles != null) { diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index 87a6a387..ed24d3cc 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Users +@namespace Oqtane.Modules.Admin.Users @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService @@ -14,7 +14,7 @@ else
} - + @if (profiles != null) {
@@ -80,7 +80,7 @@ else
} - + @if (profiles != null) { diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index efcd89a2..d0d0d76d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Users +@namespace Oqtane.Modules.Admin.Users @inherits ModuleBase @inject IUserRoleService UserRoleService @inject IUserService UserService @@ -12,7 +12,7 @@ } else { - +
@@ -27,13 +27,13 @@ else
diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 9a056a43..322fb939 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Users +@namespace Oqtane.Modules.Admin.Users @inherits ModuleBase @inject IRoleService RoleService @inject IUserService UserService @@ -13,7 +13,7 @@ else
- + - + - + @context.User.DisplayName
- + @@ -21,7 +21,7 @@ else
- +
- + @@ -43,7 +43,7 @@ else
- + From 086e3623c37b621de30f780b7d7f4e2f60331e76 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:04:16 +0300 Subject: [PATCH 06/19] Localize non components in users pages --- Oqtane.Client/Modules/Admin/Users/Add.razor | 71 ++++++++-------- Oqtane.Client/Modules/Admin/Users/Edit.razor | 80 ++++++++++--------- Oqtane.Client/Modules/Admin/Users/Index.razor | 9 ++- Oqtane.Client/Modules/Admin/Users/Roles.razor | 15 ++-- 4 files changed, 90 insertions(+), 85 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 3df78894..d669f678 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -4,6 +4,7 @@ @inject IUserService UserService @inject IProfileService ProfileService @inject ISettingService SettingService +@inject IStringLocalizer Localizer @@ -12,15 +13,15 @@ + +
- -
- + @@ -28,7 +29,7 @@
- + @@ -36,7 +37,7 @@
- + @@ -44,7 +45,7 @@
- + @@ -56,42 +57,42 @@ @if (profiles != null) { - - @foreach (Profile profile in profiles) - { - var p = profile; - if (p.Category != category) +
+ @foreach (Profile profile in profiles) { + var p = profile; + if (p.Category != category) + { + + + + category = p.Category; + } - + + - category = p.Category; } - - - - - } -
+ @p.Category +
- @p.Category - + + + @if (p.IsRequired) + { + + } + else + { + + } +
- - - @if (p.IsRequired) - { - - } - else - { - - } -
+
} - -Cancel + +@Localizer["Cancel"] @code { private string username = string.Empty; @@ -185,7 +186,7 @@ } return valid; } - + private void ProfileChanged(ChangeEventArgs e, string SettingName) { var value = (string)e.Value; diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index ed24d3cc..edabc73d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -4,6 +4,7 @@ @inject IUserService UserService @inject IProfileService ProfileService @inject ISettingService SettingService +@inject IStringLocalizer Localizer @if (PageState.User != null && photofileid != -1) { @@ -20,7 +21,7 @@ else @@ -83,43 +84,44 @@ else @if (profiles != null) { -
- + @@ -28,7 +29,7 @@ else
- + @@ -36,7 +37,7 @@ else
- + @@ -44,7 +45,7 @@ else
- + @@ -52,7 +53,7 @@ else
- + @@ -60,7 +61,7 @@ else
- + @@ -68,12 +69,12 @@ else
- +
- @foreach (Profile profile in profiles) - { - var p = profile; - if (p.Category != category) +
+ @foreach (Profile profile in profiles) { + var p = profile; + if (p.Category != category) + { + + + + category = p.Category; + } - + + - category = p.Category; } - - - - - } -
+ @p.Category +
- @p.Category - + + + @if (p.IsRequired) + { + + } + else + { + + } +
- - - @if (p.IsRequired) - { - - } - else - { - - } -
+
} - -Cancel -

+ +@Localizer["Cancel"] +
+
@code { @@ -246,7 +248,7 @@ else } return valid; } - + private void ProfileChanged(ChangeEventArgs e, string SettingName) { var value = (string)e.Value; diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index d0d0d76d..8087f2bf 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -3,11 +3,12 @@ @inject IUserRoleService UserRoleService @inject IUserService UserService @inject ISettingService SettingService +@inject IStringLocalizer Localizer @if (userroles == null) {

- Loading... + @Localizer["Loading..."]

} else @@ -15,7 +16,7 @@ else
- +
@@ -23,11 +24,11 @@ else 		     Name@Localizer["Name"] - + diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 322fb939..92229829 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -3,10 +3,11 @@ @inject IRoleService RoleService @inject IUserService UserService @inject IUserRoleService UserRoleService +@inject IStringLocalizer Localizer @if (userroles == null) { -

Loading...

+

@Localizer["Loading..."]

} else { @@ -50,23 +51,23 @@ else
- - Cancel + + @Localizer["Cancel"]

- Roles + @Localizer["Roles"]  
@context.Role.Name @if (context.Role.Name != RoleNames.Registered) - { - - } + { + + } From 5c3e22ab34b88aa825ebe11cda115e319200fdc8 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:13:13 +0300 Subject: [PATCH 07/19] Localize components of the user profile pages --- .../Modules/Admin/UserProfile/Add.razor | 8 ++++---- .../Modules/Admin/UserProfile/Index.razor | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index b19bae1d..af3782af 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.UserProfile +@namespace Oqtane.Modules.Admin.UserProfile @inherits ModuleBase @inject NavigationManager NavigationManager @inject IUserService UserService @@ -9,7 +9,7 @@ - + + @@ -42,8 +43,8 @@ - - Cancel + + @Localizer["Cancel"] } @code { diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index c017db00..758dddb4 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -1,9 +1,10 @@ -@namespace Oqtane.Modules.Admin.Themes +@namespace Oqtane.Modules.Admin.Themes @using System.Net @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService @inject IPackageService PackageService +@inject IStringLocalizer Localizer @if (_themes == null) { @@ -17,8 +18,8 @@ else
- - + + @@ -34,7 +35,7 @@ else diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor index 195b0180..eb9871c9 100644 --- a/Oqtane.Client/Modules/Admin/Themes/View.razor +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -1,8 +1,9 @@ -@namespace Oqtane.Modules.Admin.Themes +@namespace Oqtane.Modules.Admin.Themes @using System.Net @inherits ModuleBase @inject IThemeService ThemeService @inject NavigationManager NavigationManager +@inject IStringLocalizer Localizer
- + @@ -17,7 +17,7 @@
- + @@ -25,7 +25,7 @@
- + From c1fa6589af51a5f70f8ce19978412e266c635034 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:42:27 +0300 Subject: [PATCH 11/19] Localize non components for themes pages --- Oqtane.Client/Modules/Admin/Themes/Add.razor | 13 +++++++------ Oqtane.Client/Modules/Admin/Themes/Index.razor | 9 +++++---- Oqtane.Client/Modules/Admin/Themes/View.razor | 5 +++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index f320edef..6ab6fde3 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -1,9 +1,10 @@ -@namespace Oqtane.Modules.Admin.Themes +@namespace Oqtane.Modules.Admin.Themes @inherits ModuleBase @inject NavigationManager NavigationManager @inject IFileService FileService @inject IThemeService ThemeService @inject IPackageService PackageService +@inject IStringLocalizer Localizer @if (_packages != null) { @@ -14,15 +15,15 @@
-
NameVersion@Localizer["Name"]@Localizer["Version"] @context.Name @context.Version - +    NameVersion@Localizer["Name"]@Localizer["Version"]   @if (UpgradeAvailable(context.ThemeName, context.Version)) { - + }
@@ -62,7 +63,7 @@
-Cancel +@Localizer["Cancel"] @code { private string _themeName = ""; From bbda3009522f590acb77f73cd5a54939273fc57c Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:46:14 +0300 Subject: [PATCH 12/19] Localize components for the tenants pages --- Oqtane.Client/Modules/Admin/Tenants/Edit.razor | 6 +++--- Oqtane.Client/Modules/Admin/Tenants/Index.razor | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index 245ce1cb..cc0c1d77 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Tenants +@namespace Oqtane.Modules.Admin.Tenants @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService @@ -6,7 +6,7 @@ - - + + From 2672f47cdfd1c11f422ac10ee92dde499d0632ea Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:47:38 +0300 Subject: [PATCH 13/19] Localize non components of the tenants pages --- Oqtane.Client/Modules/Admin/Tenants/Edit.razor | 7 ++++--- Oqtane.Client/Modules/Admin/Tenants/Index.razor | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index cc0c1d77..34f58934 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -2,6 +2,7 @@ @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService +@inject IStringLocalizer Localizer
- + @if (name == TenantNames.Master) @@ -21,7 +21,7 @@
- + diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index 5858a059..9ecefb69 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Tenants +@namespace Oqtane.Modules.Admin.Tenants @inherits ModuleBase @inject ITenantService TenantService @inject IAliasService AliasService @@ -16,8 +16,8 @@ else Name @context.Name
@@ -29,8 +30,8 @@
- -Cancel + +@Localizer["Cancel"] @code { private int tenantid; @@ -69,7 +70,7 @@ { tenant.Name = name; tenant.DBConnectionString = connectionstring; - + await TenantService.UpdateTenantAsync(tenant); await logger.LogInformation("Tenant Saved {TenantId}", tenantid); diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index 9ecefb69..fda4c3a4 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -2,10 +2,11 @@ @inherits ModuleBase @inject ITenantService TenantService @inject IAliasService AliasService +@inject IStringLocalizer Localizer @if (tenants == null) { -

Loading...

+

@Localizer["Loading..."]

} else { @@ -13,7 +14,7 @@ else
    - Name + @Localizer["Name"]
From a14616a7c1a5bea39bcb5eb9643cba27ffd151d8 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:54:59 +0300 Subject: [PATCH 14/19] Localize system info page --- .../Modules/Admin/SystemInfo/Index.razor | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor index ca7c7f2c..98c95892 100644 --- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor +++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor @@ -1,11 +1,12 @@ -@namespace Oqtane.Modules.Admin.SystemInfo +@namespace Oqtane.Modules.Admin.SystemInfo @inherits ModuleBase @inject ISystemService SystemService +@inject IStringLocalizer Localizer
- + @@ -13,7 +14,7 @@
- + @@ -21,7 +22,7 @@
- + @@ -29,7 +30,7 @@
- + @@ -37,7 +38,7 @@
- + @@ -45,14 +46,14 @@
- +
-Access Framework API +@Localizer["Access Framework API"] @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; From 1518afbd938e5bcfad8fd9ab67fee5293e471461 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:57:58 +0300 Subject: [PATCH 15/19] Localize SQL page --- Oqtane.Client/Modules/Admin/Sql/Index.razor | 28 +++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index e27350f8..69191bab 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -1,8 +1,9 @@ -@namespace Oqtane.Modules.Admin.Sql +@namespace Oqtane.Modules.Admin.Sql @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService @inject ISqlService SqlService +@inject IStringLocalizer Localizer @if (_tenants == null) { @@ -13,11 +14,11 @@ else
- +
- +
- -

+ +
+
@if (!string.IsNullOrEmpty(_results)) { @((MarkupString)_results) @@ -78,25 +80,25 @@ else { table = "
"; table += ""; - + foreach (KeyValuePair kvp in item) { table += ""; } - + table += ""; } - + table += ""; - + foreach (KeyValuePair kvp in item) { table += ""; } - + table += ""; } - + if (table != string.Empty) { table += "
" + kvp.Key + "
" + kvp.Value + "
"; @@ -105,7 +107,7 @@ else { table = "No Results Returned"; } - + return table; } } From 236a4bd3d93796bb384eb0bbb61d30e765fd4dbb Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 18 Nov 2020 00:09:51 +0300 Subject: [PATCH 16/19] Localize components of sites page --- Oqtane.Client/Modules/Admin/Sites/Add.razor | 34 +++++++++---------- Oqtane.Client/Modules/Admin/Sites/Edit.razor | 16 ++++----- Oqtane.Client/Modules/Admin/Sites/Index.razor | 8 ++--- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 7ee36435..2c9ca321 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Sites +@namespace Oqtane.Modules.Admin.Sites @inherits ModuleBase @inject NavigationManager NavigationManager @inject ITenantService TenantService @@ -18,7 +18,7 @@ else
- + @@ -26,7 +26,7 @@ else
- + @@ -34,7 +34,7 @@ else
- +
- +
- +
- +
- +
- + @@ -123,7 +123,7 @@ else
- +
- + @@ -142,7 +142,7 @@ else
- + @@ -150,7 +150,7 @@ else
- +
- + @@ -171,7 +171,7 @@ else
- + @@ -180,7 +180,7 @@ else }
- + @@ -188,7 +188,7 @@ else
- + diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor index 43599e98..d27a1392 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor @@ -1,4 +1,4 @@ -@namespace Oqtane.Modules.Admin.Sites +@namespace Oqtane.Modules.Admin.Sites @inherits ModuleBase @inject NavigationManager NavigationManager @inject ISiteService SiteService @@ -11,7 +11,7 @@
- + @@ -19,7 +19,7 @@
- + @@ -27,7 +27,7 @@
- + @@ -36,7 +37,7 @@
- + @@ -44,7 +45,7 @@
- + @@ -52,11 +53,11 @@
- +
- +
- +
- +
- +
-
+
- + @@ -138,7 +139,7 @@
- + @@ -146,7 +147,7 @@
- + @@ -154,7 +155,7 @@
- + @@ -162,7 +163,7 @@
- + @@ -170,22 +171,22 @@
-
+
- +
- + @@ -193,7 +194,7 @@
- + @@ -203,8 +204,8 @@
- - Cancel + + @Localizer["Cancel"]

From 322d45dd12a74989b5e14d98aaae29970863eeaa Mon Sep 17 00:00:00 2001 From: hishamco Date: Thu, 19 Nov 2020 17:33:49 +0300 Subject: [PATCH 19/19] Runtime enum should be in Oqtane,Shared --- Oqtane.Client/Modules/Admin/Login/Index.razor | 2 +- Oqtane.Client/Themes/Controls/LoginBase.cs | 4 ++-- Oqtane.Client/UI/PageState.cs | 6 +++--- Oqtane.Client/UI/Runtime.cs | 5 ++++- Oqtane.Client/UI/SiteRouter.razor | 6 +++--- .../Extensions/OqtaneServiceCollectionExtensions.cs | 1 - Oqtane.Server/Startup.cs | 1 - Oqtane.Shared/Enums/Runtime.cs | 8 ++++++++ 8 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 Oqtane.Shared/Enums/Runtime.cs diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 49815187..2a1b4793 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -87,7 +87,7 @@ private async Task Login() { - if (PageState.Runtime == Runtime.Server) + if (PageState.Runtime == Oqtane.Shared.Runtime.Server) { // server-side Blazor var user = new User(); diff --git a/Oqtane.Client/Themes/Controls/LoginBase.cs b/Oqtane.Client/Themes/Controls/LoginBase.cs index 60bbb781..d923b012 100644 --- a/Oqtane.Client/Themes/Controls/LoginBase.cs +++ b/Oqtane.Client/Themes/Controls/LoginBase.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using Oqtane.Providers; using Oqtane.Services; -using Oqtane.UI; +using Oqtane.Shared; namespace Oqtane.Themes.Controls { diff --git a/Oqtane.Client/UI/PageState.cs b/Oqtane.Client/UI/PageState.cs index cde1779b..325f15d2 100644 --- a/Oqtane.Client/UI/PageState.cs +++ b/Oqtane.Client/UI/PageState.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using Oqtane.Models; @@ -19,6 +19,6 @@ namespace Oqtane.UI public string Action { get; set; } public bool EditMode { get; set; } public DateTime LastSyncDate { get; set; } - public Runtime Runtime { get; set; } + public Oqtane.Shared.Runtime Runtime { get; set; } } -} \ No newline at end of file +} diff --git a/Oqtane.Client/UI/Runtime.cs b/Oqtane.Client/UI/Runtime.cs index dcc886b1..2d7e6b00 100644 --- a/Oqtane.Client/UI/Runtime.cs +++ b/Oqtane.Client/UI/Runtime.cs @@ -1,5 +1,8 @@ -namespace Oqtane.UI +using System; + +namespace Oqtane.UI { + [Obsolete("This enum is deprecated and will be removed in the upcoming major release, please use Oqtane.Shared.Runtime instead.")] public enum Runtime { Server, diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index f95f8607..56360ca9 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -560,8 +560,8 @@ return pageresources; } - private Runtime GetRuntime() + private Oqtane.Shared.Runtime GetRuntime() => RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")) - ? Runtime.WebAssembly - : Runtime.Server; + ? Oqtane.Shared.Runtime.WebAssembly + : Oqtane.Shared.Runtime.Server; } \ No newline at end of file diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs index 3afb023b..bcfdf9a8 100644 --- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs @@ -8,7 +8,6 @@ using Oqtane.Infrastructure; using Oqtane.Modules; using Oqtane.Services; using Oqtane.Shared; -using Oqtane.UI; // ReSharper disable once CheckNamespace namespace Microsoft.Extensions.DependencyInjection diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index 8671e0f7..b008ee30 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -21,7 +21,6 @@ using Oqtane.Repository; using Oqtane.Security; using Oqtane.Services; using Oqtane.Shared; -using Oqtane.UI; namespace Oqtane { diff --git a/Oqtane.Shared/Enums/Runtime.cs b/Oqtane.Shared/Enums/Runtime.cs new file mode 100644 index 00000000..4cca8235 --- /dev/null +++ b/Oqtane.Shared/Enums/Runtime.cs @@ -0,0 +1,8 @@ +namespace Oqtane.Shared +{ + public enum Runtime + { + Server, + WebAssembly + } +}