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

Merge branch 'netcore/task/adding-tests-for-routing' into netcore/task/models-builder-9789

Browse Source
This commit is contained in:
Shannon
2021-01-13 14:49:43 +11:00
parent f59c69b355 62f3a80dc6
commit 6fbe515adb
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.Common/Localization/UmbracoBackOfficeIdentityCultureProvider.cs
View File

@@ -15,6 +15,7 @@ namespace Umbraco.Web.Common.Localization
public class UmbracoBackOfficeIdentityCultureProvider : RequestCultureProvider
{
private readonly RequestLocalizationOptions _localizationOptions;
private readonly object _locker = new object();
/// <summary>
/// Initializes a new instance of the <see cref="UmbracoBackOfficeIdentityCultureProvider"/> class.
@@ -31,18 +32,21 @@ namespace Umbraco.Web.Common.Localization
return NullProviderCultureResult;
}
// We need to dynamically change the supported cultures since we won't ever know what languages are used since
// they are dynamic within Umbraco.
var cultureExists = _localizationOptions.SupportedCultures.Contains(culture);
if (!cultureExists)
lock(_locker)
{
// add this as a supporting culture
_localizationOptions.SupportedCultures.Add(culture);
_localizationOptions.SupportedUICultures.Add(culture);
}
// We need to dynamically change the supported cultures since we won't ever know what languages are used since
// they are dynamic within Umbraco.
var cultureExists = _localizationOptions.SupportedCultures.Contains(culture);
return Task.FromResult(new ProviderCultureResult(culture.Name));
if (!cultureExists)
{
// add this as a supporting culture
_localizationOptions.SupportedCultures.Add(culture);
_localizationOptions.SupportedUICultures.Add(culture);
}
return Task.FromResult(new ProviderCultureResult(culture.Name));
}
}
}
}

28
src/Umbraco.Web.Common/Localization/UmbracoPublishedContentCultureProvider.cs
View File

@@ -19,6 +19,7 @@ namespace Umbraco.Web.Common.Localization
public class UmbracoPublishedContentCultureProvider : RequestCultureProvider
{
private readonly RequestLocalizationOptions _localizationOptions;
private readonly object _locker = new object();
/// <summary>
/// Initializes a new instance of the <see cref="UmbracoPublishedContentCultureProvider"/> class.
@@ -33,19 +34,22 @@ namespace Umbraco.Web.Common.Localization
string culture = routeValues.PublishedRequest?.Culture;
if (culture != null)
{
// We need to dynamically change the supported cultures since we won't ever know what languages are used since
// they are dynamic within Umbraco.
// This code to check existence is borrowed from aspnetcore to avoid creating a CultureInfo
// https://github.com/dotnet/aspnetcore/blob/b795ac3546eb3e2f47a01a64feb3020794ca33bb/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs#L165
CultureInfo existingCulture = _localizationOptions.SupportedCultures.FirstOrDefault(supportedCulture =>
StringSegment.Equals(supportedCulture.Name, culture, StringComparison.OrdinalIgnoreCase));
if (existingCulture == null)
lock (_locker)
{
// add this as a supporting culture
var ci = CultureInfo.GetCultureInfo(culture);
_localizationOptions.SupportedCultures.Add(ci);
_localizationOptions.SupportedUICultures.Add(ci);
// We need to dynamically change the supported cultures since we won't ever know what languages are used since
// they are dynamic within Umbraco.
// This code to check existence is borrowed from aspnetcore to avoid creating a CultureInfo
// https://github.com/dotnet/aspnetcore/blob/b795ac3546eb3e2f47a01a64feb3020794ca33bb/src/Middleware/Localization/src/RequestLocalizationMiddleware.cs#L165
CultureInfo existingCulture = _localizationOptions.SupportedCultures.FirstOrDefault(supportedCulture =>
StringSegment.Equals(supportedCulture.Name, culture, StringComparison.OrdinalIgnoreCase));
if (existingCulture == null)
{
// add this as a supporting culture
var ci = CultureInfo.GetCultureInfo(culture);
_localizationOptions.SupportedCultures.Add(ci);
_localizationOptions.SupportedUICultures.Add(ci);
}
}
return Task.FromResult(new ProviderCultureResult(culture));