Add Data Localization Contexts to OrchardCoreConstants (#19022)

Co-authored-by: Georg von Kries <gvk@creativbox.net>

Author: hishamco

src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuDataLocalizationProvider.cs

@@ -6,8 +6,6 @@ public class AdminMenuDataLocalizationProvider : ILocalizationDataProvider
 {
     private readonly IAdminMenuService _adminMenuService;
 
-    internal static readonly string Context = "Admin Menus";
-
     public AdminMenuDataLocalizationProvider(IAdminMenuService adminMenuService)
     {
         _adminMenuService = adminMenuService;
@@ -17,6 +15,6 @@ public async Task<IEnumerable<DataLocalizedString>> GetDescriptorsAsync()
     {
         var adminMenuList = await _adminMenuService.GetAdminMenuListAsync();
 
-        return adminMenuList.AdminMenu.Select(item => new DataLocalizedString(Context, item.Name, string.Empty));
+        return adminMenuList.AdminMenu.Select(item => new DataLocalizedString(DataLocalizationContext.AdminMenu(), item.Name, string.Empty));
     }
 }

src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/LinkAdminNodeDataLocalizationProvider.cs

@@ -15,7 +15,7 @@ public override async Task<IEnumerable<DataLocalizedString>> GetDescriptorsAsync
 
         return adminMenuList.SelectMany(m =>
         {
-            var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, m.Name);
+            var context = DataLocalizationContext.AdminMenu(m.Name);
 
             return m.MenuItems.OfType<LinkAdminNode>()
                 .Select(n => new DataLocalizedString(context, n.LinkText, string.Empty));

src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/PlaceholderAdminNodeDataLocalizationProvider.cs

@@ -13,12 +13,8 @@ public override async Task<IEnumerable<DataLocalizedString>> GetDescriptorsAsync
     {
         var adminMenuList = await GetAdminMenusAsync();
 
-        return adminMenuList.SelectMany(m =>
-        {
-            var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, m.Name);
-
-            return m.MenuItems.OfType<PlaceholderAdminNode>()
-                .Select(n => new DataLocalizedString(context, n.LinkText, string.Empty));
-        });
+        return adminMenuList.SelectMany(m => m.MenuItems.OfType<PlaceholderAdminNode>()
+            .Select(n => new DataLocalizedString(DataLocalizationContext.AdminMenu(m.Name), n.LinkText, string.Empty))
+        );
     }
 }

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeSummary.cshtml

@@ -1,11 +1,11 @@
 @using OrchardCore
+@using OrchardCore.AdminMenu
 @using OrchardCore.AdminMenu.Services
 @using OrchardCore.Localization.Data
 @model ShapeViewModel<LinkAdminNode>
 @inject IDataLocalizer D
 @{
-    var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, Model.Value.MenuName);
-    string localizedAdminMenuItemLinkText = D[Model.Value.LinkText, context];
+    string localizedAdminMenuItemLinkText = D[Model.Value.LinkText, OrchardCore.AdminMenu.DataLocalizationContext.AdminMenu(Model.Value.MenuName)];
 }
 <div class="@(Model.Value.Enabled ? "" : "disabled")">
     <span>@localizedAdminMenuItemLinkText <code>@Model.Value.LinkUrl</code> <span class="text-muted dashed">@T["Link"]</span></span>

src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeSummary.cshtml

@@ -1,11 +1,11 @@
 @using OrchardCore
+@using OrchardCore.AdminMenu
 @using OrchardCore.AdminMenu.Services
 @using OrchardCore.Localization.Data
 @model ShapeViewModel<PlaceholderAdminNode>
 @inject IDataLocalizer D
 @{
-    var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, Model.Value.MenuName);
-    string localizedAdminMenuItemLinkText = D[Model.Value.LinkText, context];
+    string localizedAdminMenuItemLinkText = D[Model.Value.LinkText, OrchardCore.AdminMenu.DataLocalizationContext.AdminMenu(Model.Value.MenuName)];
 }
 <div class="@(Model.Value.Enabled ? "" : "disabled")">
     <span>@localizedAdminMenuItemLinkText <span class="text-muted dashed">@T["Placeholder"]</span></span>

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml

