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

V8: Improve plugin language handling (#4454)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-03-20 23:44:29 +01:00
committed by Sebastiaan Janssen
parent ee911a579f
commit 0a3f893f22
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Services/Implement/LocalizedTextServiceFileSources.cs
View File

@@ -184,8 +184,12 @@ namespace Umbraco.Core.Services.Implement
//now load in supplementary
var found = _supplementFileSources.Where(x =>
{
var fileName = Path.GetFileName(x.File.FullName);
return fileName.InvariantStartsWith(culture.Name) && fileName.InvariantEndsWith(".xml");
var extension = Path.GetExtension(x.File.FullName);
var fileCultureName = Path.GetFileNameWithoutExtension(x.File.FullName).Replace("_", "-").Replace(".user", "");
return extension.InvariantEquals(".xml") && (
fileCultureName.InvariantEquals(culture.Name)
|| fileCultureName.InvariantEquals(culture.TwoLetterISOLanguageName)
);
});
foreach (var supplementaryFile in found)
@@ -203,7 +207,7 @@ namespace Umbraco.Core.Services.Implement
continue;
}
if (xChildDoc.Root == null) continue;
if (xChildDoc.Root == null || xChildDoc.Root.Name != "language") continue;
foreach (var xArea in xChildDoc.Root.Elements("area")
.Where(x => ((string)x.Attribute("alias")).IsNullOrWhiteSpace() == false))
{