diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuDataLocalizationProvider.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuDataLocalizationProvider.cs index d51c04c004d..ac8ac456df6 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/AdminMenuDataLocalizationProvider.cs +++ b/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> 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)); } } diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/LinkAdminNodeDataLocalizationProvider.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/LinkAdminNodeDataLocalizationProvider.cs index 6a1d301deb7..4bcb7df4106 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/LinkAdminNodeDataLocalizationProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/LinkAdminNodeDataLocalizationProvider.cs @@ -15,7 +15,7 @@ public override async Task> 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() .Select(n => new DataLocalizedString(context, n.LinkText, string.Empty)); diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/PlaceholderAdminNodeDataLocalizationProvider.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/PlaceholderAdminNodeDataLocalizationProvider.cs index dedbf0540e3..fe85f0e7e06 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/PlaceholderAdminNodeDataLocalizationProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Services/PlaceholderAdminNodeDataLocalizationProvider.cs @@ -13,12 +13,8 @@ public override async Task> GetDescriptorsAsync { var adminMenuList = await GetAdminMenusAsync(); - return adminMenuList.SelectMany(m => - { - var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, m.Name); - - return m.MenuItems.OfType() - .Select(n => new DataLocalizedString(context, n.LinkText, string.Empty)); - }); + return adminMenuList.SelectMany(m => m.MenuItems.OfType() + .Select(n => new DataLocalizedString(DataLocalizationContext.AdminMenu(m.Name), n.LinkText, string.Empty)) + ); } } diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeSummary.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeSummary.cshtml index 0af70600adc..36e66c13c2e 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/LinkAdminNode.Fields.TreeSummary.cshtml +++ b/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 @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)]; }
@localizedAdminMenuItemLinkText @Model.Value.LinkUrl @T["Link"] diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeSummary.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeSummary.cshtml index 05155463888..18825d18424 100644 --- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Items/PlaceholderAdminNode.Fields.TreeSummary.cshtml +++ b/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 @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)]; }
@localizedAdminMenuItemLinkText @T["Placeholder"] diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml index 1728ed88eff..9d04357336e 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField-Switch.Edit.cshtml +++ b/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(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml index 9ee3bfaf671..5f0a6b79c19 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/BooleanField.Edit.cshtml +++ b/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(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml index f19d0e3c976..2c1189a76c9 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml +++ b/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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.cshtml index da89033891a..ebb7ae79a75 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.cshtml +++ b/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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml index 834f02cac41..b67803c0eb1 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField-Localized.Edit.cshtml +++ b/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(); 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml index 75335bbd9ef..1dd43c549ea 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateField.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditDateFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml index dcddc50534d..9141be37a4c 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/DateTimeField.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditDateTimeFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml index 16a643c87f3..652aaa61ed9 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Monaco.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditHtmlFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -6,7 +7,7 @@ var settings = Model.PartFieldDefinition.GetSettings(); var monacoSettings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml index dc457dba7f2..b6493454432 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Multiline.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditHtmlFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml index 32eb9357a3a..9f2afaa9aa0 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Trumbowyg.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditHtmlFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentFields.Settings @using OrchardCore.Mvc.Utilities @@ -8,7 +9,7 @@ var settings = Model.PartFieldDefinition.GetSettings(); var trumbowygSettings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml index 9e691e77e64..faab7cf6e20 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField-Wysiwyg.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditHtmlFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentFields.Settings @using OrchardCore.Mvc.Utilities @@ -7,7 +8,7 @@ @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml index f650ae05f81..9a941e57ede 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditHtmlFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml index d1dca7890d1..963388e164f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LinkField.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditLinkFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -8,7 +9,7 @@ var urlClass = settings.Required ? "required" : null; var textClass = settings.LinkTextMode == LinkTextMode.Required ? "required" : null; var useFormFloating = string.IsNullOrWhiteSpace(settings.UrlPlaceholder) || string.IsNullOrWhiteSpace(settings.TextPlaceholder); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml index ba74f2ae596..1eee565dfbe 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml @@ -1,6 +1,7 @@ @model OrchardCore.ContentFields.ViewModels.EditLocalizationSetContentPickerFieldViewModel @using System.Text.Json @using System.Text.Json.Nodes +@using OrchardCore.ContentFields @using OrchardCore.Environment.Shell @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @@ -16,7 +17,7 @@ var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "LocalizationSetContentPickerAdmin", action = "SearchLocalizationSets", part = partName, field = fieldName }); var vueElementId = $"LocalizedContentPicker_{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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.cshtml index c487d60d475..75a2b43c6d3 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.DisplayLocalizationSetContentPickerFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.ContentManagement.Metadata.Models @using Microsoft.AspNetCore.Localization @@ -11,7 +12,7 @@ var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify(); var currentCulture = Context.Features.Get().RequestCulture.Culture.Name; var contentItems = await ContentLocalizationManager.GetItemsForSetsAsync(Model.LocalizationSets, currentCulture); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml index 775385d7370..a3a9f90500a 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-CheckboxList.Edit.cshtml @@ -1,5 +1,6 @@ @model OrchardCore.ContentFields.ViewModels.EditMultiTextFieldViewModel @using OrchardCore +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -12,7 +13,7 @@ Value = option.Value, Selected = Model.Values.Contains(option.Value) }).ToList(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml index d9b0fe07c18..fef3c25650e 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml @@ -1,5 +1,6 @@ @model OrchardCore.ContentFields.ViewModels.EditMultiTextFieldViewModel @using System.Text.Json +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -24,7 +25,7 @@ var vueElementId = $"MultiTextField-Picker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}"; var valuesKey = Html.NameFor(x => x.Values); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml index c41b1d11c86..cf616ade783 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditMultiTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var options = new List(); - 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)]; foreach (var option in settings.Options) { diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.cshtml index 87626f07c5c..2a566848392 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.DisplayMultiTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify(); - 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)]; } @if (Model.Values.Any()) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml index 4a20838cf80..636bb80f608 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Range.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditNumericFieldViewModel @using System.Globalization +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; string step = Math.Pow(10, 0 - settings.Scale).ToString(CultureInfo.InvariantCulture); decimal min = settings.Minimum.HasValue ? settings.Minimum.Value : 0; decimal max = settings.Maximum.HasValue ? settings.Maximum.Value : 10000; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml index 5d8728ca388..94276b8b64d 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Select.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditNumericFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; decimal step = (decimal)Math.Pow(10, 0 - settings.Scale); decimal from = settings.Minimum.HasValue ? settings.Minimum.Value : 0; decimal to = settings.Maximum.HasValue ? settings.Maximum.Value : 10; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml index fea0d04e07a..fe64fd25a8f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Slider.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditNumericFieldViewModel +@using OrchardCore.ContentFields @using System.Globalization @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; string step = Math.Pow(10, 0 - settings.Scale).ToString(CultureInfo.InvariantCulture); decimal min = settings.Minimum.HasValue ? settings.Minimum.Value : 0; decimal max = settings.Maximum.HasValue ? settings.Maximum.Value : 10000; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml index 00f2df354e3..af8d8f5e747 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField-Spinner.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditNumericFieldViewModel +@using OrchardCore.ContentFields @using System.Globalization @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentFields.Settings @@ -7,7 +8,7 @@ @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; int scale = settings.Scale; string step = Math.Pow(10, 0 - settings.Scale).ToString(CultureInfo.InvariantCulture); decimal min = settings.Minimum.HasValue ? settings.Minimum.Value : 0; diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml index 15349a1f1df..6a0ab05d2db 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/NumericField.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditNumericFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; decimal min = settings.Minimum.HasValue ? settings.Minimum.Value : 0; decimal max = settings.Maximum.HasValue ? settings.Maximum.Value : 10000; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml index ab97684911e..676183b95eb 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-CodeMirror.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml index ba8ffaf6767..f974e67d6fa 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Color.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -6,7 +7,7 @@ const string DefaultColor = "#000000"; var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml index b19c62bf165..f93880149c7 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Email.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml index be36a8097d3..db1ce5302ca 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-IconPicker.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden || settings.Type == FieldBehaviorType.GeneratedDisabled) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml index 1a5f831a386..7d9d3a429d0 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Monaco.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -6,7 +7,7 @@ var settings = Model.PartFieldDefinition.GetSettings(); var monacoSettings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden || settings.Type == FieldBehaviorType.GeneratedDisabled) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml index 42b090c3ab2..90b2cb71849 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-PredefinedList.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var listSettings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden || settings.Type == FieldBehaviorType.GeneratedDisabled) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml index 476cf3eb938..92f01e76a72 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Tel.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml index 0bad659de26..cb2eed5e64e 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-TextArea.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml index 58f37a7a89d..61667d5ef1a 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField-Url.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml index f90d4832129..bb4642151bf 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextField.Edit.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.EditTextFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } @if (settings.Type == FieldBehaviorType.GeneratedHidden) diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml index 222a76187c4..44c3018a932 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TimeField.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditTimeFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField-UserNames.Display.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField-UserNames.Display.cshtml index 83d4f8bb653..3eb939352e3 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField-UserNames.Display.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField-UserNames.Display.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.DisplayUserPickerFieldUserNamesViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml index dd390c6be13..a4ef094ff2f 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml @@ -1,6 +1,7 @@ @model OrchardCore.ContentFields.ViewModels.EditUserPickerFieldViewModel @using System.Text.Json @using System.Text.Json.Nodes +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -13,7 +14,7 @@ var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "UserPickerAdmin", action = "SearchUsers", part = partName, field = fieldName, contentType = contentTypeName }); var vueElementId = $"UserPicker_{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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.cshtml index 8dae6877a61..c31578f754c 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.cshtml @@ -1,11 +1,12 @@ @model OrchardCore.ContentFields.ViewModels.DisplayUserPickerFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify(); var users = await @Orchard.GetUsersByIdsAsync(Model.UserIds); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml index acdf6a17eb5..d2456a87766 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/YoutubeField.Edit.cshtml @@ -1,10 +1,11 @@ @model OrchardCore.ContentFields.ViewModels.EditYoutubeFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @inject IDataLocalizer D @{ var settings = Model.PartFieldDefinition.GetSettings(); - 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)]; }
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml index 0be4004be62..2478f968fdf 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml @@ -1,6 +1,7 @@ @using OrchardCore.ContentManagement @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentManagement.Metadata.Settings +@using OrchardCore.ContentTypes @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @using System.Linq @@ -55,7 +56,7 @@ } var fields = ContentOptions.Value.ContentFieldOptions.Select(cfo => cfo.Type).ToList(); - string localizedTypeName = D[Model.TypeDefinition.DisplayName, "Content Types"]; + string localizedTypeName = D[Model.TypeDefinition.DisplayName, DataLocalizationContext.ContentType]; }

