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

Fix issue where languages files are not found in subdir of package dir (#12543)

Browse Source
This commit is contained in:
Paul Johnson
2022-06-07 12:15:26 +01:00
committed by GitHub
parent d7ce136107
commit a8b68202f3
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.LocalizedText.cs
View File

@@ -1,11 +1,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
@@ -17,6 +12,7 @@ namespace Umbraco.Extensions
/// </summary>
public static partial class UmbracoBuilderExtensions
{
/// <summary>
/// Adds the supplementary localized texxt file sources from the various physical and virtual locations supported.
/// </summary>
@@ -69,45 +65,52 @@ namespace Umbraco.Extensions
private static IEnumerable<LocalizedTextServiceSupplementaryFileSource> GetPluginLanguageFileSources(
IFileProvider fileProvider, string folder, bool overwriteCoreKeys)
{
// locate all the *.xml files inside Lang folders inside folders of the main folder
// e.g. /app_plugins/plugin-name/lang/*.xml
var fileSources = new List<LocalizedTextServiceSupplementaryFileSource>();
var pluginFolders = fileProvider.GetDirectoryContents(folder)
.Where(x => x.IsDirectory).ToList();
IEnumerable<IFileInfo> pluginFolders = fileProvider
.GetDirectoryContents(folder)
.Where(x => x.IsDirectory);
foreach (IFileInfo pluginFolder in pluginFolders)
{
// get the full virtual path for the plugin folder
var pluginFolderPath = WebPath.Combine(folder, pluginFolder.Name);
// get any lang folders in this plugin
IEnumerable<IFileInfo> langFolders = fileProvider.GetDirectoryContents(pluginFolderPath)
.Where(x => x.IsDirectory && x.Name.InvariantEquals("lang"));
// loop through the lang folder(s)
// - there could be multiple on case sensitive file system
foreach (var langFolder in langFolders)
foreach (var langFolder in GetLangFolderPaths(fileProvider, pluginFolderPath))
{
// get the full 'virtual' path of the lang folder
var langFolderPath = WebPath.Combine(pluginFolderPath, langFolder.Name);
// request all the files out of the path, these will have physicalPath set.
var files = fileProvider.GetDirectoryContents(langFolderPath)
.Where(x => x.Name.InvariantEndsWith(".xml") && !string.IsNullOrEmpty(x.PhysicalPath))
.Select(x => new FileInfo(x.PhysicalPath))
.Select(x => new LocalizedTextServiceSupplementaryFileSource(x, overwriteCoreKeys))
.ToList();
IEnumerable<FileInfo> localizationFiles = fileProvider
.GetDirectoryContents(langFolder)
.Where(x => !string.IsNullOrEmpty(x.PhysicalPath))
.Where(x => x.Name.InvariantEndsWith(".xml"))
.Select(x => new FileInfo(x.PhysicalPath));
// add any to our results
if (files.Count > 0)
foreach (FileInfo file in localizationFiles)
{
fileSources.AddRange(files);
yield return new LocalizedTextServiceSupplementaryFileSource(file, overwriteCoreKeys);
}
}
}
}
return fileSources;
private static IEnumerable<string> GetLangFolderPaths(IFileProvider fileProvider, string path)
{
IEnumerable<IFileInfo> directories = fileProvider.GetDirectoryContents(path).Where(x => x.IsDirectory);
foreach (IFileInfo directory in directories)
{
var virtualPath = WebPath.Combine(path, directory.Name);
if (directory.Name.InvariantEquals("lang"))
{
yield return virtualPath;
}
foreach (var nested in GetLangFolderPaths(fileProvider, virtualPath))
{
yield return nested;
}
}
}
}
}