kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Localize alert messages in admin pages

Browse Source
This commit is contained in:
hishamco 2020-12-09 21:12:00 +03:00
parent 3c71282379
commit a29d7b524c
46 changed files with 163 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Client/Modules/Admin/Error/Index.razor
View File

@ -1,6 +1,7 @@
@namespace Oqtane.Modules.Admin.Error @namespace Oqtane.Modules.Admin.Error
@inherits ModuleBase @inherits ModuleBase
@inject IModuleService ModuleService @inject IModuleService ModuleService
@inject IStringLocalizer<Index> Localizer
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
@ -10,7 +11,7 @@
Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId); Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) 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); AddModuleMessage(message, MessageType.Error);
} }

10
Oqtane.Client/Modules/Admin/Files/Add.razor
View File

@ -74,7 +74,7 @@
{ {
if (url == string.Empty || _folderId == -1) 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; return;
} }
@ -83,13 +83,13 @@
if (!Constants.UploadableFiles.Split(',') if (!Constants.UploadableFiles.Split(',')
.Contains(Path.GetExtension(filename).ToLower().Replace(".", ""))) .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; return;
} }
if (!filename.IsPathOrFileValid()) 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; return;
} }
@ -97,12 +97,12 @@
{ {
await FileService.UploadFileAsync(url, _folderId); await FileService.UploadFileAsync(url, _folderId);
await logger.LogInformation("File Downloaded Successfully From Url {Url}", url); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message); 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);
} }
} }
} }

6
Oqtane.Client/Modules/Admin/Files/Details.razor
View File

@ -81,7 +81,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading File {FileId} {Error}", _fileId, ex.Message); 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 else
{ {
AddModuleMessage("File Name Not Valid", MessageType.Warning); AddModuleMessage(Localizer["File Name Not Valid"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message); 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);
} }
} }
} }

16
Oqtane.Client/Modules/Admin/Files/Edit.razor
View File

@ -108,7 +108,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message); 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) 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; return;
} }
if (!_name.IsPathOrFileValid()) if (!_name.IsPathOrFileValid())
{ {
AddModuleMessage("Folder Name Not Valid.", MessageType.Warning); AddModuleMessage(Localizer["Folder Name Not Valid."], MessageType.Warning);
return; return;
} }
@ -170,13 +170,13 @@
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message); 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 else
{ {
AddModuleMessage("Folder Has Files And Cannot Be Deleted", MessageType.Warning); AddModuleMessage(Localizer["Folder Has Files And Cannot Be Deleted"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Files/Index.razor
View File

@ -73,7 +73,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Files {Error}", ex.Message); 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 FileService.DeleteFileAsync(file.FileId);
await logger.LogInformation("File Deleted {File}", file.Name); 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(); await GetFiles();
StateHasChanged(); StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting File {File} {Error}", file.Name, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Jobs/Add.razor
View File

@ -129,12 +129,12 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding Job {Job} {Error}", job, ex.Message); 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 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);
} }
} }

6
Oqtane.Client/Modules/Admin/Jobs/Edit.razor
View File

@ -118,7 +118,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message); 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 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);
} }
} }

2
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -119,7 +119,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message); 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);
} }
} }

8
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -76,11 +76,11 @@
if (user != null) 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 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; _type = MessageType.Warning;
} }
} }
@ -109,7 +109,7 @@
else else
{ {
await logger.LogInformation("Login Failed For Username {Username}", _username); 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 else
@ -130,7 +130,7 @@
else else
{ {
await logger.LogInformation("Login Failed For Username {Username}", _username); 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);
} }
} }
} }

2
Oqtane.Client/Modules/Admin/Logs/Detail.razor
View File

@ -207,7 +207,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -88,7 +88,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message); await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
AddModuleMessage("Error Loading Logs", MessageType.Error); AddModuleMessage(Localizer["Error Loading Logs"], MessageType.Error);
} }
} }

8
Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
View File

