Merge pull request #3303 from leigh-pointer/Retention-resx

Fix for  Site 'SMTP retention' is not in resource file (Issue #3301) and #3304 Users 'Import Users' resource
This commit is contained in:
Shaun Walker
2023-09-23 09:12:33 -04:00
committed by GitHub
3 changed files with 12 additions and 3 deletions

View File

@ -21,7 +21,7 @@ else
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<div class="col-sm-4"> <div class="col-sm-4">
<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp; <ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
<ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" /> <ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" @bind="@_search" /> <input class="form-control" @bind="@_search" />

View File

@ -396,4 +396,10 @@
<data name="SiteGuid.Text" xml:space="preserve"> <data name="SiteGuid.Text" xml:space="preserve">
<value>ID:</value> <value>ID:</value>
</data> </data>
<data name="Retention.HelpText" xml:space="preserve">
<value>Number of days of notifications to retain</value>
</data>
<data name="Retention.Text" xml:space="preserve">
<value>Retention (Days):</value>
</data>
</root> </root>

View File

@ -390,7 +390,7 @@
<data name="RoleClaimType.Text" xml:space="preserve"> <data name="RoleClaimType.Text" xml:space="preserve">
<value>Role Claim:</value> <value>Role Claim:</value>
</data> </data>
<data name="ProfileClaimTypes.HelpText" xml:space="preserve"> <data name="ProfileClaimTypes.HelpText" xml:space="preserve">
<value>Optionally provide a comma delimited list of user profile claims provided by the identity provider, as well as mappings to your user profile definition. For example if the identity provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'.</value> <value>Optionally provide a comma delimited list of user profile claims provided by the identity provider, as well as mappings to your user profile definition. For example if the identity provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'.</value>
</data> </data>
<data name="ProfileClaimTypes.Text" xml:space="preserve"> <data name="ProfileClaimTypes.Text" xml:space="preserve">
@ -405,4 +405,7 @@
<data name="Email" xml:space="preserve"> <data name="Email" xml:space="preserve">
<value>Email</value> <value>Email</value>
</data> </data>
</root> <data name="ImportUsers.Text" xml:space="preserve">
<value>Import Users</value>
</data>
</root>