From a29d7b524cc68b0ddcc13581e3965eaa766771cf Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 9 Dec 2020 21:12:00 +0300 Subject: [PATCH] Localize alert messages in admin pages --- Oqtane.Client/Modules/Admin/Error/Index.razor | 7 ++++--- Oqtane.Client/Modules/Admin/Files/Add.razor | 10 +++++----- Oqtane.Client/Modules/Admin/Files/Details.razor | 6 +++--- Oqtane.Client/Modules/Admin/Files/Edit.razor | 16 ++++++++-------- Oqtane.Client/Modules/Admin/Files/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Jobs/Add.razor | 4 ++-- Oqtane.Client/Modules/Admin/Jobs/Edit.razor | 6 +++--- Oqtane.Client/Modules/Admin/Jobs/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Login/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Logs/Detail.razor | 2 +- Oqtane.Client/Modules/Admin/Logs/Index.razor | 8 ++++---- .../Modules/Admin/ModuleCreator/Index.razor | 8 ++++---- .../Modules/Admin/ModuleDefinitions/Add.razor | 8 ++++---- .../Modules/Admin/ModuleDefinitions/Edit.razor | 4 ++-- .../Modules/Admin/ModuleDefinitions/Index.razor | 10 +++++----- Oqtane.Client/Modules/Admin/Modules/Import.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Pages/Add.razor | 12 ++++++------ Oqtane.Client/Modules/Admin/Pages/Edit.razor | 12 ++++++------ Oqtane.Client/Modules/Admin/Pages/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Profiles/Edit.razor | 4 ++-- Oqtane.Client/Modules/Admin/Profiles/Index.razor | 4 ++-- .../Modules/Admin/RecycleBin/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Register/Index.razor | 16 ++++++++-------- Oqtane.Client/Modules/Admin/Reset/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Roles/Add.razor | 2 +- Oqtane.Client/Modules/Admin/Roles/Edit.razor | 4 ++-- Oqtane.Client/Modules/Admin/Roles/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Roles/Users.razor | 14 +++++++------- Oqtane.Client/Modules/Admin/Site/Index.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Sites/Add.razor | 12 ++++++------ Oqtane.Client/Modules/Admin/Sites/Edit.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Sites/Index.razor | 4 ++-- Oqtane.Client/Modules/Admin/Sql/Index.razor | 2 +- .../Modules/Admin/SystemInfo/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Tenants/Edit.razor | 4 ++-- Oqtane.Client/Modules/Admin/Tenants/Index.razor | 4 ++-- Oqtane.Client/Modules/Admin/Themes/Add.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Themes/Index.razor | 10 +++++----- Oqtane.Client/Modules/Admin/Themes/View.razor | 2 +- Oqtane.Client/Modules/Admin/Upgrade/Index.razor | 4 ++-- .../Modules/Admin/UserProfile/Add.razor | 4 ++-- .../Modules/Admin/UserProfile/Index.razor | 12 ++++++------ .../Modules/Admin/UserProfile/View.razor | 6 +++--- Oqtane.Client/Modules/Admin/Users/Add.razor | 10 +++++----- Oqtane.Client/Modules/Admin/Users/Edit.razor | 8 ++++---- Oqtane.Client/Modules/Admin/Users/Roles.razor | 14 +++++++------- 46 files changed, 163 insertions(+), 162 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Error/Index.razor b/Oqtane.Client/Modules/Admin/Error/Index.razor index 7ddb0ce3..381665ae 100644 --- a/Oqtane.Client/Modules/Admin/Error/Index.razor +++ b/Oqtane.Client/Modules/Admin/Error/Index.razor @@ -1,6 +1,7 @@ -@namespace Oqtane.Modules.Admin.Error +@namespace Oqtane.Modules.Admin.Error @inherits ModuleBase @inject IModuleService ModuleService +@inject IStringLocalizer Localizer @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; @@ -10,10 +11,10 @@ Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId); if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) { - string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName; + string message = Localizer["A Problem Was Encountered Loading Module {0}", module.ModuleDefinitionName]; AddModuleMessage(message, MessageType.Error); } - + await logger.LogCritical("Error Loading Module {Module}", module); } } diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index 33633fe0..a848ee19 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -74,7 +74,7 @@ { if (url == string.Empty || _folderId == -1) { - AddModuleMessage("You Must Enter A Url And Select A Folder", MessageType.Warning); + AddModuleMessage(Localizer["You Must Enter A Url And Select A Folder"], MessageType.Warning); return; } @@ -83,13 +83,13 @@ if (!Constants.UploadableFiles.Split(',') .Contains(Path.GetExtension(filename).ToLower().Replace(".", ""))) { - AddModuleMessage("File Could Not Be Downloaded From Url Due To Its File Extension", MessageType.Warning); + AddModuleMessage(Localizer["File Could Not Be Downloaded From Url Due To Its File Extension"], MessageType.Warning); return; } if (!filename.IsPathOrFileValid()) { - AddModuleMessage("You Must Enter A Url With A Valid File Name", MessageType.Warning); + AddModuleMessage(Localizer["You Must Enter A Url With A Valid File Name"], MessageType.Warning); return; } @@ -97,12 +97,12 @@ { await FileService.UploadFileAsync(url, _folderId); await logger.LogInformation("File Downloaded Successfully From Url {Url}", url); - AddModuleMessage("File Downloaded Successfully From Url", MessageType.Success); + AddModuleMessage(Localizer["File Downloaded Successfully From Url"], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message); - AddModuleMessage("Error Downloading File From Url. Please Verify That The Url Is Valid.", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading File From Url. Please Verify That The Url Is Valid."], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor index 1ec0107d..93bd73a8 100644 --- a/Oqtane.Client/Modules/Admin/Files/Details.razor +++ b/Oqtane.Client/Modules/Admin/Files/Details.razor @@ -81,7 +81,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading File {FileId} {Error}", _fileId, ex.Message); - AddModuleMessage("Error Loading File", MessageType.Error); + AddModuleMessage(Localizer["Error Loading File"], MessageType.Error); } } @@ -100,13 +100,13 @@ } else { - AddModuleMessage("File Name Not Valid", MessageType.Warning); + AddModuleMessage(Localizer["File Name Not Valid"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message); - AddModuleMessage("Error Saving File", MessageType.Error); + AddModuleMessage(Localizer["Error Saving File"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index 3ceca35c..892f0559 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -108,7 +108,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message); - AddModuleMessage("Error Loading Folder", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Folder"], MessageType.Error); } } @@ -116,13 +116,13 @@ { if (_name == string.Empty || _parentId == -1) { - AddModuleMessage("Folders Must Have A Parent And A Name", MessageType.Warning); + AddModuleMessage(Localizer["Folders Must Have A Parent And A Name"], MessageType.Warning); return; } if (!_name.IsPathOrFileValid()) { - AddModuleMessage("Folder Name Not Valid.", MessageType.Warning); + AddModuleMessage(Localizer["Folder Name Not Valid."], MessageType.Warning); return; } @@ -170,13 +170,13 @@ } else { - AddModuleMessage("An Error Was Encountered Saving The Folder", MessageType.Error); + AddModuleMessage(Localizer["An Error Was Encountered Saving The Folder"], MessageType.Error); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message); - AddModuleMessage("Error Saving Folder", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Folder"], MessageType.Error); } } @@ -204,18 +204,18 @@ } else { - AddModuleMessage("Folder Has Files And Cannot Be Deleted", MessageType.Warning); + AddModuleMessage(Localizer["Folder Has Files And Cannot Be Deleted"], MessageType.Warning); } } else { - AddModuleMessage("Folder Has Subfolders And Cannot Be Deleted", MessageType.Warning); + AddModuleMessage(Localizer["Folder Has Subfolders And Cannot Be Deleted"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message); - AddModuleMessage("Error Deleting Folder", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Folder"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 82da2bb7..26cd56f9 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -73,7 +73,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); - AddModuleMessage("Error Loading Files", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Files"], MessageType.Error); } } @@ -93,7 +93,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); - AddModuleMessage("Error Loading Files", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Files"], MessageType.Error); } } @@ -103,14 +103,14 @@ { await FileService.DeleteFileAsync(file.FileId); await logger.LogInformation("File Deleted {File}", file.Name); - AddModuleMessage("File " + file.Name + " Deleted", MessageType.Success); + AddModuleMessage(Localizer["File {0} Deleted", file.Name], MessageType.Success); await GetFiles(); StateHasChanged(); } catch (Exception ex) { await logger.LogError(ex, "Error Deleting File {File} {Error}", file.Name, ex.Message); - AddModuleMessage("Error Deleting File " + file.Name, MessageType.Error); + AddModuleMessage(Localizer["Error Deleting File {0}", file.Name], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor index fde389bf..8535d2c0 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor @@ -129,12 +129,12 @@ catch (Exception ex) { await logger.LogError(ex, "Error Adding Job {Job} {Error}", job, ex.Message); - AddModuleMessage("Error Adding Job", MessageType.Error); + AddModuleMessage(Localizer["Error Adding Job"], MessageType.Error); } } else { - AddModuleMessage("You Must Provide The Job Name, Type, Frequency, and Retention", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide The Job Name, Type, Frequency, and Retention"], MessageType.Warning); } } diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index 62929440..65043de8 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -118,7 +118,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message); - AddModuleMessage("Error Loading Job", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Job"], MessageType.Error); } } @@ -171,12 +171,12 @@ catch (Exception ex) { await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message); - AddModuleMessage("Error Updating Job", MessageType.Error); + AddModuleMessage(Localizer["Error Updating Job"], MessageType.Error); } } else { - AddModuleMessage("You Must Provide The Job Name, Type, Frequency, and Retention", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide The Job Name, Type, Frequency, and Retention"], MessageType.Warning); } } diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor index f2a02c75..7a435f77 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor @@ -119,7 +119,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message); - AddModuleMessage("Error Deleting Job", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Job"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 25d5b2ae..bc53678e 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -76,11 +76,11 @@ if (user != null) { - _message = "User Account Verified Successfully. You Can Now Login With Your Username And Password Below."; + _message = Localizer["User Account Verified Successfully. You Can Now Login With Your Username And Password Below."]; } else { - _message = "User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions."; + _message = Localizer["User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions."]; _type = MessageType.Warning; } } @@ -109,7 +109,7 @@ else { await logger.LogInformation("Login Failed For Username {Username}", _username); - AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Email Verification When They Initially Created.", MessageType.Error); + AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Email Verification When They Initially Created."], MessageType.Error); } } else @@ -130,7 +130,7 @@ else { await logger.LogInformation("Login Failed For Username {Username}", _username); - AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.", MessageType.Error); + AddModuleMessage(Localizer["Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email."], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 7c2c1303..481a9636 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -207,7 +207,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message); - AddModuleMessage("Error Loading Log", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Log"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index a0ea8b04..3ace61fd 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -88,7 +88,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); - AddModuleMessage("Error Loading Logs", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error); } } @@ -103,7 +103,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); - AddModuleMessage("Error Loading Logs", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error); } } @@ -118,7 +118,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); - AddModuleMessage("Error Loading Logs", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error); } } @@ -134,7 +134,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); - AddModuleMessage("Error Loading Logs", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index f3712317..79d5eb42 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -105,7 +105,7 @@ else } else { - AddModuleMessage("Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below", MessageType.Info); + AddModuleMessage(Localizer["Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below"], MessageType.Info); } } @@ -122,11 +122,11 @@ else SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName); await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId); - AddModuleMessage("The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } else { - AddModuleMessage("You Must Provide A Valid Owner Name, Module Name, And Template", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Valid Owner Name, Module Name, And Template"], MessageType.Warning); } } catch (Exception ex) @@ -187,7 +187,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Getting System Info {Error}", ex.Message); - AddModuleMessage("Error Getting System Info", MessageType.Error); + AddModuleMessage(Localizer["Error Getting System Info"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 22d08ac2..92f26844 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -70,7 +70,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message); - AddModuleMessage("Error Loading Packages", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Packages"], MessageType.Error); } } @@ -79,7 +79,7 @@ try { await ModuleDefinitionService.InstallModuleDefinitionsAsync(); - AddModuleMessage("Module Installed Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Module Installed Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { @@ -93,13 +93,13 @@ { await PackageService.DownloadPackageAsync(packageid, version, "Modules"); await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version); - AddModuleMessage("Modules Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success); + AddModuleMessage(Localizer["Modules Downloaded Successfully. Click Install To Complete Installation."], MessageType.Success); StateHasChanged(); } catch (Exception ex) { await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version); - AddModuleMessage("Error Downloading Module", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading Module"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index b47700eb..367abce8 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -161,7 +161,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); - AddModuleMessage("Error Loading Module", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Module"], MessageType.Error); } } @@ -190,7 +190,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); - AddModuleMessage("Error Saving Module", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Module"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index da1f58a8..a3f0b71e 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -59,7 +59,7 @@ else if (_moduleDefinitions == null) { await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message); - AddModuleMessage("Error Loading Modules", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Modules"], MessageType.Error); } } } @@ -86,12 +86,12 @@ else await PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules"); await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version); await ModuleDefinitionService.InstallModuleDefinitionsAsync(); - AddModuleMessage("Module Installed Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Module Installed Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", moduledefinitionname, version, ex.Message); - AddModuleMessage("Error Downloading Module", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading Module"], MessageType.Error); } } @@ -100,12 +100,12 @@ else try { await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId); - AddModuleMessage("Module Deleted Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Module Deleted Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message); - AddModuleMessage("Error Deleting Module", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Module"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 585aeeda..423361f6 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -35,22 +35,22 @@ bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content); if (success) { - AddModuleMessage("Content Imported Successfully", MessageType.Success); + AddModuleMessage(Localizer["Content Imported Successfully"], MessageType.Success); } else { - AddModuleMessage("A Problem Was Encountered Importing Content. Please Ensure The Content Is Formatted Correctly For The Module.", MessageType.Warning); + AddModuleMessage(Localizer["A Problem Was Encountered Importing Content. Please Ensure The Content Is Formatted Correctly For The Module."], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message); - AddModuleMessage("Error Importing Module", MessageType.Error); + AddModuleMessage(Localizer["Error Importing Module"], MessageType.Error); } } else { - AddModuleMessage("You Must Enter Some Content To Import", MessageType.Warning); + AddModuleMessage(Localizer["You Must Enter Some Content To Import"], MessageType.Warning); } } } diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 1d205ba5..72bc3c6f 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -230,7 +230,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message); - AddModuleMessage("Error Initializing Page", MessageType.Error); + AddModuleMessage(Localizer["Error Initializing Page"], MessageType.Error); } } @@ -265,7 +265,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); - AddModuleMessage("Error Loading Child Pages For Parent", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Child Pages For Parent"], MessageType.Error); } } @@ -291,7 +291,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); - AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error); } } @@ -337,7 +337,7 @@ if (!PagePathIsUnique(page.Path, page.SiteId, _pageList)) { - AddModuleMessage($"A page with path {_path} already exists for the selected parent page. The page path needs to be unique for the selected parent.", MessageType.Warning); + AddModuleMessage(Localizer["A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.", _path], MessageType.Warning); return; } @@ -390,14 +390,14 @@ } else { - AddModuleMessage("You Must Provide Page Name And Theme/Layout", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide Page Name And Theme/Layout"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message); - AddModuleMessage("Error Saving Page", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Page"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 19f58753..7cd500a6 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -309,7 +309,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message); - AddModuleMessage("Error Loading Page", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Page"], MessageType.Error); } } @@ -352,7 +352,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); - AddModuleMessage("Error Loading Child Pages For Parent", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Child Pages For Parent"], MessageType.Error); } } @@ -378,7 +378,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); - AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error); } } @@ -424,7 +424,7 @@ if (!PagePathIsUnique(page.Path, page.SiteId, page.PageId, _pageList)) { - AddModuleMessage($"A page with path {_path} already exists for the selected parent page. The page path needs to be unique for the selected parent.", MessageType.Warning); + AddModuleMessage(Localizer["A page with path {0} already exists for the selected parent page. The page path needs to be unique for the selected parent.", _path], MessageType.Warning); return; } @@ -497,13 +497,13 @@ } else { - AddModuleMessage("You Must Provide Page Name", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide Page Name"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message); - AddModuleMessage("Error Saving Page", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Page"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index 4e3966f9..4ff925fc 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -38,7 +38,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Deleting Page {Page} {Error}", page, ex.Message); - AddModuleMessage("Error Deleting Page", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Page"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index 4eab45b9..86a71c8c 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -138,7 +138,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message); - AddModuleMessage("Error Loading Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Profile"], MessageType.Error); } } @@ -182,7 +182,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message); - AddModuleMessage("Error Saving Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Profile"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor index e7985f51..0bdf8554 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor @@ -41,12 +41,12 @@ else { await ProfileService.DeleteProfileAsync(profileId); await logger.LogInformation("Profile Deleted {ProfileId}", profileId); - AddModuleMessage("Profile Deleted", MessageType.Success); + AddModuleMessage(Localizer["Profile Deleted"], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message); - AddModuleMessage("Error Deleting Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Profile"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor index 15725daa..2d81476a 100644 --- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor +++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor @@ -78,7 +78,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message); - AddModuleMessage("Error Loading Deleted Pages Or Modules", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Deleted Pages Or Modules"], MessageType.Error); } } @@ -105,7 +105,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message); - AddModuleMessage("Error Restoring Deleted Page", MessageType.Error); + AddModuleMessage(Localizer["Error Restoring Deleted Page"], MessageType.Error); } } @@ -140,7 +140,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message); - AddModuleMessage("Error Restoring Deleted Module", MessageType.Error); + AddModuleMessage(Localizer["Error Restoring Deleted Module"], MessageType.Error); } } @@ -164,7 +164,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message); - AddModuleMessage("Error Permanently Deleting Module", MessageType.Error); + AddModuleMessage(Localizer["Error Permanently Deleting Module"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index dfff44e0..a9789507 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -11,10 +11,10 @@ ... - + - +
@@ -45,7 +45,7 @@ } else { - + } @code { @@ -80,28 +80,28 @@ else if (user != null) { await logger.LogInformation("User Created {Username} {Email}", _username, _email); - AddModuleMessage("User Account Created. Please Check Your Email For Verification Instructions.", MessageType.Info); + AddModuleMessage(Localizer["User Account Created. Please Check Your Email For Verification Instructions."], MessageType.Info); } else { await logger.LogError("Error Adding User {Username} {Email}", _username, _email); - AddModuleMessage("Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.", MessageType.Error); + AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use."], MessageType.Error); } } else { - AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); + AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Username, Password, and Email Address", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Username, Password, and Email Address"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message); - AddModuleMessage("Error Adding User", MessageType.Error); + AddModuleMessage(Localizer["Error Adding User"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor index 1a04eb46..4ee8ed15 100644 --- a/Oqtane.Client/Modules/Admin/Reset/Index.razor +++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor @@ -64,23 +64,23 @@ else { await logger.LogError("Error Resetting User Password {Username}", _username); - AddModuleMessage("Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.", MessageType.Error); + AddModuleMessage(Localizer["Error Resetting User Password. Please Ensure Password Meets Complexity Requirements."], MessageType.Error); } } else { - AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); + AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Username, Password, and Email Address", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Username, Password, and Email Address"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message); - AddModuleMessage("Error Resetting User Password", MessageType.Error); + AddModuleMessage(Localizer["Error Resetting User Password"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index e9fc5372..c5bc2a38 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -62,7 +62,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message); - AddModuleMessage("Error Adding Role", MessageType.Error); + AddModuleMessage(Localizer["Error Adding Role"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index 2598c810..bac812c9 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -60,7 +60,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Role {RoleId} {Error}", _roleid, ex.Message); - AddModuleMessage("Error Loading Role", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Role"], MessageType.Error); } } @@ -81,7 +81,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message); - AddModuleMessage("Error Saving Role", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Role"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor index b221904d..3afa6c88 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor @@ -48,7 +48,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message); - AddModuleMessage("Error Deleting Role", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Role"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index a4b40921..9ceae846 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -95,7 +95,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Users {Error}", ex.Message); - AddModuleMessage("Error Loading Users", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Users"], MessageType.Error); } } @@ -109,7 +109,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message); - AddModuleMessage("Error Loading User Roles", MessageType.Error); + AddModuleMessage(Localizer["Error Loading User Roles"], MessageType.Error); } } @@ -170,17 +170,17 @@ else await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); - AddModuleMessage("User Assigned To Role", MessageType.Success); + AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); } else { - AddModuleMessage("You Must Select A User", MessageType.Warning); + AddModuleMessage(Localizer["You Must Select A User"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message); - AddModuleMessage("Error Saving User Roles", MessageType.Error); + AddModuleMessage(Localizer["Error Saving User Roles"], MessageType.Error); } } @@ -191,12 +191,12 @@ else await UserRoleService.DeleteUserRoleAsync(UserRoleId); await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); - AddModuleMessage("User Removed From Role", MessageType.Success); + AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); - AddModuleMessage("Error Removing User From Role", MessageType.Error); + AddModuleMessage(Localizer["Error Removing User From Role"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 0f9ebd40..3910ab9b 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -353,7 +353,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); - AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error); } } @@ -444,18 +444,18 @@ } else { - AddModuleMessage("An Alias Specified Has Already Been Used For Another Site", MessageType.Warning); + AddModuleMessage(Localizer["An Alias Specified Has Already Been Used For Another Site"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Site Name, Alias, And Default Theme/Layout/Container", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Site Name, Alias, And Default Theme/Layout/Container"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message); - AddModuleMessage("Error Saving Site", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Site"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 0c0ba746..2945f23a 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -283,7 +283,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); - AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error); } } @@ -347,17 +347,17 @@ else } else { - AddModuleMessage("You Must Specify A Server And Database", MessageType.Error); + AddModuleMessage(Localizer["You Must Specify A Server And Database"], MessageType.Error); } } else { - AddModuleMessage("Invalid Host Password", MessageType.Error); + AddModuleMessage(Localizer["Invalid Host Password"], MessageType.Error); } } else { - AddModuleMessage("Tenant Name Is Missing Or Already Exists", MessageType.Error); + AddModuleMessage(Localizer["Tenant Name Is Missing Or Already Exists"], MessageType.Error); } } else @@ -398,12 +398,12 @@ else } else { - AddModuleMessage(string.Join(", ", duplicates.ToArray()) + " Already Used For Another Site", MessageType.Warning); + AddModuleMessage(Localizer["{0} Already Used For Another Site", string.Join(", ", duplicates.ToArray())], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Layout/Container, And Site Template", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Tenant, Site Name, Alias, Default Theme/Layout/Container, And Site Template"], MessageType.Warning); } } } diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor index 89c1c1d7..3d01cf2e 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor @@ -198,7 +198,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); - AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Pane Layouts For Theme"], MessageType.Error); } } @@ -264,18 +264,18 @@ } else { - AddModuleMessage("An Alias Specified Has Already Been Used For Another Site", MessageType.Warning); + AddModuleMessage(Localizer["An Alias Specified Has Already Been Used For Another Site"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Site Name, Alias, And Default Theme/Container", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Site Name, Alias, And Default Theme/Container"], MessageType.Warning); } } catch (Exception ex) { await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message); - AddModuleMessage("Error Saving Site", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Site"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index 2daf9b56..3a571cd3 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -69,13 +69,13 @@ else } else { - AddModuleMessage("You Can Not Delete The Current Site", MessageType.Warning); + AddModuleMessage(Localizer["You Can Not Delete The Current Site"], MessageType.Warning); } } catch (Exception ex) { await Log(alias, LogLevel.Error, "", ex, "Error Deleting Site {SiteId} {Error}", alias.SiteId, ex.Message); - AddModuleMessage("Error Deleting Site", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Site"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index c003d1b4..5edd39ab 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -67,7 +67,7 @@ else } else { - AddModuleMessage("You Must Select A Tenant And Provide A SQL Query", MessageType.Warning); + AddModuleMessage(Localizer["You Must Select A Tenant And Provide A SQL Query"], MessageType.Warning); } } diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor index 5a1e485a..e7e69635 100644 --- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor +++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor @@ -55,7 +55,7 @@ @Localizer["Access Framework API"]  - + @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; diff --git a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor index 34f58934..247b338a 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Edit.razor @@ -56,7 +56,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", tenantid, ex.Message); - AddModuleMessage("Error Loading Tenant", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Tenant"], MessageType.Error); } } @@ -80,7 +80,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Saving Tenant {TenantId} {Error}", tenantid, ex.Message); - AddModuleMessage("Error Saving Tenant", MessageType.Error); + AddModuleMessage(Localizer["Error Saving Tenant"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Tenants/Index.razor b/Oqtane.Client/Modules/Admin/Tenants/Index.razor index bf27d99f..2aa70ecb 100644 --- a/Oqtane.Client/Modules/Admin/Tenants/Index.razor +++ b/Oqtane.Client/Modules/Admin/Tenants/Index.razor @@ -56,13 +56,13 @@ else } else { - AddModuleMessage("Tenant Cannot Be Deleted Until The Following Sites Are Deleted: " + message.Substring(2), MessageType.Warning); + AddModuleMessage(Localizer["Tenant Cannot Be Deleted Until The Following Sites Are Deleted: {0}", message.Substring(2)], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Tenant {Tenant} {Error}", Tenant, ex.Message); - AddModuleMessage("Error Deleting Tenant", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Tenant"], MessageType.Error); } } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index fa896dd4..ab042ed5 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -70,7 +70,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message); - AddModuleMessage("Error Loading Packages", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Packages"], MessageType.Error); } } @@ -79,7 +79,7 @@ try { await ThemeService.InstallThemesAsync(); - AddModuleMessage("Theme Installed Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Theme Installed Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { @@ -93,13 +93,13 @@ { await PackageService.DownloadPackageAsync(packageid, version, "Themes"); await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version); - AddModuleMessage("Themes Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success); + AddModuleMessage(Localizer["Themes Downloaded Successfully. Click Install To Complete Installation."], MessageType.Success); StateHasChanged(); } catch (Exception ex) { await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version); - AddModuleMessage("Error Downloading Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading Theme"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 8d27b057..816bd06f 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -61,7 +61,7 @@ else if (_themes == null) { await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message); - AddModuleMessage("Error Loading Themes", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Themes"], MessageType.Error); } } } @@ -87,12 +87,12 @@ else await PackageService.DownloadPackageAsync(themename, version, "Themes"); await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version); await ThemeService.InstallThemesAsync(); - AddModuleMessage("Theme Installed Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Theme Installed Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", themename, version, ex.Message); - AddModuleMessage("Error Downloading Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading Theme"], MessageType.Error); } } @@ -101,12 +101,12 @@ else try { await ThemeService.DeleteThemeAsync(Theme.ThemeName); - AddModuleMessage("Theme Deleted Successfully. You Must Restart Your Application To Apply These Changes.", MessageType.Success); + AddModuleMessage(Localizer["Theme Deleted Successfully. You Must Restart Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message); - AddModuleMessage("Error Deleting Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Deleting Theme"], MessageType.Error); } } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor index eb9871c9..2510759d 100644 --- a/Oqtane.Client/Modules/Admin/Themes/View.razor +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -96,7 +96,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message); - AddModuleMessage("Error Loading Theme", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Theme"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index 9642a090..c0475d59 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -78,7 +78,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message); - AddModuleMessage("Error Executing Upgrade", MessageType.Error); + AddModuleMessage(Localizer["Error Executing Upgrade"], MessageType.Error); } } @@ -95,7 +95,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message); - AddModuleMessage("Error Downloading Framework", MessageType.Error); + AddModuleMessage(Localizer["Error Downloading Framework"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index 7803a769..d3212726 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -74,13 +74,13 @@ } else { - AddModuleMessage("User Does Not Exist. Please Verify That The Username Provided Is Correct.", MessageType.Warning); + AddModuleMessage(Localizer["User Does Not Exist. Please Verify That The Username Provided Is Correct."], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message); - AddModuleMessage("Error Adding Notification", MessageType.Error); + AddModuleMessage(Localizer["Error Adding Notification"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index a5ca7327..4b2874b6 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -248,13 +248,13 @@ else } else { - AddModuleMessage("Current User Is Not Logged In", MessageType.Warning); + AddModuleMessage(Localizer["Current User Is Not Logged In"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message); - AddModuleMessage("Error Loading User Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Loading User Profile"], MessageType.Error); } } @@ -291,22 +291,22 @@ else await UserService.UpdateUserAsync(user); await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId); await logger.LogInformation("User Profile Saved"); - AddModuleMessage("User Profile Updated Successfully", MessageType.Success); + AddModuleMessage(Localizer["User Profile Updated Successfully"], MessageType.Success); } else { - AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); + AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Username and Email Address As Well As All Required Profile Information", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Username and Email Address As Well As All Required Profile Information"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving User Profile {Error}", ex.Message); - AddModuleMessage("Error Saving User Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Saving User Profile"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor index c9ec1c61..fcd7340c 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor @@ -158,7 +158,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading Users {Error}", ex.Message); - AddModuleMessage("Error Loading Users", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Users"], MessageType.Error); } } @@ -202,13 +202,13 @@ } else { - AddModuleMessage("User Does Not Exist. Please Verify That The Username Provided Is Correct.", MessageType.Warning); + AddModuleMessage(Localizer["User Does Not Exist. Please Verify That The Username Provided Is Correct."], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message); - AddModuleMessage("Error Adding Notification", MessageType.Error); + AddModuleMessage(Localizer["Error Adding Notification"], MessageType.Error); } } } diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 15c14bce..89b1e775 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -116,7 +116,7 @@ catch (Exception ex) { await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message); - AddModuleMessage("Error Loading User Profile", MessageType.Error); + AddModuleMessage(Localizer["Error Loading User Profile"], MessageType.Error); } } @@ -150,23 +150,23 @@ else { await logger.LogError("Error Adding User {Username} {Email}", username, email); - AddModuleMessage("Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.", MessageType.Error); + AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use."], MessageType.Error); } } else { - AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); + AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Username, Password, Email Address And All Required Profile Information", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Username, Password, Email Address And All Required Profile Information"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", username, email, ex.Message); - AddModuleMessage("Error Adding User", MessageType.Error); + AddModuleMessage(Localizer["Error Adding User"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index edabc73d..be68ff7d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -178,7 +178,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message); - AddModuleMessage("Error Loading User", MessageType.Error); + AddModuleMessage(Localizer["Error Loading User"], MessageType.Error); } } @@ -217,18 +217,18 @@ else } else { - AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); + AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning); } } else { - AddModuleMessage("You Must Provide A Username, Password, Email Address, And All Required Profile Information", MessageType.Warning); + AddModuleMessage(Localizer["You Must Provide A Username, Password, Email Address, And All Required Profile Information"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message); - AddModuleMessage("Error Saving User", MessageType.Error); + AddModuleMessage(Localizer["Error Saving User"], MessageType.Error); } } diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index b5988315..037daabb 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -98,7 +98,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading Roles {Error}", ex.Message); - AddModuleMessage("Error Loading Roles", MessageType.Error); + AddModuleMessage(Localizer["Error Loading Roles"], MessageType.Error); } } @@ -112,7 +112,7 @@ else catch (Exception ex) { await logger.LogError(ex, "Error Loading User Roles {UserId} {Error}", userid, ex.Message); - AddModuleMessage("Error Loading User Roles", MessageType.Error); + AddModuleMessage(Localizer["Error Loading User Roles"], MessageType.Error); } } @@ -173,17 +173,17 @@ else await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); - AddModuleMessage("User Assigned To Role", MessageType.Success); + AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); } else { - AddModuleMessage("You Must Select A Role", MessageType.Warning); + AddModuleMessage(Localizer["You Must Select A Role"], MessageType.Warning); } } catch (Exception ex) { await logger.LogError(ex, "Error Saving User Roles {UserId} {Error}", userid, ex.Message); - AddModuleMessage("Error Saving User Roles", MessageType.Error); + AddModuleMessage(Localizer["Error Saving User Roles"], MessageType.Error); } } @@ -194,12 +194,12 @@ else await UserRoleService.DeleteUserRoleAsync(UserRoleId); await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); - AddModuleMessage("User Removed From Role", MessageType.Success); + AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); } catch (Exception ex) { await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); - AddModuleMessage("Error Removing User From Role", MessageType.Error); + AddModuleMessage(Localizer["Error Removing User From Role"], MessageType.Error); } } }