@ -105,7 +105,7 @@ else
} }
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); SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId); 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 <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> 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 <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
else 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) catch (Exception ex)
@ -187,7 +187,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Getting System Info {Error}", ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -70,7 +70,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message); 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 try
{ {
await ModuleDefinitionService.InstallModuleDefinitionsAsync(); await ModuleDefinitionService.InstallModuleDefinitionsAsync();
AddModuleMessage("Module Installed Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Module Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -93,13 +93,13 @@
{ {
await PackageService.DownloadPackageAsync(packageid, version, "Modules"); await PackageService.DownloadPackageAsync(packageid, version, "Modules");
await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version); 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(); StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version); await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version);
AddModuleMessage("Error Downloading Module", MessageType.Error); AddModuleMessage(Localizer["Error Downloading Module"], MessageType.Error);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -161,7 +161,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message); 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);
} }
} }
} }

10
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -59,7 +59,7 @@ else
if (_moduleDefinitions == null) if (_moduleDefinitions == null)
{ {
await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message); 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 PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules");
await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version); await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version);
await ModuleDefinitionService.InstallModuleDefinitionsAsync(); await ModuleDefinitionService.InstallModuleDefinitionsAsync();
AddModuleMessage("Module Installed Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Module Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", moduledefinitionname, version, ex.Message); 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 try
{ {
await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId); await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
AddModuleMessage("Module Deleted Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Module Deleted Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Modules/Import.razor
View File

@ -35,22 +35,22 @@
bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content); bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content);
if (success) if (success)
{ {
AddModuleMessage("Content Imported Successfully", MessageType.Success); AddModuleMessage(Localizer["Content Imported Successfully"], MessageType.Success);
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message); 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 else
{ {
AddModuleMessage("You Must Enter Some Content To Import", MessageType.Warning); AddModuleMessage(Localizer["You Must Enter Some Content To Import"], MessageType.Warning);
} }
} }
} }

12
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -230,7 +230,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); 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)) 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; return;
} }
@ -390,14 +390,14 @@
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message); 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);
} }
} }

12
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -309,7 +309,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); 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)) 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; return;
} }
@ -497,13 +497,13 @@
} }
else else
{ {
AddModuleMessage("You Must Provide Page Name", MessageType.Warning); AddModuleMessage(Localizer["You Must Provide Page Name"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message); 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);
} }
} }

2
Oqtane.Client/Modules/Admin/Pages/Index.razor
View File

@ -38,7 +38,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Page {Page} {Error}", page, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Profiles/Edit.razor
View File

@ -138,7 +138,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Profiles/Index.razor
View File

@ -41,12 +41,12 @@ else
{ {
await ProfileService.DeleteProfileAsync(profileId); await ProfileService.DeleteProfileAsync(profileId);
await logger.LogInformation("Profile Deleted {ProfileId}", profileId); await logger.LogInformation("Profile Deleted {ProfileId}", profileId);
AddModuleMessage("Profile Deleted", MessageType.Success); AddModuleMessage(Localizer["Profile Deleted"], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
View File

@ -78,7 +78,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message); 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);
} }
} }
} }

16
Oqtane.Client/Modules/Admin/Register/Index.razor
View File

@ -11,10 +11,10 @@
<text>...</text> <text>...</text>
</Authorizing> </Authorizing>
<Authorized> <Authorized>
<ModuleMessage Message="You Are Already Registered" Type="MessageType.Info" /> <ModuleMessage Message="@Localizer["You Are Already Registered"]" Type="MessageType.Info" />
</Authorized> </Authorized>
<NotAuthorized> <NotAuthorized>
<ModuleMessage Message="Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity" Type="MessageType.Info" /> <ModuleMessage Message="@Localizer["Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity"]" Type="MessageType.Info" />
<div class="container"> <div class="container">
<div class="form-group"> <div class="form-group">
@ -45,7 +45,7 @@
} }
else else
{ {
<ModuleMessage Message="Registration is Disabled For This Site" Type="MessageType.Info" /> <ModuleMessage Message="@Localizer["Registration is Disabled For This Site"]" Type="MessageType.Info" />
} }
@code { @code {
@ -80,28 +80,28 @@ else
if (user != null) if (user != null)
{ {
await logger.LogInformation("User Created {Username} {Email}", _username, _email); 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 else
{ {
await logger.LogError("Error Adding User {Username} {Email}", _username, _email); 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 else
{ {
AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message); 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);
} }
} }

8
Oqtane.Client/Modules/Admin/Reset/Index.razor
View File

@ -64,23 +64,23 @@
else else
{ {
await logger.LogError("Error Resetting User Password {Username}", _username); 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 else
{ {
AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message); 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);
} }
} }

