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

Merge branch 'TimGeyssens-dev-v7' into dev-v7

Browse Source
This commit is contained in:
Sebastiaan Janssen
2018-07-26 15:34:54 +02:00
parent 2bb5d0b30e ff0af2f227
commit 6deb97e356
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
View File

@@ -51,17 +51,16 @@ namespace Umbraco.Web.Trees
internal static string GetRootNodeDisplayName(this TreeAttribute attribute, ILocalizedTextService textService)
{
//if title is defined, return that
if (string.IsNullOrEmpty(attribute.Title) == false)
return attribute.Title;
//try to look up a tree header matching the tree alias
// try to look up a the localized tree header matching the tree alias
var localizedLabel = textService.Localize("treeHeaders/" + attribute.Alias);
if (string.IsNullOrEmpty(localizedLabel) == false)
return localizedLabel;
//is returned to signal that a label was not found
// otherwise return the header if it's defined
if (string.IsNullOrEmpty(attribute.Title) == false)
return attribute.Title;
// if all fails, return this to signal that a label was not found
return "[" + attribute.Alias + "]";
}