@RenderTitleSegments(T["Edit Content Type - {0}", localizedTypeName])

@@ -138,7 +139,7 @@
  • - @D[partDefinition.DisplayName(), "Content Types"] + @D[partDefinition.DisplayName(), DataLocalizationContext.ContentType] @if (partDefinition != typePart) { diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/List.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/List.cshtml index f79983732be..0795409b43d 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/List.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/List.cshtml @@ -1,4 +1,5 @@ @model ListContentTypesViewModel +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -23,7 +24,7 @@
      @foreach (var type in Model.Types) { -
    • +
    • @Html.DisplayFor(m => type)
    • } diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditPartViewModel.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditPartViewModel.cshtml index 4f235ac9479..793571f4532 100644 --- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditPartViewModel.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Shared/DisplayTemplates/EditPartViewModel.cshtml @@ -1,4 +1,5 @@ @using OrchardCore.ContentManagement.Metadata.Settings +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @model EditPartViewModel @inject IDataLocalizer D @@ -7,7 +8,7 @@ @T["Edit"] @T["Delete"]
    -
    @D[Model.PartDefinition.DisplayName(), "Content Types"]
    +
    @D[Model.PartDefinition.DisplayName(), DataLocalizationContext.ContentType]
    @if (!string.IsNullOrWhiteSpace(Model.Description)) { @Model.Description diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj b/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj index 98791f0c6d7..635a9ddf430 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj @@ -24,6 +24,7 @@ + diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentFieldLocalizationDataProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentFieldLocalizationDataProvider.cs index 347bd812c2f..9521a2a41df 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentFieldLocalizationDataProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentFieldLocalizationDataProvider.cs @@ -1,3 +1,4 @@ +using OrchardCore.ContentFields; using OrchardCore.ContentManagement.Metadata; using OrchardCore.ContentManagement.Metadata.Models; using OrchardCore.Localization.Data; @@ -23,7 +24,7 @@ public async Task> GetDescriptorsAsync() .SelectMany(t => t.Parts) .SelectMany(p => p.PartDefinition.Fields.Select(f => new DataLocalizedString( - $"Content Fields{Constants.ContextSeparator}{p.PartDefinition.Name}", + DataLocalizationContext.ContentField(p.PartDefinition.Name), f.DisplayName(), string.Empty))) .DistinctBy(d => $"{d.Context}|{d.Name}"); diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeLocalizationDataProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeLocalizationDataProvider.cs index 485bcbe91bd..78fafa15521 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeLocalizationDataProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypeLocalizationDataProvider.cs @@ -1,4 +1,5 @@ using OrchardCore.ContentManagement.Metadata; +using OrchardCore.ContentTypes; using OrchardCore.Localization.Data; namespace OrchardCore.Contents.Services; @@ -7,8 +8,6 @@ public class ContentTypeDataLocalizationProvider : ILocalizationDataProvider { private readonly IContentDefinitionManager _contentDefinitionManager; - private static readonly string _contentTypesContext = "Content Types"; - public ContentTypeDataLocalizationProvider(IContentDefinitionManager contentDefinitionManager) { _contentDefinitionManager = contentDefinitionManager; @@ -16,5 +15,5 @@ public ContentTypeDataLocalizationProvider(IContentDefinitionManager contentDefi public async Task> GetDescriptorsAsync() => (await _contentDefinitionManager.ListTypeDefinitionsAsync()) - .Select(t => new DataLocalizedString(_contentTypesContext, t.DisplayName, string.Empty)); + .Select(t => new DataLocalizedString(DataLocalizationContext.ContentType, t.DisplayName, string.Empty)); } diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypesAdminNodeDataLocalizationProvider.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypesAdminNodeDataLocalizationProvider.cs index 06cfb30436b..cc1446b462c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypesAdminNodeDataLocalizationProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Services/ContentTypesAdminNodeDataLocalizationProvider.cs @@ -1,3 +1,4 @@ +using OrchardCore.AdminMenu; using OrchardCore.AdminMenu.Services; using OrchardCore.Contents.AdminNodes; using OrchardCore.Localization.Data; @@ -14,13 +15,9 @@ public override async Task> GetDescriptorsAsync { var adminMenuList = await GetAdminMenusAsync(); - return adminMenuList.SelectMany(m => - { - var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, Constants.ContextSeparator, m.Name); - - return m.MenuItems.OfType() - .SelectMany(n => n.ContentTypes) - .Select(e => new DataLocalizedString(context, e.ContentTypeDisplayName, string.Empty)); - }); + return adminMenuList.SelectMany(m => m.MenuItems.OfType() + .SelectMany(n => n.ContentTypes) + .Select(e => new DataLocalizedString(OrchardCore.AdminMenu.DataLocalizationContext.AdminMenu(m.Name), e.ContentTypeDisplayName, string.Empty)) + ); } } diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml index 67b7a1f339d..402d2c7e6db 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml @@ -1,5 +1,6 @@ @using OrchardCore.ContentManagement @using OrchardCore.ContentManagement.Metadata +@using OrchardCore.ContentTypes @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @@ -10,7 +11,7 @@ ContentItem contentItem = Model.ContentItem; var contentTypeDefinition = await ContentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType); var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly(); - string localizedTypeDisplayName = D[typeDisplayName, "Content Types"]; + string localizedTypeDisplayName = D[typeDisplayName, DataLocalizationContext.ContentType]; }

    @RenderTitleSegments(T["New {0}", localizedTypeDisplayName])

    diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml index e14883d85a9..2a1216a82bf 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml @@ -1,5 +1,6 @@ @using OrchardCore.ContentManagement @using OrchardCore.ContentManagement.Metadata +@using OrchardCore.ContentTypes @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @@ -10,7 +11,7 @@ ContentItem contentItem = Model.ContentItem; var contentTypeDefinition = await ContentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType); var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly(); - string localizedTypeDisplayName = D[typeDisplayName, "Content Types"]; + string localizedTypeDisplayName = D[typeDisplayName, DataLocalizationContext.ContentType]; }

    @RenderTitleSegments(T["Edit {0}", localizedTypeDisplayName])

    diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml index 0ddb0dbba81..e75a83ea3e8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-BagPart.Edit.cshtml @@ -1,6 +1,7 @@ @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentManagement.Metadata.Settings @using OrchardCore.ContentManagement +@using OrchardCore.ContentTypes @using OrchardCore @using OrchardCore.Localization.Data @@ -13,7 +14,7 @@
    - @D[typePartDefinition.DisplayName(), "Content Types"] + @D[typePartDefinition.DisplayName(), DataLocalizationContext.ContentType] @if (!string.IsNullOrEmpty(description)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml index 0ddb0dbba81..e75a83ea3e8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-FlowPart.Edit.cshtml @@ -1,6 +1,7 @@ @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentManagement.Metadata.Settings @using OrchardCore.ContentManagement +@using OrchardCore.ContentTypes @using OrchardCore @using OrchardCore.Localization.Data @@ -13,7 +14,7 @@
    - @D[typePartDefinition.DisplayName(), "Content Types"] + @D[typePartDefinition.DisplayName(), DataLocalizationContext.ContentType] @if (!string.IsNullOrEmpty(description)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml index 0ddb0dbba81..e75a83ea3e8 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart-WidgetsListPart.Edit.cshtml @@ -1,6 +1,7 @@ @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentManagement.Metadata.Settings @using OrchardCore.ContentManagement +@using OrchardCore.ContentTypes @using OrchardCore @using OrchardCore.Localization.Data @@ -13,7 +14,7 @@
    - @D[typePartDefinition.DisplayName(), "Content Types"] + @D[typePartDefinition.DisplayName(), DataLocalizationContext.ContentType] @if (!string.IsNullOrEmpty(description)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml index d662f3c0670..d8dcca34742 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentPart.Edit.cshtml @@ -1,6 +1,7 @@ @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.ContentManagement.Metadata.Settings @using OrchardCore.ContentManagement +@using OrchardCore.ContentTypes @using OrchardCore @using OrchardCore.Localization.Data @@ -17,7 +18,7 @@ @if (typePartDefinition.IsNamedPart()) {
    - @D[typePartDefinition.DisplayName(), "Content Types"] + @D[typePartDefinition.DisplayName(), DataLocalizationContext.ContentType] @if (!string.IsNullOrEmpty(description)) { diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Edit.cshtml index 09c565b7229..f86c2b7bac5 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Edit.cshtml @@ -1,4 +1,5 @@ @model ContentDeploymentStepViewModel +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @inject OrchardCore.ContentManagement.Metadata.IContentDefinitionManager ContentDefinitionManager @inject IDataLocalizer D @@ -29,7 +30,7 @@
  • - +
  • } diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Summary.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Summary.cshtml index 8d3c2333dd7..8ccdd27d4de 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Summary.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentDeploymentStep.Fields.Summary.cshtml @@ -1,4 +1,5 @@ @model ShapeViewModel +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @inject OrchardCore.ContentManagement.Metadata.IContentDefinitionManager ContentDefinitionManager @inject IDataLocalizer D @@ -14,7 +15,7 @@ { if (contentTypes.Contains(contentTypeDefinition.Name)) { - @D[contentTypeDefinition.DisplayName, "Content Types"] + @D[contentTypeDefinition.DisplayName, DataLocalizationContext.ContentType] } } } diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeEdit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeEdit.cshtml index 2df774a987d..414ac5d9178 100644 --- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeEdit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeEdit.cshtml @@ -1,3 +1,4 @@ +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @model ContentTypesAdminNodeViewModel @inject IDataLocalizer D @@ -76,7 +77,7 @@
    - +
    diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml index bb2c065594d..47105ed920b 100644 --- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml @@ -1,3 +1,4 @@ +@using OrchardCore.ContentTypes @using OrchardCore.ContentTypes.Shapes @using OrchardCore.Flows.Models @using OrchardCore.Flows.ViewModels @@ -71,7 +72,7 @@ data-flowmetadata="false" data-parent-content-type="@parentContentType" data-part-name="@partName" - href="javascript:;">@T["Add {0}", D[type.DisplayName, "Content Types"]] + href="javascript:;">@T["Add {0}", D[type.DisplayName, DataLocalizationContext.ContentType]] } else if (totalItems > 1) { @@ -92,7 +93,7 @@ data-flowmetadata="false" data-parent-content-type="@parentContentType" data-part-name="@partName" - href="javascript:;">@D[type.DisplayName, "Content Types"] + href="javascript:;">@D[type.DisplayName, DataLocalizationContext.ContentType] }
    diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml index 381da430460..c6d452c9187 100644 --- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/ContentCard-FlowPart.Edit.cshtml @@ -1,4 +1,5 @@ @using OrchardCore.ContentManagement.Metadata.Models +@using OrchardCore.ContentTypes @using OrchardCore.Localization @using OrchardCore.Flows.Models @using OrchardCore.Localization.Data @@ -9,7 +10,7 @@ @{ ContentItem contentItem = Model.ContentItem; var contentTypeDefinition = await ContentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType); - var contentTypeDisplayText = D[contentTypeDefinition.DisplayName, "Content Types"]; + var contentTypeDisplayText = D[contentTypeDefinition.DisplayName, DataLocalizationContext.ContentType]; var contentItemDisplayText = contentItem.ContentItem.DisplayText; var widgetContentTypes = (IEnumerable)Model.ContainedContentTypes; @@ -64,7 +65,7 @@ data-contenttypes-name="@Model.ContentTypesName" data-contentitems-name="@Model.ContentItemsName" data-widget-type="@type.Name" - href="javascript:;">@D[type.DisplayName, "Content Types"] + href="javascript:;">@D[type.DisplayName, DataLocalizationContext.ContentType] } diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs index eec2d373665..62dcb83b289 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lists/AdminNodes/ListsAdminNodeDriver.cs @@ -1,6 +1,8 @@ +using System.Net.NetworkInformation; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Extensions.Localization; using OrchardCore.ContentManagement.Metadata; +using OrchardCore.ContentTypes; using OrchardCore.DisplayManagement.Handlers; using OrchardCore.DisplayManagement.Views; using OrchardCore.Lists.Models; @@ -82,7 +84,7 @@ private async Task> GetContentTypesSelectListAsync() return contentTypeDefinitions .Where(ctd => ctd.Parts.Any(p => p.PartDefinition.Name.Equals(nameof(ListPart), StringComparison.OrdinalIgnoreCase))) .OrderBy(ctd => ctd.DisplayName) - .Select(ctd => new SelectListItem(D[ctd.DisplayName, "Content Types"], ctd.Name)) + .Select(ctd => new SelectListItem(D[ctd.DisplayName, DataLocalizationContext.ContentType], ctd.Name)) .ToList(); } diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListsAdminNodeDataLocalizationProvider.cs b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListsAdminNodeDataLocalizationProvider.cs index 41b04afcf21..18d6996472a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListsAdminNodeDataLocalizationProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.Lists/Services/ListsAdminNodeDataLocalizationProvider.cs @@ -1,3 +1,4 @@ +using OrchardCore.AdminMenu; using OrchardCore.AdminMenu.Services; using OrchardCore.Lists.AdminNodes; using OrchardCore.Localization.Data; @@ -16,7 +17,7 @@ public override async Task> 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() .Select(n => new DataLocalizedString(context, n.ContentType, string.Empty)); diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/Items/ListsAdminNode.Fields.TreeSummary.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/Items/ListsAdminNode.Fields.TreeSummary.cshtml index 3a71e97a544..cba2b3794af 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/Items/ListsAdminNode.Fields.TreeSummary.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/Items/ListsAdminNode.Fields.TreeSummary.cshtml @@ -1,5 +1,6 @@ @model ShapeViewModel @using OrchardCore.Localization.Data +@using OrchardCore.ContentTypes @inject OrchardCore.ContentManagement.Metadata.IContentDefinitionManager ContentDefinitionManager @inject IDataLocalizer D @@ -12,7 +13,7 @@ if (definition != null) { - displayName = D[definition.DisplayName, "Content Types"]; + displayName = D[definition.DisplayName, DataLocalizationContext.ContentType]; } } } diff --git a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml index 54ac1e8c28b..ff964fe4c97 100644 --- a/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml @@ -1,6 +1,7 @@ @using Microsoft.AspNetCore.Authorization @using OrchardCore.ContentManagement @using OrchardCore.Contents +@using OrchardCore.ContentTypes @using OrchardCore.Localization.Data @using System.Security.Claims @model OrchardCore.Lists.ViewModels.ListPartNavigationAdminViewModel @@ -31,7 +32,7 @@ @if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, Model.Container)) { - @T["Edit {0}", D[Model.ContainerContentTypeDefinition?.DisplayName, "Content Types"]] + @T["Edit {0}", D[Model.ContainerContentTypeDefinition?.DisplayName, DataLocalizationContext.ContentType]] } @@ -40,7 +41,7 @@ var contentTypeDefinition = authorizedContentTypeDefinitions.FirstOrDefault(); - @T["Create {0}", D[contentTypeDefinition.DisplayName, "Content Types"]] + @T["Create {0}", D[contentTypeDefinition.DisplayName, DataLocalizationContext.ContentType]] } else if (authorizedContentTypeDefinitions.Count > 1) diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/OrchardCore.Markdown.csproj b/src/OrchardCore.Modules/OrchardCore.Markdown/OrchardCore.Markdown.csproj index c2545ef75af..906014ecb95 100644 --- a/src/OrchardCore.Modules/OrchardCore.Markdown/OrchardCore.Markdown.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Markdown/OrchardCore.Markdown.csproj @@ -17,6 +17,7 @@ + diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml index a45b996f5c0..7c525d20952 100644 --- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField-Wysiwyg.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.Markdown.ViewModels.EditMarkdownFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.ContentLocalization @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Markdown.Settings @@ -10,7 +11,7 @@ var settings = Model.PartFieldDefinition.GetSettings(); var wysiwygSettings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml index 6f0579b17e2..dde49ee9883 100644 --- a/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Markdown/Views/MarkdownField.Edit.cshtml @@ -1,4 +1,5 @@ @model OrchardCore.Markdown.ViewModels.EditMarkdownFieldViewModel +@using OrchardCore.ContentFields @using OrchardCore.ContentLocalization @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Markdown.Settings @@ -9,7 +10,7 @@ @{ var settings = Model.PartFieldDefinition.GetSettings(); var culture = await Orchard.GetContentCultureAsync(Model.Field.ContentItem); - 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)]; }
    diff --git a/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj b/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj index 112da009d60..a06d986a8ed 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj @@ -19,6 +19,7 @@ + diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml index aea521f5162..bdfff0205a6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Attached.Edit.cshtml @@ -1,6 +1,7 @@ @model OrchardCore.Media.ViewModels.EditMediaFieldViewModel @using Microsoft.Extensions.Options @using OrchardCore +@using OrchardCore.ContentFields @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Media @using OrchardCore.Media.Settings @@ -13,7 +14,7 @@ @{ var settings = Model.PartFieldDefinition.GetSettings(); var mediaFieldId = Html.IdFor(m => m); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Gallery.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Gallery.Edit.cshtml index c56444342d5..c492bd08de7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Gallery.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField-Gallery.Edit.cshtml @@ -1,5 +1,6 @@ @model OrchardCore.Media.ViewModels.EditMediaFieldViewModel @using System.Globalization +@using OrchardCore.ContentFields @using OrchardCore.Media.Settings @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Mvc.Utilities @@ -9,7 +10,7 @@ @{ var settings = Model.PartFieldDefinition.GetSettings(); var modalMediaId = "Modal" + Html.IdFor(m => m); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml index b9af0c73c36..2740562cedb 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Media/Views/MediaField.Edit.cshtml @@ -1,6 +1,7 @@ @model OrchardCore.Media.ViewModels.EditMediaFieldViewModel @using System.Globalization @using OrchardCore.Media.Settings +@using OrchardCore.ContentFields @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Mvc.Utilities @using OrchardCore @@ -9,7 +10,7 @@ @{ var settings = Model.PartFieldDefinition.GetSettings(); var modalMediaId = "Modal" + Html.IdFor(m => m); - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/Admin/Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/Admin/Create.cshtml index 5cf124ac61c..9c665bee43d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Menu/Views/Admin/Create.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Menu/Views/Admin/Create.cshtml @@ -1,5 +1,6 @@ @using OrchardCore.ContentManagement @using OrchardCore.ContentManagement.Metadata +@using OrchardCore.ContentTypes @using OrchardCore.Mvc.Utilities @using OrchardCore.Localization.Data @@ -10,7 +11,7 @@ ContentItem contentItem = Model.ContentItem; var contentTypeDefinition = await ContentDefinitionManager.GetTypeDefinitionAsync(contentItem.ContentType); var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly(); - string localizedTypeDisplayName = D[typeDisplayName, "Content Types"]; + string localizedTypeDisplayName = D[typeDisplayName, DataLocalizationContext.ContentType]; }

    @RenderTitleSegments(T["New {0}", localizedTypeDisplayName])

    diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/DataLocalizationContext.cs b/src/OrchardCore.Modules/OrchardCore.Roles/DataLocalizationContext.cs new file mode 100644 index 00000000000..7e6bf0cb4ed --- /dev/null +++ b/src/OrchardCore.Modules/OrchardCore.Roles/DataLocalizationContext.cs @@ -0,0 +1,8 @@ +namespace OrchardCore.Roles; + +public static class DataLocalizationContext +{ + public static string Permission(string groupName = null) => groupName is null + ? "Permissions" + : $"Permissions{OrchardCoreConstants.DataLocalizationSeparator}{groupName}"; +} diff --git a/src/OrchardCore.Modules/OrchardCore.Roles/Services/PermissionsLocalizationDataProvider.cs b/src/OrchardCore.Modules/OrchardCore.Roles/Services/PermissionsLocalizationDataProvider.cs index a9d5dccd4a4..b2f30ea18d6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Roles/Services/PermissionsLocalizationDataProvider.cs +++ b/src/OrchardCore.Modules/OrchardCore.Roles/Services/PermissionsLocalizationDataProvider.cs @@ -15,8 +15,6 @@ public class PermissionsLocalizationDataProvider : ILocalizationDataProvider private readonly ITypeFeatureProvider _typeFeatureProvider; private readonly IShellFeaturesManager _shellFeaturesManager; - private const string PermissionsContext = "Permissions"; - public PermissionsLocalizationDataProvider( IEnumerable permissionProviders, ITypeFeatureProvider typeFeatureProvider, @@ -64,8 +62,8 @@ public async Task> GetDescriptorsAsync() } var context = string.IsNullOrWhiteSpace(groupName) - ? PermissionsContext - : PermissionsContext + Constants.ContextSeparator + groupName; + ? DataLocalizationContext.Permission() + : DataLocalizationContext.Permission(groupName); descriptors.Add(new DataLocalizedString(context, permission.Description, string.Empty)); diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/OrchardCore.Taxonomies.csproj b/src/OrchardCore.Modules/OrchardCore.Taxonomies/OrchardCore.Taxonomies.csproj index aeb5941ded1..95074e1363e 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/OrchardCore.Taxonomies.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/OrchardCore.Taxonomies.csproj @@ -17,6 +17,7 @@ + diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml index 1d1f437ad02..2a4fc4047a4 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml @@ -1,6 +1,7 @@ @model OrchardCore.Taxonomies.ViewModels.EditTagTaxonomyFieldViewModel @using OrchardCore.Taxonomies.Settings @using OrchardCore.ContentManagement.Metadata.Models +@using OrchardCore.ContentFields @using Microsoft.AspNetCore.Authorization @using OrchardCore.Mvc.Utilities @using OrchardCore @@ -24,7 +25,7 @@ } var vueElementId = $"TaxonomyField-Tags_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}"; - 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)]; } diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml index bec6ded2a24..50b74b56ab7 100644 --- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField.Edit.cshtml @@ -1,5 +1,6 @@ @model OrchardCore.Taxonomies.ViewModels.EditTaxonomyFieldViewModel @using OrchardCore.Taxonomies.Settings +@using OrchardCore.ContentFields @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Mvc.Utilities @using OrchardCore @@ -9,7 +10,7 @@ var settings = Model.PartFieldDefinition.GetSettings(); int previousLevel = 0; int closingDivs = 0; - 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)]; }
    diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml index 45ecd97a2b3..8e16634d41a 100644 --- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml +++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard-WidgetsListPart.Edit.cshtml @@ -1,4 +1,5 @@ @using OrchardCore.ContentManagement.Metadata.Settings +@using OrchardCore.ContentTypes @using OrchardCore.Localization @using OrchardCore.ContentManagement.Metadata.Models @using OrchardCore.Localization.Data @@ -7,7 +8,7 @@ @{ var contentTypeDefinition = await ContentDefinitionManager.GetTypeDefinitionAsync((string)Model.ContentItem.ContentType); - var contentType = D[contentTypeDefinition?.DisplayName, "Content Types"]; + var contentType = D[contentTypeDefinition?.DisplayName, DataLocalizationContext.ContentType]; var widgetContentTypes = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.GetStereotype() == "Widget"); } @@ -42,7 +43,7 @@ data-parent-content-type="@Model.ParentContentType" data-part-name="@Model.CollectionPartName" data-zone="@Model.ZoneValue" - href="javascript:;">@D[type.DisplayName, "Content Types"] + href="javascript:;">@D[type.DisplayName, DataLocalizationContext.ContentType] } diff --git a/src/OrchardCore.Themes/TheAdmin/Views/NavigationItemText.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/NavigationItemText.cshtml index 257790509d6..89ee3ab77d5 100644 --- a/src/OrchardCore.Themes/TheAdmin/Views/NavigationItemText.cshtml +++ b/src/OrchardCore.Themes/TheAdmin/Views/NavigationItemText.cshtml @@ -1,5 +1,6 @@ @using System.Linq @using OrchardCore +@using OrchardCore.AdminMenu @using OrchardCore.Localization.Data @inject IDataLocalizer D @@ -13,9 +14,7 @@ .Where(c => c.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) .Select(c => c.Substring(prefix.Length)); - var context = string.Concat(OrchardCoreConstants.DataLocalizationContext.AdminMenu, - OrchardCore.Localization.Data.Constants.ContextSeparator, - Model.Item.MenuName); + var context = OrchardCore.AdminMenu.DataLocalizationContext.AdminMenu(Model.Item.MenuName); } @if (iconClasses.Any()) diff --git a/src/OrchardCore/OrchardCore.Abstractions/OrchardCoreConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/OrchardCoreConstants.cs index afb89aa907f..39ce75ef844 100644 --- a/src/OrchardCore/OrchardCore.Abstractions/OrchardCoreConstants.cs +++ b/src/OrchardCore/OrchardCore.Abstractions/OrchardCoreConstants.cs @@ -2,6 +2,8 @@ namespace OrchardCore; public static class OrchardCoreConstants { + public const char DataLocalizationSeparator = ':'; + public static class Shell { public const string TenantsFileName = "tenants.json"; diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/DataLocalizationContext.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/DataLocalizationContext.cs new file mode 100644 index 00000000000..26b8b928c9a --- /dev/null +++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/DataLocalizationContext.cs @@ -0,0 +1,8 @@ +namespace OrchardCore.AdminMenu; + +public static class DataLocalizationContext +{ + public static string AdminMenu(string menuName = null) => menuName is null + ? "Admin Menus" + : $"Admin Menus{OrchardCoreConstants.DataLocalizationSeparator}{menuName}"; +} diff --git a/src/OrchardCore/OrchardCore.ContentFields.Core/DataLocalizationContext.cs b/src/OrchardCore/OrchardCore.ContentFields.Core/DataLocalizationContext.cs new file mode 100644 index 00000000000..53e3ab1cbcb --- /dev/null +++ b/src/OrchardCore/OrchardCore.ContentFields.Core/DataLocalizationContext.cs @@ -0,0 +1,9 @@ +namespace OrchardCore.ContentFields; + +public static class DataLocalizationContext +{ + public const char Separator = ':'; + + public static string ContentField(string fieldName) + => $"Content Fields{Separator}{fieldName}"; +} diff --git a/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/DataLocalizationContext.cs b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/DataLocalizationContext.cs new file mode 100644 index 00000000000..69d46797c5d --- /dev/null +++ b/src/OrchardCore/OrchardCore.ContentTypes.Abstractions/DataLocalizationContext.cs @@ -0,0 +1,6 @@ +namespace OrchardCore.ContentTypes; + +public static class DataLocalizationContext +{ + public const string ContentType = "Content Types"; +}