From cac745fa78f9729b41789bd32812b3687cb08da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 18 Feb 2020 13:51:03 +0100 Subject: [PATCH] segment before language in GetDisplayName --- .../Models/Mapping/ContentVariantMapper.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs index 406c2090c2..0b6be53045 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs @@ -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(); - 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); + } } }