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

Removed method marked for deletion in V8

Browse Source
This commit is contained in:
Ed Parry
2018-06-29 11:50:18 +01:00
parent ce74108848
commit 00b3234124
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Services/ILocalizedTextService.cs
View File

@@ -47,13 +47,5 @@ namespace Umbraco.Core.Services
/// to resolve the full culture if possible. /// to resolve the full culture if possible.
/// </remarks> /// </remarks>
CultureInfo ConvertToSupportedCultureWithRegionCode(CultureInfo currentCulture); CultureInfo ConvertToSupportedCultureWithRegionCode(CultureInfo currentCulture);
/// <summary>
/// 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
/// </summary>
/// <param name="currentCulture"></param>
/// <returns></returns>
string ConvertToRegionCodeFromSupportedCulture(CultureInfo currentCulture);
} }
} }

17
src/Umbraco.Core/Services/Implement/LocalizedTextService.cs
View File

@@ -203,23 +203,6 @@ namespace Umbraco.Core.Services.Implement
return attempt ? attempt.Result : currentCulture; return attempt ? attempt.Result : currentCulture;
} }
/// <summary>
/// HAAAAAAAAAAACK! Used for backwards compat to convert a user's real culture code to a region code - normally this would be two letters
/// </summary>
/// <param name="currentCulture"></param>
/// <returns></returns>
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<string, string> tokens) private string GetFromDictionarySource(CultureInfo culture, string area, string key, IDictionary<string, string> tokens)
{ {
if (_dictionarySource.ContainsKey(culture) == false) if (_dictionarySource.ContainsKey(culture) == false)