From 3d8df02f2296f2313d24cf376557b8a572c1d2d5 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 26 Feb 2021 18:36:14 +0800 Subject: [PATCH] Rename EmailSetting to Emailing. --- .../SettingManagementPermissionDefinitionProvider.cs | 2 +- .../Abp/SettingManagement/SettingManagementPermissions.cs | 2 +- .../Volo/Abp/SettingManagement/EmailSettingsAppService.cs | 2 +- .../AbpSettingManagementBlazorModule.cs | 2 +- ...SettingPageContributor.cs => EmailingPageContributor.cs} | 6 +++--- .../Localization/Resources/AbpSettingManagement/de-DE.json | 4 ++-- .../Localization/Resources/AbpSettingManagement/en.json | 4 ++-- .../Localization/Resources/AbpSettingManagement/es.json | 4 ++-- .../Localization/Resources/AbpSettingManagement/tr.json | 4 ++-- .../Resources/AbpSettingManagement/zh-Hans.json | 4 ++-- .../AbpSettingManagementWebModule.cs | 2 +- ...SettingPageContributor.cs => EmailingPageContributor.cs} | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) rename modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/{EmailSettingPageContributor.cs => EmailingPageContributor.cs} (89%) rename modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/{EmailSettingPageContributor.cs => EmailingPageContributor.cs} (90%) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs index a7c7c7f983..7550c44c6a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.SettingManagement public override void Define(IPermissionDefinitionContext context) { var moduleGroup = context.AddGroup(SettingManagementPermissions.GroupName, L("Permission:SettingManagement")); - moduleGroup.AddPermission(SettingManagementPermissions.EmailSetting, L("Permission:EmailSetting"), multiTenancySide: MultiTenancySides.Host); + moduleGroup.AddPermission(SettingManagementPermissions.Emailing, L("Permission:Emailing"), multiTenancySide: MultiTenancySides.Host); } private static LocalizableString L(string name) diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs index eb68845487..b394f0d3de 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs @@ -6,7 +6,7 @@ namespace Volo.Abp.SettingManagement { public const string GroupName = "SettingManagement"; - public const string EmailSetting = GroupName + ".EmailSetting"; + public const string Emailing = GroupName + ".Emailing"; public static string[] GetAll() { diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs index ee5e4ec430..5d4cf1fbca 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs @@ -5,7 +5,7 @@ using Volo.Abp.Emailing; namespace Volo.Abp.SettingManagement { - [Authorize(SettingManagementPermissions.EmailSetting)] + [Authorize(SettingManagementPermissions.Emailing)] public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService { protected ISettingManager SettingManager { get; } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs index de17beec9e..ebb9531a8a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs @@ -36,7 +36,7 @@ namespace Volo.Abp.SettingManagement.Blazor Configure(options => { - options.Contributors.Add(new EmailSettingPageContributor()); + options.Contributors.Add(new EmailingPageContributor()); }); } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailSettingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs similarity index 89% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailSettingPageContributor.cs rename to modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs index b1f6e9d63a..5176c393c7 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailSettingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs @@ -7,7 +7,7 @@ using Volo.Abp.SettingManagement.Localization; namespace Volo.Abp.SettingManagement.Blazor.Settings { - public class EmailSettingPageContributor: ISettingComponentContributor + public class EmailingPageContributor: ISettingComponentContributor { public async Task ConfigureAsync(SettingComponentCreationContext context) { @@ -20,7 +20,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Settings context.Groups.Add( new SettingComponentGroup( "Volo.Abp.SettingManagement", - l["Menu:EmailSetting"], + l["Menu:Emailing"], typeof(EmailSettingGroupViewComponent) ) ); @@ -35,7 +35,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Settings { var authorizationService = context.ServiceProvider.GetRequiredService(); - return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting); + return await authorizationService.IsGrantedAsync(SettingManagementPermissions.Emailing); } } } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json index ef0af78334..99214b69c1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json @@ -4,8 +4,8 @@ "Settings": "Einstellungen", "SuccessfullySaved": "Erfolgreich gespeichert", "Permission:SettingManagement": "Einstellungen-Verwaltung", - "Permission:EmailSetting": "E-Mail-Einstellungen", - "Menu:EmailSetting": "E-Mail-Einstellung", + "Permission:Emailing": "E-Mail", + "Menu:Emailing": "E-Mail", "SmtpHost": "Host", "SmtpPort": "Port", "SmtpUserName": "Benutzername", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json index 37ce73fcb2..88eb894435 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json @@ -4,8 +4,8 @@ "Settings": "Settings", "SuccessfullySaved": "Successfully saved", "Permission:SettingManagement": "Setting Management", - "Permission:EmailSetting": "Email Setting", - "Menu:EmailSetting": "Email Setting", + "Permission:Emailing": "Emailing", + "Menu:Emailing": "Emailing", "SmtpHost": "Host", "SmtpPort": "Port", "SmtpUserName": "User name", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json index 7bd35306bb..2d7659cf7a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json @@ -4,8 +4,8 @@ "Settings": "Configuraciones", "SuccessfullySaved": "Guardado correctamente", "Permission:SettingManagement": "Configuraciones de correo electronico", - "Permission:EmailSetting": "Configuración de correo electrónico", - "Menu:EmailSetting": "Configuración de correo electrónico", + "Permission:Emailing": "Configuración", + "Menu:Emailing": "Configuración", "SmtpHost": "Host", "SmtpPort": "Puerto", "SmtpUserName": "Nombre de usuario", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json index 4710abde96..1540501b6e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json @@ -4,8 +4,8 @@ "Settings": "Ayarlar", "SuccessfullySaved": "Başarıyla Kaydedildi", "Permission:SettingManagement": "Ayarlar yönetimi", - "Permission:EmailSetting": "Email Ayarlar", - "Menu:EmailSetting": "Email Ayarlar", + "Permission:Emailing": "Email", + "Menu:Emailing": "Email", "SmtpHost": "Sunucu", "SmtpPort": "Port", "SmtpUserName": "Kullanıcı adı", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json index 5a2053700a..996c07ebc2 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json @@ -4,8 +4,8 @@ "Settings": "设置", "SuccessfullySaved": "保存成功", "Permission:SettingManagement": "设置管理", - "Permission:EmailSetting": "邮件设置", - "Menu:EmailSetting": "邮件设置", + "Permission:Emailing": "邮件", + "Menu:Emailing": "邮件", "SmtpHost": "主机", "SmtpPort": "端口", "SmtpUserName": "用户名", diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index 84113041b8..8343c30f60 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -34,7 +34,7 @@ namespace Volo.Abp.SettingManagement.Web Configure(options => { - options.Contributors.Add(new EmailSettingPageContributor()); + options.Contributors.Add(new EmailingPageContributor()); }); Configure(options => diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailSettingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs similarity index 90% rename from modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailSettingPageContributor.cs rename to modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs index b7888a8eb2..e940d0467b 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailSettingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs @@ -8,7 +8,7 @@ using Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.EmailSet namespace Volo.Abp.SettingManagement.Web.Settings { - public class EmailSettingPageContributor: ISettingPageContributor + public class EmailingPageContributor: ISettingPageContributor { public async Task ConfigureAsync(SettingPageCreationContext context) { @@ -21,7 +21,7 @@ namespace Volo.Abp.SettingManagement.Web.Settings context.Groups.Add( new SettingPageGroup( "Volo.Abp.EmailSetting", - l["Menu:EmailSetting"], + l["Menu:Emailing"], typeof(EmailSettingGroupViewComponent) ) ); @@ -36,7 +36,7 @@ namespace Volo.Abp.SettingManagement.Web.Settings { var authorizationService = context.ServiceProvider.GetRequiredService(); - return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting); + return await authorizationService.IsGrantedAsync(SettingManagementPermissions.Emailing); } } }