User Localization settings

src/OrchardCore.Modules/OrchardCore.Users/Localization/Constants.cs

@@ -0,0 +1,7 @@
+namespace OrchardCore.Users.Localization
+{
+    public static class Constants
+    {
+        public const string Invariant = "invariant";
+    }
+}

src/OrchardCore.Modules/OrchardCore.Users/Localization/Drivers/UserLocalizationDisplayDriver.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.Localization;
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.ModelBinding;
@@ -16,10 +17,14 @@ namespace OrchardCore.Users.Localization.Drivers;
 public class UserLocalizationDisplayDriver : SectionDisplayDriver<User, UserLocalizationSettings>
 {
     private readonly ILocalizationService _localizationService;
+    protected readonly IStringLocalizer S;
 
-    public UserLocalizationDisplayDriver(ILocalizationService localizationService)
+    public UserLocalizationDisplayDriver(
+        ILocalizationService localizationService,
+        IStringLocalizer<UserLocalizationDisplayDriver> localizer)
     {
         _localizationService = localizationService;
+        S = localizer;
     }
 
     public override Task<IDisplayResult> EditAsync(UserLocalizationSettings section, BuildEditorContext context)
@@ -28,13 +33,23 @@ public override Task<IDisplayResult> EditAsync(UserLocalizationSettings section,
         {
             var supportedCultures = await _localizationService.GetSupportedCulturesAsync();
 
-            model.Culture = section.Culture;
-            model.SupportedCultures = supportedCultures.Select(culture =>
+            var cultureList = supportedCultures.Select(culture =>
                 new SelectListItem
                 {
                     Text = CultureInfo.GetCultureInfo(culture).DisplayName + " (" + culture + ")",
                     Value = culture
-                });
+                }).ToList();
+
+            cultureList.Insert(0, new SelectListItem() { Text = S["Use site's culture"], Value = "none" });
+
+            // If Invariant Culture is installed as a supported culture we bind it to a different culture code than String.Empty.
+            if (cultureList.Where(c => c.Value == "").Any())
+            {
+                cultureList.Where(c => c.Value == "").FirstOrDefault().Value = Constants.Invariant;
+            }
+
+            model.SelectedCulture = section.Culture;
+            model.CultureList = cultureList;
         }).Location("Content:2"));
     }
 
@@ -44,7 +59,7 @@ public override async Task<IDisplayResult> UpdateAsync(User model, UserLocalizat
 
         if (await context.Updater.TryUpdateModelAsync(viewModel, Prefix))
         {
-            section.Culture = viewModel.Culture;
+            section.Culture = viewModel.SelectedCulture;
         }
 
         return await EditAsync(section, context);

src/OrchardCore.Modules/OrchardCore.Users/Localization/Providers/UserLocalizationClaimsProvider.cs

@@ -26,9 +26,9 @@ public Task GenerateAsync(IUser user, ClaimsIdentity claims)
         {
             var localizationSetting = currentUser.As<UserLocalizationSettings>();
 
-            if (!string.IsNullOrEmpty(localizationSetting.Culture))
+            if (localizationSetting.Culture != "none")
             {
-                claims.AddClaim(new Claim(CultureClaimType, localizationSetting.Culture));
+                claims.AddClaim(new Claim(CultureClaimType, localizationSetting.Culture == Constants.Invariant ? "" : localizationSetting.Culture));
             }
         }
 

src/OrchardCore.Modules/OrchardCore.Users/Localization/Providers/UserLocalizationRequestCultureProvider.cs

@@ -17,13 +17,13 @@ public override Task<ProviderCultureResult> DetermineProviderCultureResult(HttpC
             return NullProviderCultureResult;
         }
 
-        var userCulture = httpContext.User.GetCulture();
+        var userCulture = httpContext.User.GetCulture(); // String.Empty here means that it did not find the Culture Claim.
 
-        if (string.IsNullOrWhiteSpace(userCulture))
+        if (String.IsNullOrWhiteSpace(userCulture))
         {
             return NullProviderCultureResult;
         }
 
-        return Task.FromResult(new ProviderCultureResult(userCulture));
+        return Task.FromResult(new ProviderCultureResult(userCulture == Constants.Invariant ? "" : userCulture));
     }
 }

src/OrchardCore.Modules/OrchardCore.Users/Localization/ViewModel/UserLocalizationViewModel.cs

