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

Merge pull request #74 from oqtane/dev

Browse Source 
sync
This commit is contained in:
Shaun Walker 2020-12-09 14:02:46 -05:00 committed by GitHub
commit 6c34c62e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
80 changed files with 493 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ Oqtane.Server/Data/*.mdf
Oqtane.Server/Data/*.ldf
/Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
Oqtane.Server/Content

7
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
@inject IModuleService ModuleService
@inject IStringLocalizer<Index> 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);
}
}

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

@ -7,7 +7,7 @@
@inject IStringLocalizer<Add> Localizer
<TabStrip>
<TabPanel Name="Upload" Heading="Upload Files" ResourceKey="Upload Files">
<TabPanel Name="Upload" Heading="Upload Files" ResourceKey="UploadFiles">
<table class="table table-borderless">
<tr>
<td>
@ -38,7 +38,7 @@
</td>
<td>
<select id="folder" class="form-control" @bind="@_folderId">
<option value="-1">&lt;Select Folder&gt;</option>
<option value="-1">&lt;@Localizer["Select Folder"]&gt;</option>
@foreach (Folder folder in _folders)
{
<option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -16,7 +16,7 @@
<select id="parent" class="form-control" @bind="@_parentId">
@if (PageState.QueryString.ContainsKey("id"))
{
<option value="-1">&lt;No Parent&gt;</option>
<option value="-1">&lt;@Localizer["No Parent"]&gt;</option>
}
@foreach (Folder folder in _folders)
{
@ -44,10 +44,10 @@
{
<button type="button" class="btn btn-success" @onclick="SaveFolder">@Localizer["Save"]</button>
}
<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
@if (!_isSystem && PageState.QueryString.ContainsKey("id"))
{
<ActionDialog Header="Delete Folder" Message="@("Are You Sure You Wish To Delete This Folder?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
<ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
}
<br />
<br />
@ -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);
}
}
}

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

@ -38,7 +38,7 @@
</Header>
<Row>
<td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
<td><ActionDialog Header="Delete File" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
<td><ActionDialog Header="Delete File" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
<td><a href="@(ContentUrl(context.FileId))" target="_new">@context.Name</a></td>
<td>@context.ModifiedOn</td>
<td>@context.Extension.ToUpper() @Localizer["File"]</td>
@ -47,7 +47,7 @@
</Pager>
@if (_files.Count == 0)
{
<div class="text-center">@Localizer["No Files Exist In Selected Folder"]</div>
<div class="text-center">@Localizer["No Files Exist In Selected Folder"]</div>
}
}
@ -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);
}
}
}

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

@ -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);
}
}

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

@ -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);
}
}

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

@ -28,7 +28,7 @@ else
</Header>
<Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
<td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
<td><ActionDialog Header="Delete Job" Message="Are You Sure You Wish To Delete This Job?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
<td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
<td>@context.Name</td>
<td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
@ -63,17 +63,17 @@ else
var status = string.Empty;
if (!isEnabled)
{
status = "Disabled";
status = Localizer["Disabled"];
}
else
{
if (isExecuting)
{
status = "Executing";
status = Localizer["Executing"];
}
else
{
status = "Idle";
status = Localizer["Idle"];
}
}
@ -83,26 +83,26 @@ else
private string DisplayFrequency(int interval, string frequency)
{
var result = "Every " + interval.ToString() + " ";
var result = $"{Localizer["Every"]} {interval.ToString()} ";
switch (frequency)
{
case "m":
result += "Minute";
result += Localizer["Minute"];
break;
case "H":
result += "Hour";
result += Localizer["Hour"];
break;
case "d":
result += "Day";
result += Localizer["Day"];
break;
case "M":
result += "Month";
result += Localizer["Month"];
break;
}
if (interval > 1)
{
result += "s";
result += Localizer["s"];
}
return result;
@ -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);
}
}

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

@ -50,17 +50,17 @@ else
var status = string.Empty;
if (isExecuting)
{
status = "Executing";
status = Localizer["Executing"];
}
else
{
if (succeeded != null && succeeded.Value)
{
status = "Succeeded";
status = Localizer["Succeeded"];
}
else
{
status = "Failed";
status = Localizer["Failed"];
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -14,13 +14,13 @@ else
<td>
<label>@Localizer["Level:"] </label>
<select class="form-control" @onchange="(e => LevelChanged(e))">
<option value="-">&lt;All Levels&gt;</option>
<option value="Trace">Trace</option>
<option value="Debug">Debug</option>
<option value="Information">Information</option>
<option value="Warning">Warning</option>
<option value="Error">Error</option>
<option value="Critical">Critical</option>
<option value="-">&lt;@Localizer["All Levels"]&gt;</option>
<option value="Trace">@Localizer["Trace"]</option>
<option value="Debug">@Localizer["Debug"]</option>
<option value="Information">@Localizer["Information"]</option>
<option value="Warning">@Localizer["Warning"]</option>
<option value="Error">@Localizer["Error"]</option>
<option value="Critical">@Localizer["Critical"]</option>
</select>
</td>
<td>
@ -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);
}
}

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

@ -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 <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
{
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);
}
}
}

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

@ -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 <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)
{
@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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 <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)
{
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 <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)
{
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);
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);
}
}
}

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

@ -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);
}
}

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

@ -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);
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -19,13 +19,13 @@
<Header>
<th style="width: 1px;">&nbsp;</th>
<th style="width: 1px;">&nbsp;</th>
<th>Name</th>
<th>@Localizer["Name"]</th>
<th>@Localizer["Deleted By"]</th>
<th>@Localizer["Deleted On"]</th>
</Header>
<Row>
<td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
<td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
<td><ActionDialog Header="Delete Page" Message="@Localizer["Are You Sure You Wish To Permanently Delete The {0} Page?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
<td>@context.Name</td>
<td>@context.DeletedBy</td>
<td>@context.DeletedOn</td>
@ -52,7 +52,7 @@
</Header>
<Row>
<td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
<td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
<td><ActionDialog Header="Delete Module" Message="@Localizer["Are You Sure You Wish To Permanently Delete The {0} Module?", context.Title]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
<td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
<td>@context.Title</td>
<td>@context.DeletedBy</td>
@ -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);
}
}
}

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

@ -11,10 +11,10 @@
<text>...</text>
</Authorizing>
<Authorized>
<ModuleMessage Message="You Are Already Registered" Type="MessageType.Info" />
<ModuleMessage Message="@Localizer["You Are Already Registered"]" Type="MessageType.Info" />
</Authorized>
<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="form-group">
@ -45,7 +45,7 @@
}
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 {
@ -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);
}
}

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

@ -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);
}
}

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

@ -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);
}
}

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

@ -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);
}
}
}

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

@ -20,7 +20,7 @@ else
</Header>
<Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
<td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
<td><ActionDialog Header="Delete Role" Message="@Localizer["Are You Sure You Wish To Delete The {0} Role?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
<td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></td>
<td>@context.Name</td>
</Row>
@ -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);
}
}
}

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

@ -25,7 +25,7 @@ else
</td>
<td>
<select id="user" class="form-control" @bind="@userid">
<option value="-1">&lt;Select User&gt;</option>
<option value="-1">&lt;@Localizer["Select User"]&gt;</option>
@foreach (UserRole userrole in users)
{
<option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -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);
}
}
}

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

@ -21,7 +21,7 @@ else
</Header>
<Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.AliasId.ToString())" ResourceKey="EditSite" /></td>
<td><ActionDialog Header="Delete Site" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Site?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteSite(context))" ResourceKey="DeleteSite" /></td>
<td><ActionDialog Header="Delete Site" Message="@Localizer["Are You Sure You Wish To Delete The {0} Site?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteSite(context))" ResourceKey="DeleteSite" /></td>
<td><a href="@(_scheme + context.Name)">@context.Name</a></td>
</Row>
</Pager>
@ -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);
}
}
}

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

@ -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);
}
}
@ -105,7 +105,7 @@ else
}
else
{
table = "No Results Returned";
table = Localizer["No Results Returned"];
}
return table;

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

@ -55,7 +55,7 @@
</tr>
</table>
<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 {
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;

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

@ -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);
}
}
}

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

@ -18,7 +18,7 @@ else
</Header>
<Row>
<td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" ResourceKey="EditTenant" /></td>
<td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == TenantNames.Master)" ResourceKey="DeleteTenant" /></td>
<td><ActionDialog Header="Delete Tenant" Message="@Localizer["Are You Sure You Wish To Delete The {0} Tenant?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == TenantNames.Master)" ResourceKey="DeleteTenant" /></td>
<td>@context.Name</td>
</Row>
</Pager>
@ -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);
}
}
}

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

@ -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 <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)
{
@ -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);
}
}
}

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

@ -26,17 +26,17 @@ else
<td><ActionLink Action="View" Parameters="@($"name=" + WebUtility.UrlEncode(context.ThemeName))" ResourceKey="ViewTheme" /></td>
<td>
@if (context.AssemblyName != "Oqtane.Client")
{
<ActionDialog Header="Delete Theme" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Theme?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
}
{
<ActionDialog Header="Delete Theme" Message="@Localizer["Are You Sure You Wish To Delete The {0} Theme?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
}
</td>
<td>@context.Name</td>
<td>@context.Version</td>
<td>
@if (UpgradeAvailable(context.ThemeName, context.Version))
{
<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>@Localizer["Upgrade"]</button>
}
{
<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>@Localizer["Upgrade"]</button>
}
</td>
<td></td>
</Row>
@ -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 <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)
{
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 <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)
{
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)
{
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)
{
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);
}
}
}

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

@ -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);
}
}

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

@ -149,7 +149,7 @@ else
</Header>
<Row>
<td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
<td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
<td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
<td>@context.FromDisplayName</td>
<td>@context.Subject</td>
<td>@context.CreatedOn</td>
@ -181,7 +181,7 @@ else
</Header>
<Row>
<td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
<td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
<td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
<td>@context.ToDisplayName</td>
<td>@context.Subject</td>
<td>@context.CreatedOn</td>
@ -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);
}
}

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

@ -10,7 +10,7 @@
<table class="table table-borderless">
<tr>
<td>
<label class="control-label">@title: </label>
<label class="control-label">@Localizer["Title:"] </label>
</td>
@if (title == "From")
{
@ -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);
}
}
}

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

@ -14,7 +14,7 @@
<tr>
<td>
<label class="control-label">@Localizer["Username:"] </label>
</td>
</td>
<td>
<input class="form-control" @bind="@username" />
</td>
@ -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);
}
}

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

@ -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);
}
}

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

@ -31,7 +31,7 @@ else
<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
</td>
<td>
<ActionDialog Header="Delete User" Message="@("Are You Sure You Wish To Delete " + context.User.DisplayName + "?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" ResourceKey="DeleteUser" />
<ActionDialog Header="Delete User" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.User.DisplayName]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" ResourceKey="DeleteUser" />
</td>
<td>
<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />

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

@ -14,7 +14,7 @@ else
<table class="table table-borderless">
<tr>
<td>
<Label For="user" HelpText="The user you are assigning roles to" resource="User">User: </Label>
<Label For="user" HelpText="The user you are assigning roles to" ResourceKey="User">User: </Label>
</td>
<td>
<input id="user" class="form-control" @bind="@name" disabled />
@ -26,7 +26,7 @@ else
</td>
<td>
<select id="role" class="form-control" @bind="@roleid">
<option value="-1">&lt;Select Role&gt;</option>
<option value="-1">&lt;@Localizer["Select Role"]&gt;</option>
@foreach (Role role in roles)
{
<option value="@(role.RoleId)">@role.Name</option>
@ -36,7 +36,7 @@ else
</tr>
<tr>
<td>
<Label For="effectiveDate" HelpText="The date that this role assignment is active" resource="EffectiveDate">Effective Date: </Label>
<Label For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label>
</td>
<td>
<input id="effectiveDate" class="form-control" @bind="@effectivedate" />
@ -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);
}
}
}

8
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -97,11 +97,9 @@
_iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
}
if (IsLocalizable)
{
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
}
Text = Localize(nameof(Text), Text);
Header = Localize(nameof(Header), Header);
Message = Localize(nameof(Message), Message);
_authorized = IsAuthorized();
}

6
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -95,11 +95,7 @@
}
if (IsLocalizable)
{
_text = Localize(nameof(Text), _text);
}
_text = Localize(nameof(Text), _text);
_url = EditUrl(Action, _parameters);
_authorized = IsAuthorized();
}

19
Oqtane.Client/Modules/Controls/AuditInfo.razor
View File

@ -1,5 +1,6 @@
@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@inject IStringLocalizer<AuditInfo> Localizer
@if (_text != string.Empty)
{
@ -39,16 +40,16 @@
_text = string.Empty;
if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn.HasValue)
{
_text += "<p style=\"" + Style + "\">Created ";
_text += $"<p style=\"{Style}\">{Localizer["Created"]} ";
if (!String.IsNullOrEmpty(CreatedBy))
{
_text += " by <b>" + CreatedBy + "</b>";
_text += $" {Localizer["by"]} <b>{CreatedBy}</b>";
}
if (CreatedOn != null)
{
_text += " on <b>" + CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
_text += $" {Localizer["on"]} <b>{CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
}
_text += "</p>";
@ -56,16 +57,16 @@
if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn.HasValue)
{
_text += "<p style=\"" + Style + "\">Last modified ";
_text += $"<p style=\"{Style}\">{Localizer["Last modified"]} ";
if (!String.IsNullOrEmpty(ModifiedBy))
{
_text += " by <b>" + ModifiedBy + "</b>";
_text += $" {Localizer["by"]} <b>{ModifiedBy}</b>";
}
if (ModifiedOn != null)
{
_text += " on <b>" + ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
_text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
}
_text += "</p>";
@ -73,16 +74,16 @@
if (!String.IsNullOrEmpty(DeletedBy) || DeletedOn.HasValue)
{
_text += "<p style=\"" + Style + "\">Deleted ";
_text += $"<p style=\"{Style}\">{Localizer["Deleted"]} ";
if (!String.IsNullOrEmpty(DeletedBy))
{
_text += " by <b>" + DeletedBy + "</b>";
_text += $" {Localizer["by"]} <b>{DeletedBy}</b>";
}
if (DeletedOn != null)
{
_text += " on <b>" + DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + "</b>";
_text += $" {Localizer["on"]} <b>{DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}</b>";
}
_text += "</p>";

25
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -1,7 +1,8 @@
@namespace Oqtane.Modules.Controls
@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@inject IFolderService FolderService
@inject IFileService FileService
@inject IStringLocalizer<FileManager> Localizer
@if (_folders != null)
{
@ -14,7 +15,7 @@
<select class="form-control" @onchange="(e => FolderChanged(e))">
@if (string.IsNullOrEmpty(Folder))
{
<option value="-1">&lt;Select Folder&gt;</option>
<option value="-1">&lt;@Localizer["Select Folder"]&gt;</option>
}
@foreach (Folder folder in _folders)
{
@ -34,7 +35,7 @@
{
<div>
<select class="form-control" @onchange="(e => FileChanged(e))">
<option value="-1">&lt;Select File&gt;</option>
<option value="-1">&lt;@Localizer["Select File"]&gt;</option>
@foreach (File file in _files)
{
if (file.FileId == FileId)
@ -62,10 +63,10 @@
}
<span id="@_progressinfoid"></span><progress id="@_progressbarid" style="width: 150px; visibility: hidden;"></progress>
<span class="float-right">
<button type="button" class="btn btn-success" @onclick="UploadFile">Upload</button>
<button type="button" class="btn btn-success" @onclick="UploadFile">@Localizer["Upload"]</button>
@if (ShowFiles && GetFileId() != -1)
{
<button type="button" class="btn btn-danger" @onclick="DeleteFile">Delete</button>
<button type="button" class="btn btn-danger" @onclick="DeleteFile">@Localizer["Delete"]</button>
}
</span>
</div>
@ -219,7 +220,7 @@
{
await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
_message = "Error Loading Files";
_message = Localizer["Error Loading Files"];
_messagetype = MessageType.Error;
}
}
@ -278,7 +279,7 @@
{
await logger.LogInformation("File Upload Succeeded {Files}", upload);
_message = "File Upload Succeeded";
_message = Localizer["File Upload Succeeded"];
_messagetype = MessageType.Success;
await GetFiles();
@ -298,7 +299,7 @@
{
await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
_message = "File Upload Failed";
_message = Localizer["File Upload Failed"];
_messagetype = MessageType.Error;
}
}
@ -306,13 +307,13 @@
{
await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
_message = "File Upload Failed";
_message = Localizer["File Upload Failed"];
_messagetype = MessageType.Error;
}
}
else
{
_message = "You Have Not Selected A File To Upload";
_message = Localizer["You Have Not Selected A File To Upload"];
_messagetype = MessageType.Warning;
}
}
@ -325,7 +326,7 @@
await FileService.DeleteFileAsync(FileId);
await logger.LogInformation("File Deleted {File}", FileId);
_message = "File Deleted";
_message = Localizer["File Deleted"];
_messagetype = MessageType.Success;
await GetFiles();
@ -337,7 +338,7 @@
{
await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
_message = "Error Deleting File";
_message = Localizer["Error Deleting File"];
_messagetype = MessageType.Error;
}
}

14
Oqtane.Client/Modules/Controls/Label.razor
View File

@ -43,16 +43,12 @@ else
_openLabel += ">";
if (IsLocalizable)
var text = Localize("Text", String.Empty);
if (text != String.Empty)
{
var value = Localize("Text");
var key = $"{ResourceKey}.Text";
if (!value.Equals(key))
{
ChildContent =@<text>@Localize("Text")</text>;
}
HelpText = Localize(nameof(HelpText), HelpText);
ChildContent =@<text>@text</text>;
}
HelpText = Localize(nameof(HelpText), HelpText);
}
}

56
Oqtane.Client/Modules/Controls/LocalizableComponent.cs
View File

@ -15,56 +15,54 @@ namespace Oqtane.Modules.Controls
protected bool IsLocalizable { get; private set; }
protected string Localize(string name)
{
var key = $"{ResourceKey}.{name}";
protected string Localize(string name) => _localizer?[name] ?? name;
// TODO: we should have a ShowMissingResourceKeys option which developers/translators can enable to find missing translations which would display the key rather than the name
protected string Localize(string propertyName, string propertyValue)
{
if (!IsLocalizable)
{
return name;
return propertyValue;
}
return _localizer?[key] ?? name;
}
protected string Localize(string name, string defaultValue)
{
var key = $"{ResourceKey}.{name}";
var value = Localize(name);
var key = $"{ResourceKey}.{propertyName}";
var value = Localize(key);
if (value == key)
{
return defaultValue;
// Returns default property value (English version) instead of ResourceKey.PropertyName
return propertyValue;
}
else
{
return value;
if (value == String.Empty)
{
// Returns default property value (English version)
return propertyValue;
}
else
{
return value;
}
}
}
protected override void OnParametersSet()
{
if (!String.IsNullOrEmpty(ResourceKey))
IsLocalizable = false;
if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
{
if (ModuleState?.ModuleType != null)
var moduleType = Type.GetType(ModuleState.ModuleType);
if (moduleType != null)
{
var moduleType = Type.GetType(ModuleState.ModuleType);
if (moduleType != null)
using (var scope = ServiceActivator.GetScope())
{
using (var scope = ServiceActivator.GetScope())
{
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(moduleType);
}
var localizerFactory = scope.ServiceProvider.GetService<IStringLocalizerFactory>();
_localizer = localizerFactory.Create(moduleType);
IsLocalizable = true;
}
}
IsLocalizable = true;
}
else
{
IsLocalizable = false;
}
}
}

8
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -13,7 +13,7 @@
<th scope="col">@Localizer["Role"]</th>
@foreach (PermissionString permission in _permissions)
{
<th style="text-align: center; width: 1px;">@permission.PermissionName</th>
<th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
}
</tr>
@foreach (Role role in _roles)
@ -39,7 +39,7 @@
<th scope="col">@Localizer["User"]</th>
@foreach (PermissionString permission in _permissions)
{
<th style="text-align: center; width: 1px;">@permission.PermissionName</th>
<th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
}
</tr>
</thead>
@ -65,7 +65,7 @@
<tbody>
<tr>
<td class="input-group">
<input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" />
<input type="text" name="Username" class="form-control" placeholder="@Localizer["Enter Username"]" @bind="@_username" />
<button type="button" class="btn btn-primary" @onclick="AddUser">@Localizer["Add"]</button>
</td>
</tr>
@ -180,7 +180,7 @@
}
catch
{
_message = "Username Does Not Exist";
_message = Localizer["Username Does Not Exist"];
}
}

2
Oqtane.Client/Modules/Controls/RichTextEditor.razor
View File

@ -194,7 +194,7 @@
}
else
{
_message = "You Must Select An Image To Insert";
_message = Localizer["You Must Select An Image To Insert"];
}
}
else

9
Oqtane.Client/Modules/Controls/Section.razor
View File

@ -46,11 +46,8 @@
{
base.OnParametersSet();
if (IsLocalizable)
{
_heading = !string.IsNullOrEmpty(Heading)
? Localize(nameof(Heading), Heading)
: Localize(nameof(Name), Name);
}
_heading = !string.IsNullOrEmpty(Heading)
? Localize(nameof(Heading), Heading)
: Localize(nameof(Name), Name);
}
}

15
Oqtane.Client/Modules/Controls/TabPanel.razor
View File

@ -40,16 +40,13 @@ else
{
base.OnParametersSet();
if (IsLocalizable)
if (string.IsNullOrEmpty(Heading))
{
if (string.IsNullOrEmpty(Heading))
{
Name = Localize(nameof(Name), Name);
}
else
{
Heading = Localize(nameof(Heading), Heading);
}
Name = Localize(nameof(Name), Name);
}
else
{
Heading = Localize(nameof(Heading), Heading);
}
}

7
Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
View File

@ -1,5 +1,6 @@
@namespace Oqtane.Modules.Controls
@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@inject IStringLocalizer<TriStateCheckBox> Localizer
<img src="@_src" title="@_title" @onclick="SetValue" />
@ -51,11 +52,11 @@
{
case true:
_src = "images/checked.png";
_title = "Permission Granted";
_title = Localizer["Permission Granted"];
break;
case false:
_src = "images/unchecked.png";
_title = "Permission Denied";
_title = Localizer["Permission Denied"];
break;
case null:
_src = "images/null.png";

2
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -92,7 +92,7 @@
catch (Exception ex)
{
await logger.LogError(ex, "Error Saving Content {Error}", ex.Message);
AddModuleMessage("Error Saving Content", MessageType.Error);
AddModuleMessage(Localizer["Error Saving Content"], MessageType.Error);
}
}
}

2
Oqtane.Client/Oqtane.Client.csproj
View File

@ -17,6 +17,7 @@
<PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0</PackageReleaseNotes>
<RootNamespace>Oqtane</RootNamespace>
<IsPackable>true</IsPackable>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
</PropertyGroup>
<ItemGroup>
@ -30,6 +31,7 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
</ItemGroup>

29
Oqtane.Client/Program.cs
View File

@ -1,19 +1,23 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using System.Threading.Tasks;
using System.Runtime.Loader;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.JSInterop;
using Oqtane.Modules;
using Oqtane.Providers;
using Oqtane.Shared;
using Oqtane.Services;
using Oqtane.Shared;
using Oqtane.UI;
namespace Oqtane.Client
{
@ -62,6 +66,7 @@ namespace Oqtane.Client
builder.Services.AddScoped<ISiteTemplateService, SiteTemplateService>();
builder.Services.AddScoped<ISqlService, SqlService>();
builder.Services.AddScoped<ISystemService, SystemService>();
builder.Services.AddScoped<ILocalizationService, LocalizationService>();
await LoadClientAssemblies(httpClient);
@ -88,6 +93,19 @@ namespace Oqtane.Client
}
var host = builder.Build();
var jsRuntime = host.Services.GetRequiredService<IJSRuntime>();
var interop = new Interop(jsRuntime);
var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie).UICultures[0].Value;
var localizationService = host.Services.GetRequiredService<ILocalizationService>();
var cultures = await localizationService.GetCulturesAsync();
if (culture == null || !cultures.Any(c => c.Name.Equals(culture, StringComparison.OrdinalIgnoreCase)))
{
culture = cultures.Single(c => c.IsDefault).Name;
}
SetCulture(culture);
ServiceActivator.Configure(host.Services);
@ -142,5 +160,12 @@ namespace Oqtane.Client
}
}
}
private static void SetCulture(string culture)
{
var cultureInfo = CultureInfo.GetCultureInfo(culture);
CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
}
}
}

11
Oqtane.Client/Services/Interfaces/ILocalizationService.cs Normal file
View File

@ -0,0 +1,11 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Oqtane.Models;
namespace Oqtane.Services
{
public interface ILocalizationService
{
Task<IEnumerable<Culture>> GetCulturesAsync();
}
}

22
Oqtane.Client/Services/LocalizationService.cs Normal file
View File

@ -0,0 +1,22 @@
using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Services
{
public class LocalizationService : ServiceBase, ILocalizationService
{
private readonly SiteState _siteState;
public LocalizationService(HttpClient http, SiteState siteState) : base(http)
{
_siteState = siteState;
}
private string Apiurl => CreateApiUrl(_siteState.Alias, "Localization");
public async Task<IEnumerable<Culture>> GetCulturesAsync() => await GetJsonAsync<IEnumerable<Culture>>(Apiurl);
}
}

22
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -9,7 +9,7 @@
@inject IPageModuleService PageModuleService
@inject ILogService logger
@inject ISettingService SettingService
@inject IStringLocalizer<ControlPanel> Localizer
@inject IStringLocalizer<ControlPanel> Localizer
@if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
{
@ -198,6 +198,11 @@
</div>
}
@if (ShowLanguageSwitcher)
{
<LanguageSwitcher />
}
@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) || (PageState.Page.IsPersonalizable && PageState.User != null))
{
if (PageState.EditMode)
@ -287,6 +292,9 @@
[Parameter]
public string BodyClass { get; set; } = "card-body";
[Parameter]
public bool ShowLanguageSwitcher { get; set; } = true;
protected override async Task OnInitializedAsync()
{
@ -314,12 +322,12 @@
private void CategoryChanged(ChangeEventArgs e)
{
Category = (string) e.Value;
Category = (string)e.Value;
}
private void ModuleChanged(ChangeEventArgs e)
{
ModuleDefinitionName = (string) e.Value;
ModuleDefinitionName = (string)e.Value;
if (ModuleDefinitionName != "-")
{
var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
@ -335,7 +343,7 @@
private void PageChanged(ChangeEventArgs e)
{
PageId = (string) e.Value;
PageId = (string)e.Value;
if (PageId != "-")
{
_modules = PageState.Modules
@ -396,17 +404,17 @@
await PageModuleService.AddPageModuleAsync(pageModule);
await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
Message = "<br /><div class=\"alert alert-success\" role=\"alert\">Module Added To Page</div>";
Message = $"<br /><div class=\"alert alert-success\" role=\"alert\">{Localizer["Module Added To Page"]}</div>";
NavigationManager.NavigateTo(NavigateUrl());
}
else
{
Message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Must Select A Module</div>";
Message = $"<br /><div class=\"alert alert-warning\" role=\"alert\">{Localizer["You Must Select A Module"]}</div>";
}
}
else
{
Message = "<br /><div class=\"alert alert-error\" role=\"alert\">Not Authorized</div>";
Message = $"<br /><div class=\"alert alert-error\" role=\"alert\">{Localizer["Not Authorized"]}</div>";
}
}

43
Oqtane.Client/Themes/Controls/LanguageSwitcher.razor Normal file
View File

@ -0,0 +1,43 @@
@namespace Oqtane.Themes.Controls
@inherits ThemeControlBase
@using System.Globalization
@using Microsoft.AspNetCore.Localization;
@using Oqtane.Models
@inject ILocalizationService LocalizationService
@inject NavigationManager NavigationManager
@if (_supportedCultures != null)
{
<div class="btn-group" role="group">
<button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="oi oi-globe"></span>
</button>
<div class="dropdown-menu" aria-labelledby="btnCultures">
@foreach (var culture in _supportedCultures)
{
<a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == culture.Name ? "active" : String.Empty)" href="#" @onclick="@(async e => await SetCultureAsync(culture.Name))">@culture.DisplayName</a>
}
</div>
</div>
}
@code{
private IEnumerable<Culture> _supportedCultures;
protected override async Task OnParametersSetAsync()
{
_supportedCultures = await LocalizationService.GetCulturesAsync();
}
private async Task SetCultureAsync(string culture)
{
if (culture != CultureInfo.CurrentUICulture.Name)
{
var interop = new Interop(JSRuntime);
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true);
}
}
}

2
Oqtane.Client/Themes/Controls/LoginBase.cs
View File

@ -22,7 +22,7 @@ namespace Oqtane.Themes.Controls
{
returnurl += "/" + PageState.Page.Path;
}
NavigationManager.NavigateTo(NavigateUrl("login", "returnurl=" + returnurl));
NavigationManager.NavigateTo(NavigateUrl("login", "?returnurl=" + returnurl));
}
protected async Task LogoutUser()

2
Oqtane.Client/UI/Installer.razor
View File

@ -208,7 +208,7 @@
}
else
{
_message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length";
_message = Localizer["Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length"];
}
}

4
Oqtane.Client/UI/Interop.cs
View File

@ -1,5 +1,4 @@
using Microsoft.JSInterop;
using Oqtane.Models;
using Microsoft.JSInterop;
using System.Threading.Tasks;
namespace Oqtane.UI
@ -233,6 +232,5 @@ namespace Oqtane.UI
return Task.CompletedTask;
}
}
}
}

5
Oqtane.Client/UI/ModuleInstance.razor
View File

@ -1,4 +1,5 @@
@namespace Oqtane.UI
@inject IStringLocalizer<ModuleInstance> Localizer
<ModuleMessage Message="@_message" Type="@_messagetype" />
<CascadingValue Value="this">
@ -41,13 +42,13 @@
else
{
// module does not exist with typename specified
_message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0) + ".razor";
_message = Localizer["Module Does Not Have A Component Named {0}.razor", Utilities.GetTypeNameLastSegment(ModuleState.ModuleType, 0)];
_messagetype = MessageType.Error;
}
}
else
{
_message = "Module Type Is Invalid For " + ModuleState.ModuleDefinitionName;
_message = Localizer["Module Type Is Invalid For {0}", ModuleState.ModuleDefinitionName];
_messagetype = MessageType.Error;
}

4
Oqtane.Client/UI/SiteRouter.razor
View File

@ -300,7 +300,7 @@
if (user == null)
{
// redirect to login page
NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "returnurl=" + path));
NavigationManager.NavigateTo(Utilities.NavigateUrl(alias.Path, "login", "?returnurl=" + path));
}
else
{
@ -565,4 +565,4 @@
=> RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
? Oqtane.Shared.Runtime.WebAssembly
: Oqtane.Shared.Runtime.Server;
}
}

33
Oqtane.Server/Controllers/FileController.cs
View File

@ -17,6 +17,7 @@ using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Repository;
using Microsoft.AspNetCore.Routing.Constraints;
using Oqtane.Extensions;
// ReSharper disable StringIndexOfIsCultureSpecific.1
@ -314,9 +315,9 @@ namespace Oqtane.Controllers
{
string merged = "";
// parse the filename which is in the format of filename.ext.part_x_y
// parse the filename which is in the format of filename.ext.part_x_y
string token = ".part_";
string parts = Path.GetExtension(filename)?.Replace(token, ""); // returns "x_y"
string parts = Path.GetExtension(filename)?.Replace(token, ""); // returns "x_y"
int totalparts = int.Parse(parts?.Substring(parts.IndexOf("_") + 1));
filename = Path.GetFileNameWithoutExtension(filename); // base filename
@ -435,45 +436,33 @@ namespace Oqtane.Controllers
[HttpGet("download/{id}")]
public IActionResult Download(int id)
{
string errorpath = Path.Combine(GetFolderPath("images"), "error.png");
Models.File file = _files.GetFile(id);
var file = _files.GetFile(id);
if (file != null)
{
if (_userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.Permissions))
{
string filepath = Path.Combine(GetFolderPath(file.Folder), file.Name);
var filepath = Path.Combine(GetFolderPath(file.Folder), file.Name);
if (System.IO.File.Exists(filepath))
{
var stream = new FileStream(filepath, FileMode.Open);
return File(stream, "application/octet-stream", file.Name);
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {FileId} {FilePath}", id, filepath);
HttpContext.Response.StatusCode = 404;
if (System.IO.File.Exists(errorpath))
{
var stream = new FileStream(errorpath, FileMode.Open);
return File(stream, "application/octet-stream", file.Name);
}
return PhysicalFile(filepath, file.Name.GetMimeType(), file.Name);
}
_logger.Log(LogLevel.Error, this, LogFunction.Read, "File Does Not Exist {FileId} {FilePath}", id, filepath);
HttpContext.Response.StatusCode = 404;
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
HttpContext.Response.StatusCode = 401;
var stream = new FileStream(errorpath, FileMode.Open);
return File(stream, "application/octet-stream", file.Name);
}
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "File Not Found {FileId}", id);
HttpContext.Response.StatusCode = 404;
var stream = new FileStream(errorpath, FileMode.Open);
return File(stream, "application/octet-stream", file.Name);
}
return null;
string errorPath = Path.Combine(GetFolderPath("images"), "error.png");
return System.IO.File.Exists(errorPath) ? PhysicalFile(errorPath, errorPath.GetMimeType()) : null;
}
private string GetFolderPath(Folder folder)

32
Oqtane.Server/Controllers/LocalizationController.cs Normal file
View File

@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Controllers
{
[Route(ControllerRoutes.Default)]
public class LocalizationController : Controller
{
private readonly ILocalizationManager _localizationManager;
public LocalizationController(ILocalizationManager localizationManager)
{
_localizationManager = localizationManager;
}
// GET: api/localization
[HttpGet()]
public IEnumerable<Culture> Get()
=> _localizationManager.GetSupportedCultures().Select(c => new Culture {
Name = CultureInfo.GetCultureInfo(c).Name,
DisplayName = CultureInfo.GetCultureInfo(c).DisplayName,
IsDefault = _localizationManager.GetDefaultCulture()
.Equals(CultureInfo.GetCultureInfo(c).Name, StringComparison.OrdinalIgnoreCase)
});
}
}

7
Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Globalization;
using System;
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Builder;
@ -31,11 +30,9 @@ namespace Oqtane.Extensions
var defaultCulture = localizationManager.GetDefaultCulture();
var supportedCultures = localizationManager.GetSupportedCultures();
CultureInfo.CurrentUICulture = new CultureInfo(defaultCulture);
app.UseRequestLocalization(options => {
options.SetDefaultCulture(defaultCulture)
.AddSupportedUICultures(supportedCultures)
.AddSupportedCultures(supportedCultures)
.AddSupportedUICultures(supportedCultures);
});

14
Oqtane.Server/Extensions/StringExtensions.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.StaticFiles;
namespace Oqtane.Extensions
{
@ -11,7 +12,20 @@ namespace Oqtane.Extensions
{
return false;
}
return list.Any(f => s.StartsWith(f));
}
public static string GetMimeType(this string fileName)
{
var provider = new FileExtensionContentTypeProvider();
if (!provider.TryGetContentType(fileName, out var contentType))
{
contentType = "application/octet-stream";
}
return contentType;
}
}
}

10
Oqtane.Server/Pages/_Host.cshtml
View File

@ -1,17 +1,9 @@
@page "/"
@page "/"
@namespace Oqtane.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@using System.Globalization
@using Microsoft.AspNetCore.Localization
@using Microsoft.Extensions.Configuration
@inject IConfiguration Configuration
@model Oqtane.Pages.HostModel
@{
// Set localization cookie
var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture));
HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue);
}
<!DOCTYPE html>
<html>
<head>

1
Oqtane.Server/Startup.cs
View File

@ -127,6 +127,7 @@ namespace Oqtane
services.AddScoped<ISiteTemplateService, SiteTemplateService>();
services.AddScoped<ISqlService, SqlService>();
services.AddScoped<ISystemService, SystemService>();
services.AddScoped<ILocalizationService, LocalizationService>();
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();

11
Oqtane.Shared/Models/Culture.cs Normal file
View File

@ -0,0 +1,11 @@
namespace Oqtane.Models
{
public class Culture
{
public string Name { get; set; }
public string DisplayName { get; set; }
public bool IsDefault { get; set; }
}
}

3
azuredeploy.json
View File

@ -158,7 +158,8 @@
"name": "[parameters('BlazorWebsiteName')]",
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('hostingPlanName'))]",
"siteConfig": {
"webSocketsEnabled": true
"webSocketsEnabled": true,
"netFrameworkVersion": "v5.0"
}
},
"resources": [