yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure culture is always set in LocalizeText

Browse Source
This commit is contained in:
Lars-Erik Aabech
2022-10-10 12:40:02 +02:00
committed by Sebastiaan Janssen
parent 1009238f32
commit 4d23e8a6bd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
View File

@@ -255,7 +255,7 @@ public class BackOfficeController : UmbracoController
[AllowAnonymous]
public async Task<Dictionary<string, Dictionary<string, string>>> LocalizedText(string? culture = null)
{
CultureInfo? cultureInfo;
CultureInfo? cultureInfo = null;
if (string.IsNullOrWhiteSpace(culture))
{
// Force authentication to occur since this is not an authorized endpoint, we need this to get a user.
@@ -264,9 +264,12 @@ public class BackOfficeController : UmbracoController
// It's entirely likely for a user to have a different culture in the backoffice, than their system.
IIdentity? user = authenticationResult.Principal?.Identity;
cultureInfo = authenticationResult.Succeeded && user is not null
? user.GetCulture()
: CultureInfo.GetCultureInfo(_globalSettings.DefaultUILanguage);
if (authenticationResult.Succeeded && user is not null)
{
cultureInfo = user.GetCulture();
}
cultureInfo ??= CultureInfo.GetCultureInfo(_globalSettings.DefaultUILanguage);
}
else
{