Unify wording of standard permission names

src/Core/Grand.Domain/Permissions/StandardPermission.cs

@@ -7,7 +7,7 @@ public static partial class StandardPermission
 {
     //admin area permissions
     public static readonly Permission ManageAccessAdminPanel = new() {
-        Name = "Access admin",
+        Name = "Access Admin Panel",
         SystemName = PermissionSystemName.AccessAdminPanel,
         Area = "Admin area",
         Category = "Access Admin"

src/Core/Grand.Domain/Permissions/StandardPermissionCatalog.cs

@@ -5,7 +5,7 @@
     public static readonly Permission ManageProducts = new() {
         Name = "Manage Products",
         SystemName = PermissionSystemName.Products,
         Area = "Admin area",
         Category = CategoryCatalog,
         Actions = new List<string> {
             PermissionActionName.List, PermissionActionName.Create, PermissionActionName.Edit,
@@ -95,7 +95,7 @@
     };
 
     public static readonly Permission ManageContactAttribute = new() {
-        Name = "Manage Contact Attribute",
+        Name = "Manage Contact Attributes",
         SystemName = PermissionSystemName.ContactAttributes,
         Area = "Admin area",
         Category = CategoryCatalog,

src/Core/Grand.Domain/Permissions/StandardPermissionMarketing.cs

@@ -5,7 +5,7 @@
     public static readonly Permission ManageAffiliates = new() {
         Name = "Manage Affiliates",
         SystemName = PermissionSystemName.Affiliates,
         Area = "Admin area",
         Category = CategoryMarketing,
         Actions = new List<string> {
             PermissionActionName.List, PermissionActionName.Create, PermissionActionName.Edit,
@@ -14,7 +14,7 @@
     };
 
     public static readonly Permission ManagePushEvents = new() {
-        Name = "Manage Push Events",
+        Name = "Manage Push Notifications",
         SystemName = PermissionSystemName.PushNotifications,
         Area = "Admin area",
         Category = CategoryMarketing,

src/Core/Grand.Domain/Permissions/StandardPermissionOrder.cs

@@ -5,7 +5,7 @@
     public static readonly Permission ManageOrders = new() {
         Name = "Manage Orders",
         SystemName = PermissionSystemName.Orders,
         Area = "Admin area",
         Category = "Orders",
         Actions = new List<string> {
             PermissionActionName.List, PermissionActionName.Edit, PermissionActionName.Payments,
@@ -26,7 +26,7 @@
     };
 
     public static readonly Permission ManageOrderStatus = new() {
-        Name = "Manage Order status",
+        Name = "Manage Order Status",
         SystemName = PermissionSystemName.OrderStatus,
         Area = "Admin area",
         Category = CategoryOrder
@@ -44,7 +44,7 @@
     };
 
     public static readonly Permission ManageGiftVouchers = new() {
-        Name = "Manage Gift vouchers",
+        Name = "Manage Gift Vouchers",
         SystemName = PermissionSystemName.GiftVouchers,
         Area = "Admin area",
         Category = CategoryOrder,
@@ -66,7 +66,7 @@
     };
 
     public static readonly Permission ManagePaymentTransactions = new() {
-        Name = "Manage Payment Transaction",
+        Name = "Manage Payment Transactions",
         SystemName = PermissionSystemName.PaymentTransactions,
         Area = "Admin area",
         Category = CategoryOrder,

src/Core/Grand.Domain/Permissions/StandardPermissionPublicStore.cs

@@ -5,40 +5,40 @@
     public static readonly Permission DisplayPrices = new() {
         Name = "Display Prices",
         SystemName = PermissionSystemName.DisplayPrices,
         Area = "Public store",
         Category = CategoryPublicStore
     };
 
     public static readonly Permission EnableShoppingCart = new() {
-        Name = "Enable shopping cart",
+        Name = "Enable Shopping Cart",
         SystemName = PermissionSystemName.EnableShoppingCart,
         Area = "Public store",
         Category = CategoryPublicStore
     };
 
     public static readonly Permission EnableWishlist = new() {
-        Name = "Enable wishlist",
+        Name = "Enable Wishlist",
         SystemName = PermissionSystemName.EnableWishlist,
         Area = "Public store",
         Category = CategoryPublicStore
     };
 
     public static readonly Permission PublicStoreAllowNavigation = new() {
-        Name = "Allow navigation",
+        Name = "Allow Navigation",
         SystemName = PermissionSystemName.PublicStoreAllowNavigation,
         Area = "Public store",
         Category = CategoryPublicStore
     };
 
     public static readonly Permission AccessClosedStore = new() {
-        Name = "Access a closed store",
+        Name = "Access Closed Store",
         SystemName = PermissionSystemName.AccessClosedStore,
         Area = "Public store",
         Category = CategoryPublicStore
     };
 
     public static readonly Permission AllowUseApi = new() {
-        Name = "Allow to use api for web",
+        Name = "Allow Web API Access",
         SystemName = PermissionSystemName.AllowUseApi,
         Area = "Public store",
         Category = CategoryPublicStore

src/Core/Grand.Domain/Permissions/StandardPermissionStore.cs

@@ -7,7 +7,7 @@ public static partial class StandardPermission
 {
     //admin area permissions
     public static readonly Permission ManageAccessStoreManagerPanel = new() {
-        Name = "Access store manager panel",
+        Name = "Access Store Manager Panel",
         SystemName = PermissionSystemName.AccessStorePanel,
         Area = "Store area",
         Category = "Access Store"

src/Core/Grand.Domain/Permissions/StandardPermissionSystem.cs

@@ -5,7 +5,7 @@
     public static readonly Permission ManageMessageQueue = new() {
         Name = "Manage Message Queue",
         SystemName = PermissionSystemName.MessageQueue,
         Area = "Admin area",
         Category = CategorySystem,
         Actions = new List<string> {
             PermissionActionName.List, PermissionActionName.Create, PermissionActionName.Edit,
@@ -14,7 +14,7 @@
     };
 
     public static readonly Permission ManageMessageContactForm = new() {
-        Name = "Manage Message Contact form",
+        Name = "Manage Message Contact Form",
         SystemName = PermissionSystemName.MessageContactForm,
         Area = "Admin area",
         Category = CategorySystem,
@@ -51,7 +51,7 @@
     };
 
     public static readonly Permission HtmlEditorManagePictures = new() {
-        Name = "HTML Editor. Manage pictures",
+        Name = "Manage HTML Editor Pictures",
         SystemName = PermissionSystemName.HtmlEditor,
         Area = "Admin area",
         Category = "Configuration"

src/Core/Grand.Domain/Permissions/StandardPermissionVendor.cs

@@ -7,7 +7,7 @@ public static partial class StandardPermission
 {
     //admin area permissions
     public static readonly Permission ManageAccessVendorPanel = new() {
-        Name = "Access vendor panel",
+        Name = "Access Vendor Panel",
         SystemName = PermissionSystemName.AccessVendorPanel,
         Area = "Vendor area",
         Category = "Access Vendor"

src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateStandardPermissionNames.cs

@@ -0,0 +1,80 @@
+using System.Reflection;
+using Grand.Data;
+using Grand.Domain.Localization;
+using Grand.Domain.Permissions;
+using Grand.Infrastructure.Migrations;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Grand.Module.Migration.Migrations._2._4;
+
+/// <summary>
+///     Unifies the wording of standard permission display names in already-installed databases.
+///     Two problems existed side by side:
+///     1) a handful of names had inconsistent casing/singular-plural wording (e.g. "Manage Order status",
+///     "Manage Contact Attribute" vs. "Manage Address Attributes") - now corrected on <see cref="StandardPermission" />.
+///     2) about 40 permissions additionally had a duplicate translation resource row with an
+///     "{Area}. " prefix (e.g. "Admin area. Manage Brands") left over from an old resource export. The
+///     Area field on TranslationResource is never actually used to filter which row is loaded, so whichever
+///     row was inserted first simply won - meaning some permissions showed the prefixed text and others
+///     (with no duplicate) didn't, for no functional reason. This drops the prefix everywhere so every
+///     permission consistently shows its plain name.
+/// </summary>
+public class MigrationUpdateStandardPermissionNames : IMigration
+{
+    public int Priority => 2;
+    public DbVersion Version => new(2, 4);
+    public Guid Identity => new("DAEE04E0-573A-4001-9613-E682BE45BCE3");
+    public string Name => "Unify wording of standard permission names and drop leftover 'Area. ' prefixes";
+
+    public bool UpgradeProcess(IServiceProvider serviceProvider)
+    {
+        var permissionRepository = serviceProvider.GetRequiredService<IRepository<Permission>>();
+        var translationRepository = serviceProvider.GetRequiredService<IRepository<TranslationResource>>();
+        var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateStandardPermissionNames>>();
+
+        var standardPermissions = typeof(StandardPermission)
+            .GetFields(BindingFlags.Public | BindingFlags.Static)
+            .Where(f => f.FieldType == typeof(Permission))
+            .Select(f => (Permission)f.GetValue(null)!);
+
+        foreach (var standard in standardPermissions)
+            try
+            {
+                var permission = permissionRepository.Table.FirstOrDefault(x => x.SystemName == standard.SystemName);
+                if (permission != null && permission.Name != standard.Name)
+                {
+                    permission.Name = standard.Name;
+                    permissionRepository.Update(permission);
+                }
+
+                //the display text is also cached as translation resources, under a couple of historical
+                //key/casing variants (and sometimes duplicated with an "{Area}. " prefix) - normalize every
+                //variant we can find to the plain name
+                var candidateKeys = new[] {
+                    $"Permission.{standard.SystemName}",
+                    $"permission.{standard.SystemName}",
+                    $"permission.{standard.SystemName}".ToLowerInvariant()
+                };
+
+                var translations = translationRepository.Table
+                    .Where(x => candidateKeys.Contains(x.Name))
+                    .ToList();
+
+                foreach (var translation in translations)
+                {
+                    if (translation.Value == standard.Name) continue;
+
+                    translation.Value = standard.Name;
+                    translationRepository.Update(translation);
+                }
+            }
+            catch (Exception ex)
+            {
+                logService.LogError(ex, "UpgradeProcess - MigrationUpdateStandardPermissionNames ({SystemName})",
+                    standard.SystemName);
+            }
+
+        return true;
+    }
+}