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

Fix language inconsistencies management

Browse Source
This commit is contained in:
Stephan
2018-06-12 11:11:16 +02:00
parent b931ce0123
commit 9c3e8b8e3c
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
sql.OrderBy<LanguageDto>(dto => dto.Id);
// get languages
var languages = Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto).ToList();
var languages = Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto).OrderBy(x => x.Id).ToList();
// fix inconsistencies: there has to be a default language, and it has to be mandatory
var defaultLanguage = languages.FirstOrDefault(x => x.IsDefaultVariantLanguage) ?? languages.First();
defaultLanguage.IsDefaultVariantLanguage = true;
defaultLanguage.Mandatory = true;
// initialize the code-id map
lock (_codeIdMap)

18
src/Umbraco.Web/Models/Mapping/LanguageMapperProfile.cs
View File

@@ -28,23 +28,7 @@ namespace Umbraco.Web.Models.Mapping
{
public IEnumerable<Language> Convert(IEnumerable<ILanguage> source, IEnumerable<Language> destination, ResolutionContext context)
{
var allLanguages = source.OrderBy(x => x.Id).ToList();
var langs = new List<Language>(allLanguages.Select(x => context.Mapper.Map<ILanguage, Language>(x, null, context)));
//if there's only one language, by default it is the default
if (langs.Count == 1)
{
langs[0].IsDefaultVariantLanguage = true;
langs[0].Mandatory = true;
}
else if (allLanguages.All(x => !x.IsDefaultVariantLanguage))
{
//if no language has the default flag, then the defaul language is the one with the lowest id
langs[0].IsDefaultVariantLanguage = true;
langs[0].Mandatory = true;
}
return langs.OrderBy(x => x.Name);
return source.Select(x => context.Mapper.Map<ILanguage, Language>(x, null, context)).OrderBy(x => x.Name);
}
}
}