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

#19528: Fixing localized widgets display rule

Browse Source 
Work Item: 19528

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-05-07 10:59:46 -07:00
parent 52caba0710
commit 8dd8d7cc46
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Web.Mvc;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.Core.Settings.Models;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Mvc.Filters;
@@ -65,6 +66,9 @@ namespace Orchard.Widgets.Filters {
// Build and add shape to zone.
var zones = workContext.Layout.Zones;
var defaultCulture = workContext.CurrentSite.As<SiteSettingsPart>().SiteCulture;
var currentCulture = workContext.CurrentCulture;
foreach (var widgetPart in widgetParts) {
var commonPart = widgetPart.As<ICommonPart>();
if (commonPart == null || commonPart.Container == null) {
@@ -74,8 +78,17 @@ namespace Orchard.Widgets.Filters {
// ignore widget for different cultures
var localizablePart = widgetPart.As<ILocalizableAspect>();
if (localizablePart != null && localizablePart.Culture != workContext.CurrentCulture) {
continue;
if (localizablePart != null) {
// if localized culture is null then show if current culture is the default
// this allows a user to show a content item for the default culture only
if (localizablePart.Culture == null && defaultCulture != currentCulture) {
continue;
}
// if culture is set, show only if current culture is the same
if (localizablePart.Culture != null && localizablePart.Culture != currentCulture) {
continue;
}
}
var widgetShape = _contentManager.BuildDisplay(widgetPart);