Merge pull request #7726 from abpframework/maliming/EmailSetting

Rename EmailSettingManagement to EmailSetting.
abpframework · Feb 18, 2021 · 48ab98c · 48ab98c
2 parents f80419a + efb37d5
commit 48ab98c
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/...ion.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs b/...ion.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs
@@ -10,7 +10,7 @@ public class SettingManagementPermissionDefinitionProvider : PermissionDefinitio
         public override void Define(IPermissionDefinitionContext context)
         {
             var moduleGroup = context.AddGroup(SettingManagementPermissions.GroupName, L("Permission:SettingManagement"));
-            moduleGroup.AddPermission(SettingManagementPermissions.EmailSettingManagement, L("Permission:EmailSettingManagement"), multiTenancySide: MultiTenancySides.Host);
+            moduleGroup.AddPermission(SettingManagementPermissions.EmailSetting, L("Permission:EmailSetting"), multiTenancySide: MultiTenancySides.Host);
         }
 
         private static LocalizableString L(string name)

diff --git a/...nagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs b/...nagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs
@@ -6,7 +6,7 @@ public class SettingManagementPermissions
     {
         public const string GroupName = "SettingManagement";
 
-        public const string EmailSettingManagement = GroupName + ".EmailSettingManagement";
+        public const string EmailSetting = GroupName + ".EmailSetting";
 
         public static string[] GetAll()
         {

diff --git a/...o.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs b/...o.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs
@@ -5,7 +5,7 @@
 
 namespace Volo.Abp.SettingManagement
 {
-    [Authorize(SettingManagementPermissions.EmailSettingManagement)]
+    [Authorize(SettingManagementPermissions.EmailSetting)]
     public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService
     {
         protected ISettingManager SettingManager { get; }

diff --git a/...ting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs b/...ting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
@@ -36,7 +36,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             Configure<SettingManagementComponentOptions>(options =>
             {
-                options.Contributors.Add(new EmailSettingManagementPageContributor());
+                options.Contributors.Add(new EmailSettingPageContributor());
             });
         }
     }

diff --git a/.../EmailSettingManagementPageContributor.cs → ...r/Settings/EmailSettingPageContributor.cs b/.../EmailSettingManagementPageContributor.cs → ...r/Settings/EmailSettingPageContributor.cs
@@ -7,7 +7,7 @@
 
 namespace Volo.Abp.SettingManagement.Blazor.Settings
 {
-    public class EmailSettingManagementPageContributor: ISettingComponentContributor
+    public class EmailSettingPageContributor: ISettingComponentContributor
     {
         public async Task ConfigureAsync(SettingComponentCreationContext context)
         {
@@ -20,7 +20,7 @@ public async Task ConfigureAsync(SettingComponentCreationContext context)
             context.Groups.Add(
                 new SettingComponentGroup(
                     "Volo.Abp.SettingManagement",
-                    l["Menu:EmailSettingManagement"],
+                    l["Menu:EmailSetting"],
                     typeof(EmailSettingGroupViewComponent)
                 )
             );
@@ -35,7 +35,7 @@ private async Task<bool> CheckPermissionsInternalAsync(SettingComponentCreationC
         {
             var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
 
-            return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSettingManagement);
+            return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting);
         }
     }
 }
diff --git a/....Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json b/....Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json
@@ -4,8 +4,8 @@
     "Settings": "Einstellungen",
     "SuccessfullySaved": "Erfolgreich gespeichert",
     "Permission:SettingManagement": "Einstellungen-Verwaltung",
-    "Permission:EmailSettingManagement": "E-Mail-Einstellungen",
-    "Menu:EmailSettingManagement": "E-Mail-Verwaltung",
+    "Permission:EmailSetting": "E-Mail-Einstellungen",
+    "Menu:EmailSetting": "E-Mail-Einstellung",
     "SmtpHost": "Host",
     "SmtpPort": "Port",
     "SmtpUserName": "Benutzername",

diff --git a/...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json b/...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json
@@ -4,8 +4,8 @@
     "Settings": "Settings",
     "SuccessfullySaved": "Successfully saved",
     "Permission:SettingManagement": "Setting Management",
-    "Permission:EmailSettingManagement": "Email Settings",
-    "Menu:EmailSettingManagement": "Email management",
+    "Permission:EmailSetting": "Email Setting",
+    "Menu:EmailSetting": "Email Setting",
     "SmtpHost": "Host",
     "SmtpPort": "Port",
     "SmtpUserName": "User name",

diff --git a/...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json b/...ain.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:EmailSettingManagement": "Administración Configuraciones",
-    "Menu:EmailSettingManagement": "Administración de correo electronico",
+    "Permission:EmailSetting": "Configuración de correo electrónico",
+    "Menu:EmailSetting": "Configuración de correo electrónico",
     "SmtpHost": "Host",
     "SmtpPort": "Puerto",
     "SmtpUserName": "Nombre de usuario",

diff --git a/...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json b/...ain.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:EmailSettingManagement": "Email Ayarlar",
-    "Menu:EmailSettingManagement": "Email yönetimi",
+    "Permission:EmailSetting": "Email Ayarlar",
+    "Menu:EmailSetting": "Email Ayarlar",
     "SmtpHost": "Sunucu",
     "SmtpPort": "Port",
     "SmtpUserName": "Kullanıcı adı",

diff --git a/...hared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json b/...hared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json
@@ -4,8 +4,8 @@
     "Settings": "设置",
     "SuccessfullySaved": "保存成功",
     "Permission:SettingManagement": "设置管理",
-    "Permission:EmailSettingManagement": "邮件设置",
-    "Menu:EmailSettingManagement": "邮件管理",
+    "Permission:EmailSetting": "邮件设置",
+    "Menu:EmailSetting": "邮件设置",
     "SmtpHost": "主机",
     "SmtpPort": "端口",
     "SmtpUserName": "用户名",

diff --git a/...es/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/...es/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs
@@ -34,7 +34,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             Configure<SettingManagementPageOptions>(options =>
             {
-                options.Contributors.Add(new EmailSettingManagementPageContributor());
+                options.Contributors.Add(new EmailSettingPageContributor());
             });
 
             Configure<AbpVirtualFileSystemOptions>(options =>

diff --git a/.../EmailSettingManagementPageContributor.cs → ...b/Settings/EmailSettingPageContributor.cs b/.../EmailSettingManagementPageContributor.cs → ...b/Settings/EmailSettingPageContributor.cs
@@ -8,7 +8,7 @@
 
 namespace Volo.Abp.SettingManagement.Web.Settings
 {
-    public class EmailSettingManagementPageContributor: ISettingPageContributor
+    public class EmailSettingPageContributor: ISettingPageContributor
     {
         public async Task ConfigureAsync(SettingPageCreationContext context)
         {
@@ -20,8 +20,8 @@ public async Task ConfigureAsync(SettingPageCreationContext context)
             var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AbpSettingManagementResource>>();
             context.Groups.Add(
                 new SettingPageGroup(
-                    "Volo.Abp.SettingManagement",
-                    l["Menu:EmailSettingManagement"],
+                    "Volo.Abp.EmailSetting",
+                    l["Menu:EmailSetting"],
                     typeof(EmailSettingGroupViewComponent)
                 )
             );
@@ -36,7 +36,7 @@ private async Task<bool> CheckPermissionsInternalAsync(SettingPageCreationContex
         {
             var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
 
-            return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSettingManagement);
+            return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting);
         }
     }
 }