2
Oqtane.Client/Modules/Admin/Roles/Add.razor
View File

@ -62,7 +62,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message); 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);
} }
} }

4
Oqtane.Client/Modules/Admin/Roles/Edit.razor
View File

@ -60,7 +60,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Role {RoleId} {Error}", _roleid, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message); 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);
} }
} }
} }

2
Oqtane.Client/Modules/Admin/Roles/Index.razor
View File

@ -48,7 +48,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message); 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);
} }
} }
} }

14
Oqtane.Client/Modules/Admin/Roles/Users.razor
View File

@ -95,7 +95,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Users {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message); 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 GetUserRoles();
await logger.LogInformation("User Assigned To Role {UserRole}", userrole); 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 else
{ {
AddModuleMessage("You Must Select A User", MessageType.Warning); AddModuleMessage(Localizer["You Must Select A User"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message); 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 UserRoleService.DeleteUserRoleAsync(UserRoleId);
await GetUserRoles(); await GetUserRoles();
await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Site/Index.razor
View File

@ -353,7 +353,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); 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 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 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message); 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);
} }
} }
} }

12
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -283,7 +283,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); 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 else
{ {
AddModuleMessage("You Must Specify A Server And Database", MessageType.Error); AddModuleMessage(Localizer["You Must Specify A Server And Database"], MessageType.Error);
} }
} }
else else
{ {
AddModuleMessage("Invalid Host Password", MessageType.Error); AddModuleMessage(Localizer["Invalid Host Password"], MessageType.Error);
} }
} }
else else
{ {
AddModuleMessage("Tenant Name Is Missing Or Already Exists", MessageType.Error); AddModuleMessage(Localizer["Tenant Name Is Missing Or Already Exists"], MessageType.Error);
} }
} }
else else
@ -398,12 +398,12 @@ else
} }
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 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Sites/Edit.razor
View File

@ -198,7 +198,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message); 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 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 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) catch (Exception ex)
{ {
await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -69,13 +69,13 @@ else
} }
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) catch (Exception ex)
{ {
await Log(alias, LogLevel.Error, "", ex, "Error Deleting Site {SiteId} {Error}", alias.SiteId, ex.Message); 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);
} }
} }
} }

2
Oqtane.Client/Modules/Admin/Sql/Index.razor
View File

@ -67,7 +67,7 @@ else
} }
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);
} }
} }

2
Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
View File

@ -55,7 +55,7 @@
</tr> </tr>
</table> </table>
<a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access Framework API"]</a>&nbsp; <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access Framework API"]</a>&nbsp;
<ActionDialog Header="Restart Application" Message="@("Are You Sure You Wish To Restart The Application?")" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;

4
Oqtane.Client/Modules/Admin/Tenants/Edit.razor
View File

@ -56,7 +56,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", tenantid, ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving Tenant {TenantId} {Error}", tenantid, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Tenants/Index.razor
View File

@ -56,13 +56,13 @@ else
} }
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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Tenant {Tenant} {Error}", Tenant, ex.Message); 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);
} }
} }
} }

8
Oqtane.Client/Modules/Admin/Themes/Add.razor
View File

@ -70,7 +70,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message); 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 try
{ {
await ThemeService.InstallThemesAsync(); await ThemeService.InstallThemesAsync();
AddModuleMessage("Theme Installed Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Theme Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -93,13 +93,13 @@
{ {
await PackageService.DownloadPackageAsync(packageid, version, "Themes"); await PackageService.DownloadPackageAsync(packageid, version, "Themes");
await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version); 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(); StateHasChanged();
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version); await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version);
AddModuleMessage("Error Downloading Theme", MessageType.Error); AddModuleMessage(Localizer["Error Downloading Theme"], MessageType.Error);
} }
} }
} }

