From 1b44de69726dcd4c5a26cf3980ab0b0ce52ff3ab Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:40:23 +0300 Subject: [PATCH 1/2] Localize components for the themes pages --- Oqtane.Client/Modules/Admin/Themes/Add.razor | 6 +++--- Oqtane.Client/Modules/Admin/Themes/Index.razor | 4 ++-- Oqtane.Client/Modules/Admin/Themes/View.razor | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index eda40597..f320edef 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -10,7 +10,7 @@ @if (_packages.Count > 0) { - +
@@ -28,11 +28,11 @@ } - + - + diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor index eb655799..195b0180 100644 --- a/Oqtane.Client/Modules/Admin/Themes/View.razor +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -7,7 +7,7 @@
- + diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 29ed1b00..c017db00 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -22,11 +22,11 @@ else   @if (context.AssemblyName != "Oqtane.Client") { - + } @context.Name
- + + @@ -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
- + @@ -15,7 +15,7 @@
- + @@ -23,7 +23,7 @@
- + @@ -31,7 +31,7 @@
- + @@ -39,7 +39,7 @@
- + @@ -47,7 +47,7 @@
- + @@ -55,7 +55,7 @@
- + From c1fa6589af51a5f70f8ce19978412e266c635034 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 17 Nov 2020 23:42:27 +0300 Subject: [PATCH 2/2] 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 = "";