diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs index 367a870896..b41e7739ba 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs +++ b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs @@ -12,10 +12,10 @@ namespace Umbraco.Core.Services /// public static class LocalizedTextServiceExtensions { - public static string Localize(this ILocalizedTextService manager, params string[] keyParts) + public static string Localize(this ILocalizedTextService manager, string area, string key) { - var key = string.Join("/", keyParts); - return manager.Localize(key, Thread.CurrentThread.CurrentUICulture); + var fullKey = string.Join("/", area, key); + return manager.Localize(fullKey, Thread.CurrentThread.CurrentUICulture); } /// diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestPublishedContent.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestPublishedContent.cs index 053705ca4d..0faf1537b3 100644 --- a/src/Umbraco.Tests/TestHelpers/Stubs/TestPublishedContent.cs +++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestPublishedContent.cs @@ -23,7 +23,7 @@ namespace Umbraco.Tests.TestHelpers.Stubs { // handle context culture if (culture == null) - culture = VariationContextAccessor?.VariationContext.Culture; + culture = VariationContextAccessor?.VariationContext?.Culture; // no invariant culture infos if (culture == "" || Cultures == null) return null; diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs index f8e8cdb974..a4610e82db 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs @@ -181,7 +181,7 @@ namespace Umbraco.Web.PublishedCache.NuCache if (!ContentType.VariesByCulture()) return _contentData.Name; - var culture = VariationContextAccessor.VariationContext.Culture; + var culture = VariationContextAccessor?.VariationContext?.Culture ?? ""; if (culture == "") return _contentData.Name; @@ -197,7 +197,7 @@ namespace Umbraco.Web.PublishedCache.NuCache if (!ContentType.VariesByCulture()) return _urlSegment; - var culture = VariationContextAccessor.VariationContext.Culture; + var culture = VariationContextAccessor?.VariationContext?.Culture ?? ""; if (culture == "") return _urlSegment; @@ -244,7 +244,7 @@ namespace Umbraco.Web.PublishedCache.NuCache { // handle context culture if (culture == null) - culture = VariationContextAccessor.VariationContext.Culture; + culture = VariationContextAccessor?.VariationContext?.Culture ?? ""; // no invariant culture infos if (culture == "") return null; diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs index 797c943452..9f1d42d6b1 100644 --- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs @@ -164,7 +164,7 @@ namespace Umbraco.Web.Routing l.Reverse(); var s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent.Id + ")"; - urls.Add(UrlInfo.Message(textService.Localize("content/routeError", s), culture)); + urls.Add(UrlInfo.Message(textService.Localize("content/routeError", new[] { s }), culture)); return true; }