From 00b3234124cfe7da494ff5218ba8ce20a434a255 Mon Sep 17 00:00:00 2001 From: Ed Parry Date: Fri, 29 Jun 2018 11:50:18 +0100 Subject: [PATCH] Removed method marked for deletion in V8 --- .../Services/ILocalizedTextService.cs | 8 -------- .../Services/Implement/LocalizedTextService.cs | 17 ----------------- 2 files changed, 25 deletions(-) diff --git a/src/Umbraco.Core/Services/ILocalizedTextService.cs b/src/Umbraco.Core/Services/ILocalizedTextService.cs index 9d0a69497d..f167c64e0f 100644 --- a/src/Umbraco.Core/Services/ILocalizedTextService.cs +++ b/src/Umbraco.Core/Services/ILocalizedTextService.cs @@ -47,13 +47,5 @@ namespace Umbraco.Core.Services /// to resolve the full culture if possible. /// CultureInfo ConvertToSupportedCultureWithRegionCode(CultureInfo currentCulture); - - /// - /// HAAAAAAAAAAACK! Used for backwards compat to convert a user's real culture code to a region code - normally this would be two letters - /// TODO: REmove in v8 - /// - /// - /// - string ConvertToRegionCodeFromSupportedCulture(CultureInfo currentCulture); } } diff --git a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs index 272d433f57..953e80594f 100644 --- a/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs +++ b/src/Umbraco.Core/Services/Implement/LocalizedTextService.cs @@ -203,23 +203,6 @@ namespace Umbraco.Core.Services.Implement return attempt ? attempt.Result : currentCulture; } - /// - /// HAAAAAAAAAAACK! Used for backwards compat to convert a user's real culture code to a region code - normally this would be two letters - /// - /// - /// - public string ConvertToRegionCodeFromSupportedCulture(CultureInfo currentCulture) - { - if (currentCulture == null) throw new ArgumentNullException("currentCulture"); - - if (_fileSources == null) return currentCulture.Name; - - var attempt = _fileSources.Value.TryConvert4LetterCultureTo2Letter(currentCulture); - return attempt - ? attempt.Result - : currentCulture.Name; - } - private string GetFromDictionarySource(CultureInfo culture, string area, string key, IDictionary tokens) { if (_dictionarySource.ContainsKey(culture) == false)