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

Merge branch 'v8/8.15' into v8/dev

Browse Source
This commit is contained in:
Sebastiaan Janssen
2021-07-29 14:10:09 +02:00
parent 52e8237a0e 7c336554db
commit 05973ecae8
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
View File

@@ -71,30 +71,6 @@ namespace Umbraco.Core.Services
#pragma warning restore CS0618 // Type or member is obsolete
}
/// <summary>
/// Localize using the current thread culture
/// </summary>
/// <param name="manager"></param>
/// <param name="area"></param>
/// <param name="alias"></param>
/// <param name="tokens"></param>
/// <returns></returns>
public static string Localize(this ILocalizedTextService manager, string area, string alias, IDictionary<string, string> tokens = null)
{
if (manager is ILocalizedTextService2 manager2)
{
return manager2.Localize(area, alias, Thread.CurrentThread.CurrentUICulture, tokens);
}
var fullKey = alias;
if (area != null)
{
fullKey = string.Concat(area, "/", alias);
}
#pragma warning disable CS0618 // Type or member is obsolete
return manager.Localize(fullKey, Thread.CurrentThread.CurrentUICulture, tokens);
#pragma warning restore CS0618 // Type or member is obsolete
}
/// <summary>
/// Localize a key without any variables
/// </summary>
@@ -108,7 +84,7 @@ namespace Umbraco.Core.Services
{
if (manager is ILocalizedTextService2 manager2)
{
return manager2.Localize(area, alias, Thread.CurrentThread.CurrentUICulture, tokens);
return manager2.Localize(area, alias, culture, ConvertToDictionaryVars(tokens));
}
var fullKey = alias;
if (area != null)