lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 19:34:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update localizations service to harvest only dictionaries for enabled themes.

Browse Source 
Fixes #6600
This commit is contained in:
jagraz
2016-05-05 13:02:13 -07:00
committed by Sébastien Ros
parent 0ed5198cb3
commit ed13ac2802
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
View File

@@ -6,6 +6,8 @@ using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.FileSystems.WebSite;
using Orchard.Logging;
using Orchard.Environment.Descriptor.Models;
using System.Linq;
namespace Orchard.Localization.Services {
public class DefaultLocalizedStringManager : ILocalizedStringManager {
@@ -15,6 +17,7 @@ namespace Orchard.Localization.Services {
private readonly ILocalizationStreamParser _localizationStreamParser;
private readonly ShellSettings _shellSettings;
private readonly ISignals _signals;
private readonly ShellDescriptor _shellDescriptor;
const string CoreLocalizationFilePathFormat = "~/Core/App_Data/Localization/{0}/orchard.core.po";
const string ModulesLocalizationFilePathFormat = "{0}/App_Data/Localization/{1}/orchard.module.po";
@@ -28,13 +31,15 @@ namespace Orchard.Localization.Services {
ICacheManager cacheManager,
ILocalizationStreamParser locationStreamParser,
ShellSettings shellSettings,
ISignals signals) {
ISignals signals,
ShellDescriptor shellDescriptor) {
_webSiteFolder = webSiteFolder;
_extensionManager = extensionManager;
_cacheManager = cacheManager;
_localizationStreamParser = locationStreamParser;
_shellSettings = shellSettings;
_signals = signals;
_shellDescriptor = shellDescriptor;
Logger = NullLogger.Instance;
}
@@ -138,7 +143,9 @@ namespace Orchard.Localization.Services {
}
foreach (var theme in _extensionManager.AvailableExtensions()) {
if (DefaultExtensionTypes.IsTheme(theme.ExtensionType)) {
if (DefaultExtensionTypes.IsTheme(theme.ExtensionType) && _shellDescriptor.Features.Any(x => x.Name == theme.Id))
{
string themePath = string.Format(ThemesLocalizationFilePathFormat, theme.VirtualPath, culture);
text = _webSiteFolder.ReadFile(themePath);
if (text != null) {