lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Simplified accessing the localizable aspect and elaborated a bit on the hack.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-07-24 14:57:19 +01:00
parent e8cc0cba6e
commit 0d3f525610
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
View File

@@ -63,18 +63,18 @@ namespace Orchard.Autoroute.Drivers {
var settings = part.TypePartDefinition.Settings.GetModel<AutorouteSettings>(); var settings = part.TypePartDefinition.Settings.GetModel<AutorouteSettings>();
var itemCulture = _cultureManager.GetSiteCulture(); var itemCulture = _cultureManager.GetSiteCulture();
// If we are editing an existing content item. // If we are editing an existing content item, check to see if we are an ILocalizableAspect so we can use its culture for alias generation.
if (part.Record.Id != 0) { if (part.Record.Id != 0) {
ContentItem contentItem = _contentManager.Get(part.Record.ContentItemRecord.Id); var localizableAspect = part.As<ILocalizableAspect>();
var aspect = contentItem.As<ILocalizableAspect>();
if (aspect != null) { if (localizableAspect != null) {
itemCulture = aspect.Culture; itemCulture = localizableAspect.Culture;
} }
} }
if (settings.UseCulturePattern) { if (settings.UseCulturePattern) {
// If we are creating from a form post we use the form value for culture. // Hack: if the LocalizedPart is attached to the content item, it will submit the following form value,
// which we use to determine what culture to use for alias generation.
var context = _httpContextAccessor.Current(); var context = _httpContextAccessor.Current();
if (!String.IsNullOrEmpty(context.Request.Form["Localization.SelectedCulture"])) { if (!String.IsNullOrEmpty(context.Request.Form["Localization.SelectedCulture"])) {
itemCulture = context.Request.Form["Localization.SelectedCulture"].ToString(); itemCulture = context.Request.Form["Localization.SelectedCulture"].ToString();
@@ -84,12 +84,12 @@ namespace Orchard.Autoroute.Drivers {
// We update the settings assuming that when // We update the settings assuming that when
// pattern culture = null or "" it means culture = default website culture // pattern culture = null or "" it means culture = default website culture
// for patterns that we migrated. // for patterns that we migrated.
foreach (RoutePattern pattern in settings.Patterns.Where(x => String.IsNullOrWhiteSpace(x.Culture))) { foreach (var pattern in settings.Patterns.Where(x => String.IsNullOrWhiteSpace(x.Culture))) {
pattern.Culture = _cultureManager.GetSiteCulture(); ; pattern.Culture = _cultureManager.GetSiteCulture(); ;
} }
// We do the same for default patterns. // We do the same for default patterns.
foreach (DefaultPattern pattern in settings.DefaultPatterns.Where(x => String.IsNullOrWhiteSpace(x.Culture))) { foreach (var pattern in settings.DefaultPatterns.Where(x => String.IsNullOrWhiteSpace(x.Culture))) {
pattern.Culture = _cultureManager.GetSiteCulture(); pattern.Culture = _cultureManager.GetSiteCulture();
} }