From 69e8ee087e22150ca2ffc56ed8a242bce91216b4 Mon Sep 17 00:00:00 2001 From: nzdev <834725+nzdev@users.noreply.github.com> Date: Sun, 17 Jan 2021 21:38:52 +1300 Subject: [PATCH] Remove debug code, set comparer StringComparer.InvariantCultureIgnoreCase --- .../Implement/LocalizedTextService.cs | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs index c099960397..ad75e8a2d1 100644 --- a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs +++ b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -17,7 +18,6 @@ namespace Umbraco.Core.Services.Implement private readonly IDictionary>> _dictionarySource; private readonly IDictionary> _noAreaDictionarySource; private readonly char[] _splitter = new[] { '/' }; - /// /// Initializes with a file sources instance /// @@ -47,7 +47,7 @@ namespace Umbraco.Core.Services.Implement { var areaAliaValue = GetAreaStoredTranslations(source, xmlSource.Key); cultureDictionary.Add(xmlSource.Key, areaAliaValue); - var aliasValue = new Dictionary(); + var aliasValue = new Dictionary(StringComparer.InvariantCultureIgnoreCase); foreach (var area in areaAliaValue) { foreach (var alias in area.Value) @@ -118,19 +118,10 @@ namespace Umbraco.Core.Services.Implement public string Localize(string area, string alias, CultureInfo culture, IDictionary tokens = null) { if (culture == null) throw new ArgumentNullException(nameof(culture)); - var sw = System.Diagnostics.Stopwatch.StartNew(); - try - { // TODO: Hack, see notes on ConvertToSupportedCultureWithRegionCode culture = ConvertToSupportedCultureWithRegionCode(culture); return GetFromDictionarySource(culture, area, alias, tokens); - } - finally - { - sw.Stop(); - System.Diagnostics.Debug.WriteLine($"Localize {area}/{alias} ({tokens?.Count}) ({sw.ElapsedTicks})"); - } } /// @@ -172,11 +163,11 @@ namespace Umbraco.Core.Services.Implement private Dictionary> GetAreaStoredTranslations(IDictionary> xmlSource, CultureInfo cult) { - var overallResult = new Dictionary>(); + var overallResult = new Dictionary>(StringComparer.InvariantCultureIgnoreCase); var areas = xmlSource[cult].Value.XPathSelectElements("//area"); foreach (var area in areas) { - var result = new Dictionary(); + var result = new Dictionary(StringComparer.InvariantCultureIgnoreCase); var keys = area.XPathSelectElements("./key"); foreach (var key in keys) { @@ -192,12 +183,12 @@ namespace Umbraco.Core.Services.Implement } private Dictionary> GetAreaStoredTranslations(IDictionary>> dictionarySource, CultureInfo cult) { - var overallResult = new Dictionary>(); + var overallResult = new Dictionary>(StringComparer.InvariantCultureIgnoreCase); var areaDict = dictionarySource[cult]; foreach (var area in areaDict) { - var result = new Dictionary(); + var result = new Dictionary(StringComparer.InvariantCultureIgnoreCase); var keys = area.Value.Keys; foreach (var key in keys) {