@@ -1,10 +1,11 @@
 @model OrchardCore.ContentFields.ViewModels.EditBooleanFieldViewModel
+@using OrchardCore.ContentFields
 @using OrchardCore.Mvc.Utilities
 @using OrchardCore.Localization.Data
 @inject IDataLocalizer D
 @{
     var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
-    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), $"Content Fields{Constants.ContextSeparator}{Model.PartFieldDefinition.PartDefinition.Name}"];
+    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), DataLocalizationContext.ContentField(Model.PartFieldDefinition.PartDefinition.Name)];
 }
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml

@@ -1,10 +1,11 @@
 @model OrchardCore.ContentFields.ViewModels.EditBooleanFieldViewModel
+@using OrchardCore.ContentFields
 @using OrchardCore.Mvc.Utilities
 @using OrchardCore.Localization.Data
 @inject IDataLocalizer D
 @{
     var settings = Model.PartFieldDefinition.GetSettings<BooleanFieldSettings>();
-    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), $"Content Fields{Constants.ContextSeparator}{Model.PartFieldDefinition.PartDefinition.Name}"];
+    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), DataLocalizationContext.ContentField(Model.PartFieldDefinition.PartDefinition.Name)];
 }
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Value)_FieldWrapper">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml

@@ -1,6 +1,7 @@
 @model OrchardCore.ContentFields.ViewModels.EditContentPickerFieldViewModel
 @using System.Text.Json
 @using System.Text.Json.Nodes
+@using OrchardCore.ContentFields
 @using OrchardCore.Mvc.Utilities
 @using OrchardCore.Localization.Data
 @inject IDataLocalizer D
@@ -14,7 +15,7 @@
     var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "ContentPickerAdmin", action = "SearchContentItems", part = partName, field = fieldName });
     var vueElementId = $"ContentPicker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
-    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), $"Content Fields{Constants.ContextSeparator}{Model.PartFieldDefinition.PartDefinition.Name}"];
+    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), DataLocalizationContext.ContentField(Model.PartFieldDefinition.PartDefinition.Name)];
 }
 
 <script asp-name="vue-multiselect-wrapper" at="Foot"></script>

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.cshtml

@@ -1,4 +1,5 @@
 @model OrchardCore.ContentFields.ViewModels.DisplayContentPickerFieldViewModel
+@using OrchardCore.ContentFields
 @using OrchardCore.ContentManagement
 @using OrchardCore.Mvc.Utilities
 @using OrchardCore.ContentManagement.Metadata.Models
@@ -10,7 +11,7 @@
 @{
     var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify();
     var contentItems = await ContentManager.GetAsync(Model.ContentItemIds);
-    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), $"Content Fields{Constants.ContextSeparator}{Model.PartFieldDefinition.PartDefinition.Name}"];
+    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), DataLocalizationContext.ContentField(Model.PartFieldDefinition.PartDefinition.Name)];
 }
 
 <div class="field field-type-contentpickerfield field-name-@name">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml

@@ -1,11 +1,12 @@
 @model OrchardCore.ContentFields.ViewModels.EditDateFieldViewModel
+@using OrchardCore.ContentFields
 @using OrchardCore.Localization.Data
 @inject IDataLocalizer D
 @{
     var settings = Model.PartFieldDefinition.GetSettings<DateFieldSettings>();
     var language = Orchard.CultureName().Split('-')[0];
     var datepickerId = Html.IdFor(m => m.Value);
-    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), $"Content Fields{Constants.ContextSeparator}{Model.PartFieldDefinition.PartDefinition.Name}"];
+    string localizedFieldName = D[Model.PartFieldDefinition.DisplayName(), DataLocalizationContext.ContentField(Model.PartFieldDefinition.PartDefinition.Name)];
 }
 
 <div class="@Orchard.GetWrapperClasses()">