10
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -61,7 +61,7 @@ else
if (_themes == null) if (_themes == null)
{ {
await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message); 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 PackageService.DownloadPackageAsync(themename, version, "Themes");
await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version); await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
await ThemeService.InstallThemesAsync(); await ThemeService.InstallThemesAsync();
AddModuleMessage("Theme Installed Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Theme Installed Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", themename, version, ex.Message); 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 try
{ {
await ThemeService.DeleteThemeAsync(Theme.ThemeName); await ThemeService.DeleteThemeAsync(Theme.ThemeName);
AddModuleMessage("Theme Deleted Successfully. You Must <a href=\"" + NavigateUrl("admin/system") + "\">Restart</a> Your Application To Apply These Changes.", MessageType.Success); AddModuleMessage(Localizer["Theme Deleted Successfully. You Must <a href=\"{0}\">Restart</a> Your Application To Apply These Changes.", NavigateUrl("admin/system")], MessageType.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message); 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);
} }
} }
} }

2
Oqtane.Client/Modules/Admin/Themes/View.razor
View File

@ -96,7 +96,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message); 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);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/Upgrade/Index.razor
View File

@ -78,7 +78,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message); await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message);
AddModuleMessage("Error Downloading Framework", MessageType.Error); AddModuleMessage(Localizer["Error Downloading Framework"], MessageType.Error);
} }
} }
} }

4
Oqtane.Client/Modules/Admin/UserProfile/Add.razor
View File

@ -74,13 +74,13 @@
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message); 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);
} }
} }

12
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -248,13 +248,13 @@ else
} }
else else
{ {
AddModuleMessage("Current User Is Not Logged In", MessageType.Warning); AddModuleMessage(Localizer["Current User Is Not Logged In"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message); 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 UserService.UpdateUserAsync(user);
await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId); await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
await logger.LogInformation("User Profile Saved"); await logger.LogInformation("User Profile Saved");
AddModuleMessage("User Profile Updated Successfully", MessageType.Success); AddModuleMessage(Localizer["User Profile Updated Successfully"], MessageType.Success);
} }
else else
{ {
AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving User Profile {Error}", ex.Message); 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);
} }
} }

6
Oqtane.Client/Modules/Admin/UserProfile/View.razor
View File

@ -158,7 +158,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Users {Error}", ex.Message); 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 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message); 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);
} }
} }
} }

10
Oqtane.Client/Modules/Admin/Users/Add.razor
View File

@ -116,7 +116,7 @@
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message); 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 else
{ {
await logger.LogError("Error Adding User {Username} {Email}", username, email); 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 else
{ {
AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", username, email, ex.Message); 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);
} }
} }

8
Oqtane.Client/Modules/Admin/Users/Edit.razor
View File

@ -178,7 +178,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading User {UserId} {Error}", userid, ex.Message); 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 else
{ {
AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning); AddModuleMessage(Localizer["Passwords Entered Do Not Match"], MessageType.Warning);
} }
} }
else 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving User {Username} {Email} {Error}", username, email, ex.Message); 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);
} }
} }

14
Oqtane.Client/Modules/Admin/Users/Roles.razor
View File

@ -98,7 +98,7 @@ else
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading Roles {Error}", ex.Message); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Loading User Roles {UserId} {Error}", userid, ex.Message); 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 GetUserRoles();
await logger.LogInformation("User Assigned To Role {UserRole}", userrole); 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 else
{ {
AddModuleMessage("You Must Select A Role", MessageType.Warning); AddModuleMessage(Localizer["You Must Select A Role"], MessageType.Warning);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Saving User Roles {UserId} {Error}", userid, ex.Message); 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 UserRoleService.DeleteUserRoleAsync(UserRoleId);
await GetUserRoles(); await GetUserRoles();
await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); 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) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); 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);
} }
} }
} }