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

segment before language in GetDisplayName

Browse Source
This commit is contained in:
Niels Lyngsø
2020-02-18 13:51:03 +01:00
parent 12bb2a42d6
commit cac745fa78
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs
View File

@@ -141,7 +141,7 @@ namespace Umbraco.Web.Models.Mapping
variantDisplay.Segment = segment;
variantDisplay.Language = language;
variantDisplay.Name = content.GetCultureName(language?.IsoCode);
variantDisplay.DisplayName = GetDisplayName(language, segment);
variantDisplay.DisplayName = GetDisplayName(language, segment);
return variantDisplay;
}
@@ -152,20 +152,20 @@ namespace Umbraco.Web.Models.Mapping
var isSegmentVariant = !segment.IsNullOrWhiteSpace();
if(!isCultureVariant && !isSegmentVariant)
{
{
return _localizedTextService.Localize("general/default");
}
var parts = new List<string>();
if (isCultureVariant)
parts.Add(new CultureInfo(language.IsoCode).NativeName);
if (isSegmentVariant)
parts.Add(segment);
return string.Join(" - ", parts);
if (isCultureVariant)
parts.Add(language.Name);
return string.Join(" — ", parts);
}
}
}