@@ -6,8 +6,8 @@ namespace OrchardCore.Users.Localization.ViewModels;
 
 public class UserLocalizationViewModel
 {
-    public string Culture { get; set; }
+    public string SelectedCulture { get; set; }
 
     [BindNever]
-    public IEnumerable<SelectListItem> SupportedCultures { get; set; } = new List<SelectListItem>();
+    public IEnumerable<SelectListItem> CultureList { get; set; } = new List<SelectListItem>();
 }

src/OrchardCore.Modules/OrchardCore.Users/Manifest.cs

@@ -62,7 +62,7 @@
     Description = "Provides a way to set the culture per user.",
     Dependencies = new[] { "OrchardCore.Users", "OrchardCore.Localization" },
     Category = "Settings",
-    Priority = "-1"
+    Priority = "-1" // Added to avoid changing the order in the localization module.
 )]
 
 [assembly: Feature(

src/OrchardCore.Modules/OrchardCore.Users/Views/UserCulture.Edit.cshtml

@@ -1,11 +1,10 @@
 @using OrchardCore.Users.Localization.ViewModels
 @model UserLocalizationViewModel
 
-<div class="mb-3" asp-validation-class-for="Culture">
-    <label asp-for="Culture">@T["Default User Culture"]</label>
-    <select asp-for="Culture" asp-items="Model.SupportedCultures" class="form-select">
-        <option value="">@T["Use site's culture"]</option>
+<div class="mb-3" asp-validation-class-for="SelectedCulture">
+    <label asp-for="SelectedCulture">@T["Default User Culture"]</label>
+    <select asp-for="SelectedCulture" asp-items="Model.CultureList" class="form-select">
     </select>
-    <span asp-validation-for="Culture"></span>
+    <span asp-validation-for="SelectedCulture"></span>
     <span class="hint">@T["Determines the default culture used by this user."]</span>
 </div>

src/docs/releases/1.9.0.md

@@ -32,6 +32,63 @@ Added new extensions to make registering custom deployment step easier
 - services.AddDeployment<TSource, TStep, TDisplayDriver>();
 - services.AddDeploymentWithoutSource<TStep, TDisplayDriver>();
 
+### GraphQL Module
+
+When identifying content types for GraphQL exposure, we identify those without a stereotype to provide you with control over the behavior of stereotyped content types. A new option, `DiscoverableSterotypes`, has been introduced in `GraphQLContentOptions`. This allows you to specify stereotypes that should be discoverable by default.
+
+For instance, if you have several content types stereotyped as `ExampleStereotype`, you can make them discoverable by incorporating the following code into the startup class:
+
+```csharp
+services.Configure<GraphQLContentOptions>(options =>
+{
+    options.DiscoverableSterotypes.Add("ExampleStereotype");
+});
+```
+
+### Admin
+
+The admin menu has undergone performance enhancements, and new helpers have been added. When incorporating `INavigationProvider` in your project, you can now utilize `NavigationHelper.IsAdminMenu(name)` instead of the previous approach using `string.Equals(name, "admin", StringComparison.OrdinalIgnoreCase)`. Moreover, when passing route values to an action, it is advised to store them in a constant variable. An illustrative example is provided below.
+```
+public class AdminMenu : INavigationProvider
+{
+    private static readonly RouteValueDictionary _routeValues = new()
+    {
+        { "area", "OrchardCore.Settings" },
+        { "groupId", AdminSiteSettingsDisplayDriver.GroupId },
+    };
+
+    protected readonly IStringLocalizer S;
+
+    public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
+    {
+        S = stringLocalizer;
+    }
+
+    public Task BuildNavigationAsync(string name, NavigationBuilder builder)
+    {
+        if (!NavigationHelper.IsAdminMenu(name))
+        {
+            return Task.CompletedTask;
+        }
+
+        builder
+            .Add(S["Configuration"], configuration => configuration
+                .Add(S["Settings"], settings => settings
+                    .Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
+                        .AddClass("admin")
+                        .Id("admin")
+                        .Action("Index", "Admin", _routeValues)
+                        .Permission(PermissionsAdminSettings.ManageAdminSettings)
+                        .LocalNav()
+                    )
+                )
+            );
+
+        return Task.CompletedTask;
+    }
+}
+```
+
 ## Users Module
 
 Added new user localization feature that allows to set default culture per user in the admin UI.