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

Removes GetLanguageByCultureCode since it is kind of useless and the name is also very misleading

Browse Source
This commit is contained in:
Shannon
2018-04-24 15:59:16 +10:00
parent f49fa7b567
commit a1cd80a0f6
8 changed files with 8 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
View File

@@ -4,7 +4,6 @@ namespace Umbraco.Core.Persistence.Repositories
{
public interface ILanguageRepository : IReadWriteQueryRepository<int, ILanguage>
{
ILanguage GetByCultureName(string cultureName);
ILanguage GetByIsoCode(string isoCode);
int GetIdByIsoCode(string isoCode);

9
src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
View File

@@ -199,14 +199,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var entity = factory.BuildEntity(dto);
return entity;
}
public ILanguage GetByCultureName(string cultureName)
{
// use the underlying GetMany which will force cache all languages
// TODO we are cloning ALL in GetMany just to retrieve ONE, this is surely not optimized
return GetMany().FirstOrDefault(x => x.CultureName.InvariantEquals(cultureName));
}
public ILanguage GetByIsoCode(string isoCode)
{
TypedCachePolicy.GetAllCached(PerformGetAll); // ensure cache is populated, in a non-expensive way

9
src/Umbraco.Core/Services/ILocalizationService.cs
View File

@@ -102,14 +102,7 @@ namespace Umbraco.Core.Services
/// <param name="id">Id of the <see cref="ILanguage"/></param>
/// <returns><see cref="ILanguage"/></returns>
ILanguage GetLanguageById(int id);
/// <summary>
/// Gets a <see cref="ILanguage"/> by its culture code
/// </summary>
/// <param name="cultureName">Culture Code - also refered to as the Friendly name</param>
/// <returns><see cref="ILanguage"/></returns>
ILanguage GetLanguageByCultureCode(string cultureName);
/// <summary>
/// Gets a <see cref="Language"/> by its iso code
/// </summary>

13
src/Umbraco.Core/Services/Implement/LocalizationService.cs
View File

@@ -290,19 +290,6 @@ namespace Umbraco.Core.Services.Implement
}
}
/// <summary>
/// Gets a <see cref="Language"/> by its culture code
/// </summary>
/// <param name="cultureName">Culture Name - also refered to as the Friendly name</param>
/// <returns><see cref="Language"/></returns>
public ILanguage GetLanguageByCultureCode(string cultureName)
{
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
return _languageRepository.GetByCultureName(cultureName);
}
}
/// <summary>
/// Gets a <see cref="Language"/> by its iso code
/// </summary>

8
src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories
{
Translations = new List<IDictionaryTranslation>
{
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByCultureCode("en-US"), "Hello world")
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByIsoCode("en-US"), "Hello world")
}
};
@@ -70,7 +70,7 @@ namespace Umbraco.Tests.Persistence.Repositories
{
Translations = new List<IDictionaryTranslation>
{
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByCultureCode("en-US"), "Hello world")
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByIsoCode("en-US"), "Hello world")
}
};
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Persistence.Repositories
{
Translations = new List<IDictionaryTranslation>
{
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByCultureCode("en-US"), "Hello world")
new DictionaryTranslation(ServiceContext.LocalizationService.GetLanguageByIsoCode("en-US"), "Hello world")
}
};
@@ -371,7 +371,7 @@ namespace Umbraco.Tests.Persistence.Repositories
public void CreateTestData()
{
var language = ServiceContext.LocalizationService.GetLanguageByCultureCode("en-US");
var language = ServiceContext.LocalizationService.GetLanguageByIsoCode("en-US");
var languageDK = new Language("da-DK") { CultureName = "da-DK" };
ServiceContext.LocalizationService.Save(languageDK);//Id 2

25
src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
View File

@@ -76,31 +76,6 @@ namespace Umbraco.Tests.Persistence.Repositories
}
}
[Test]
public void Can_Perform_Get_By_Culture_Name_On_LanguageRepository()
{
var provider = TestObjects.GetScopeProvider(Logger);
using (var scope = provider.CreateScope())
{
var repository = CreateRepository(provider);
var au = CultureInfo.GetCultureInfo("en-AU");
var language = (ILanguage)new Language(au.Name)
{
CultureName = au.DisplayName
};
repository.Save(language);
//re-get
language = repository.GetByCultureName(au.DisplayName);
// Assert
Assert.That(language, Is.Not.Null);
Assert.That(language.HasIdentity, Is.True);
Assert.That(language.CultureName, Is.EqualTo(au.DisplayName));
Assert.That(language.IsoCode, Is.EqualTo(au.Name));
}
}
[Test]
public void Get_When_Id_Doesnt_Exist_Returns_Null()

11
src/Umbraco.Tests/Services/LocalizationServiceTests.cs
View File

@@ -144,16 +144,7 @@ namespace Umbraco.Tests.Services
//there's a call or two to get languages, so apart from that there should only be one call per level
Assert.Less(scope.Database.AsUmbracoDatabase().SqlCount, 30);
}
}
[Test]
public void Can_Get_Language_By_Culture_Code()
{
var danish = ServiceContext.LocalizationService.GetLanguageByCultureCode("Danish");
var english = ServiceContext.LocalizationService.GetLanguageByCultureCode("English");
Assert.NotNull(danish);
Assert.NotNull(english);
}
}
[Test]
public void Can_GetLanguageById()

2
src/Umbraco.Web/Routing/AliasUrlProvider.cs
View File

@@ -100,7 +100,7 @@ namespace Umbraco.Web.Routing
else
{
var result = new List<string>();
var languageIds = new List<int?>(domainUris.Select(x => _localizationService.GetLanguageByCultureCode(x.Culture.Name)?.Id).Where(x => x.HasValue));
var languageIds = new List<int?>(domainUris.Select(x => _localizationService.GetLanguageByIsoCode(x.Culture.Name)?.Id).Where(x => x.HasValue));
foreach (var langId in languageIds)
{
var umbracoUrlName = node.Value<string>(Constants.Conventions.Content.UrlAlias, languageId: langId);