Refactor IPublishedContent.UrlSegment()

This commit is contained in:
Stephan
2019-04-16 18:32:33 +02:00
parent 99319e0b49
commit 2b54cc50ab
20 changed files with 47 additions and 73 deletions

View File

@@ -200,19 +200,18 @@ namespace Umbraco.Web.PublishedCache.NuCache
}
/// <inheritdoc />
public override string UrlSegment
public override string UrlSegment(string culture = null)
{
get
{
if (!ContentType.VariesByCulture())
return _urlSegment;
// handle context culture
if (culture == null)
culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
var culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
if (culture == "")
return _urlSegment;
// invariant culture
if (culture == "")
return ContentType.VariesByCulture() ? null : _urlSegment;
return Cultures.TryGetValue(culture, out var cultureInfos) ? cultureInfos.UrlSegment : null;
}
// explicit culture
return Cultures.TryGetValue(culture, out var cultureInfos) ? cultureInfos.UrlSegment : null;
}
/// <inheritdoc />