From 5cf9e62f8436261c1877c5b2bf424c053cbdf1d3 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Fri, 23 Jul 2010 00:22:13 -0700 Subject: [PATCH] Localized -> LocalizationPart - updating part names to conform to a Part convention --HG-- branch : dev rename : src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs => src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs rename : src/Orchard.Web/Core/Localization/Handlers/LocalizationHandler.cs => src/Orchard.Web/Core/Localization/Handlers/LocalizationPartHandler.cs rename : src/Orchard.Web/Core/Localization/Models/Localized.cs => src/Orchard.Web/Core/Localization/Models/LocalizationPart.cs rename : src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs => src/Orchard.Web/Core/Localization/Models/LocalizationPartRecord.cs --- .../Controllers/AdminController.cs | 4 ++-- .../LocalizationDataMigration.cs | 4 ++-- ...ionDriver.cs => LocalizationPartDriver.cs} | 18 +++++++-------- ...nHandler.cs => LocalizationPartHandler.cs} | 22 +++++++++---------- .../{Localized.cs => LocalizationPart.cs} | 2 +- ...zedRecord.cs => LocalizationPartRecord.cs} | 2 +- .../Services/ILocalizationService.cs | 4 ++-- .../Services/LocalizationService.cs | 22 +++++++++---------- .../ContentLocalizationsViewModel.cs | 4 ++-- src/Orchard.Web/Core/Orchard.Core.csproj | 8 +++---- .../Orchard.Setup/Services/SetupService.cs | 4 ++-- 11 files changed, 47 insertions(+), 47 deletions(-) rename src/Orchard.Web/Core/Localization/Drivers/{LocalizationDriver.cs => LocalizationPartDriver.cs} (77%) rename src/Orchard.Web/Core/Localization/Handlers/{LocalizationHandler.cs => LocalizationPartHandler.cs} (51%) rename src/Orchard.Web/Core/Localization/Models/{Localized.cs => LocalizationPart.cs} (90%) rename src/Orchard.Web/Core/Localization/Models/{LocalizedRecord.cs => LocalizationPartRecord.cs} (75%) diff --git a/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs b/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs index 9411eda95..d11836c9b 100644 --- a/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Localization/Controllers/AdminController.cs @@ -35,7 +35,7 @@ namespace Orchard.Core.Localization.Controllers { if (contentItem == null) return new NotFoundResult(); - if (!contentItem.Is() || contentItem.As().MasterContentItem != null) { + if (!contentItem.Is() || contentItem.As().MasterContentItem != null) { var metadata = _contentManager.GetItemMetadata(contentItem); return RedirectToAction(Convert.ToString(metadata.EditorRouteValues["action"]), metadata.EditorRouteValues); } @@ -71,7 +71,7 @@ namespace Orchard.Core.Localization.Controllers { } else { // create contentItemTranslation = _contentManager.New(contentItem.ContentType); - var localized = contentItemTranslation.As(); + var localized = contentItemTranslation.As(); localized.MasterContentItem = contentItem; localized.Culture = _cultureManager.GetCultureByName(viewModel.SelectedCulture); _contentManager.Create(contentItemTranslation, VersionOptions.Draft); diff --git a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs index 99b67d80a..4f07d40d9 100644 --- a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs +++ b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs @@ -10,7 +10,7 @@ namespace Orchard.Core.Localization.DataMigrations { public int Create() { //CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id)); - SchemaBuilder.CreateTable("LocalizedRecord", table => table + SchemaBuilder.CreateTable("LocalizationPartRecord", table => table .ContentPartRecord() .Column("CultureId") .Column("MasterContentItemId") @@ -19,7 +19,7 @@ namespace Orchard.Core.Localization.DataMigrations { return 1; } public int UpdateFrom1() { - ContentDefinitionManager.AlterPartDefinition(typeof(Localized).Name, cfg => cfg + ContentDefinitionManager.AlterPartDefinition(typeof(LocalizationPart).Name, cfg => cfg .WithLocation(new Dictionary { {"Default", new ContentLocation { Zone = "primary", Position = "5" }}, {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}, diff --git a/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs similarity index 77% rename from src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs rename to src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs index ac6c9b301..6e40b62e9 100644 --- a/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs +++ b/src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs @@ -12,17 +12,17 @@ using Orchard.Localization.Services; namespace Orchard.Core.Localization.Drivers { [UsedImplicitly] - public class LocalizationDriver : ContentPartDriver { + public class LocalizationPartDriver : ContentPartDriver { private const string TemplatePrefix = "Localization"; private readonly ICultureManager _cultureManager; private readonly ILocalizationService _localizationService; - public LocalizationDriver(ICultureManager cultureManager, ILocalizationService localizationService) { + public LocalizationPartDriver(ICultureManager cultureManager, ILocalizationService localizationService) { _cultureManager = cultureManager; _localizationService = localizationService; } - protected override DriverResult Display(Localized part, string displayType) { + protected override DriverResult Display(LocalizationPart part, string displayType) { var model = new ContentLocalizationsViewModel(part) { Localizations = GetDisplayLocalizations(part) }; @@ -30,7 +30,7 @@ namespace Orchard.Core.Localization.Drivers { return ContentPartTemplate(model, "Parts/Localization.ContentTranslations", TemplatePrefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(part.GetLocation(displayType)); } - protected override DriverResult Editor(Localized part) { + protected override DriverResult Editor(LocalizationPart part) { var localizations = GetEditorLocalizations(part).ToList(); var model = new EditLocalizationViewModel { SelectedCulture = part.Culture != null ? part.Culture.Culture : null, @@ -42,7 +42,7 @@ namespace Orchard.Core.Localization.Drivers { return ContentPartTemplate(model, "Parts/Localization.Translation", TemplatePrefix).Location(part.GetLocation("Editor")); } - protected override DriverResult Editor(Localized part, IUpdateModel updater) { + protected override DriverResult Editor(LocalizationPart part, IUpdateModel updater) { var model = new EditLocalizationViewModel(); if (updater != null && updater.TryUpdateModel(model, TemplatePrefix, null, null)) { _localizationService.SetContentCulture(part, model.SelectedCulture); @@ -51,10 +51,10 @@ namespace Orchard.Core.Localization.Drivers { return Editor(part); } - private IEnumerable GetDisplayLocalizations(Localized part) { + private IEnumerable GetDisplayLocalizations(LocalizationPart part) { return _localizationService.GetLocalizations(part.ContentItem) .Select(c => { - var localized = c.ContentItem.As(); + var localized = c.ContentItem.As(); if (localized.Culture == null) { localized.Culture = _cultureManager.GetCultureByName(_cultureManager.GetCurrentCulture(new HttpContextWrapper(HttpContext.Current))); } @@ -62,9 +62,9 @@ namespace Orchard.Core.Localization.Drivers { }).ToList(); } - private IEnumerable GetEditorLocalizations(Localized part) { + private IEnumerable GetEditorLocalizations(LocalizationPart part) { return _localizationService.GetLocalizations(part.ContentItem) - .Select(c => c.ContentItem.As()) + .Select(c => c.ContentItem.As()) .Where(l => l.MasterContentItem != null).ToList(); } } diff --git a/src/Orchard.Web/Core/Localization/Handlers/LocalizationHandler.cs b/src/Orchard.Web/Core/Localization/Handlers/LocalizationPartHandler.cs similarity index 51% rename from src/Orchard.Web/Core/Localization/Handlers/LocalizationHandler.cs rename to src/Orchard.Web/Core/Localization/Handlers/LocalizationPartHandler.cs index e731f92fa..ef20bb488 100644 --- a/src/Orchard.Web/Core/Localization/Handlers/LocalizationHandler.cs +++ b/src/Orchard.Web/Core/Localization/Handlers/LocalizationPartHandler.cs @@ -9,20 +9,20 @@ using Orchard.Localization.Services; namespace Orchard.Core.Localization.Handlers { [UsedImplicitly] - public class LocalizationHandler : ContentHandler { + public class LocalizationPartHandler : ContentHandler { private readonly ICultureManager _cultureManager; private readonly IContentManager _contentManager; - public LocalizationHandler(IRepository localizedRepository, ICultureManager cultureManager, IContentManager contentManager) { + public LocalizationPartHandler(IRepository localizedRepository, ICultureManager cultureManager, IContentManager contentManager) { _cultureManager = cultureManager; _contentManager = contentManager; T = NullLocalizer.Instance; Filters.Add(StorageFilter.For(localizedRepository)); - OnInitializing(InitializePart); + OnInitializing(InitializePart); - OnIndexed((context, localized) => context.DocumentIndex + OnIndexed((context, localized) => context.DocumentIndex .Add("culture", CultureInfo.GetCultureInfo(localized.Culture != null ? localized.Culture.Culture : _cultureManager.GetSiteCulture()).LCID) .Store() ); @@ -30,17 +30,17 @@ namespace Orchard.Core.Localization.Handlers { public Localizer T { get; set; } - void InitializePart(InitializingContentContext context, Localized localized) { - localized.CultureField.Setter(cultureRecord => { - localized.Record.CultureId = cultureRecord.Id; + void InitializePart(InitializingContentContext context, LocalizationPart localizationPart) { + localizationPart.CultureField.Setter(cultureRecord => { + localizationPart.Record.CultureId = cultureRecord.Id; return cultureRecord; }); - localized.MasterContentItemField.Setter(masterContentItem => { - localized.Record.MasterContentItemId = masterContentItem.ContentItem.Id; + localizationPart.MasterContentItemField.Setter(masterContentItem => { + localizationPart.Record.MasterContentItemId = masterContentItem.ContentItem.Id; return masterContentItem; }); - localized.CultureField.Loader(ctx => _cultureManager.GetCultureById(localized.Record.CultureId)); - localized.MasterContentItemField.Loader(ctx => _contentManager.Get(localized.Record.MasterContentItemId)); + localizationPart.CultureField.Loader(ctx => _cultureManager.GetCultureById(localizationPart.Record.CultureId)); + localizationPart.MasterContentItemField.Loader(ctx => _contentManager.Get(localizationPart.Record.MasterContentItemId)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Localization/Models/Localized.cs b/src/Orchard.Web/Core/Localization/Models/LocalizationPart.cs similarity index 90% rename from src/Orchard.Web/Core/Localization/Models/Localized.cs rename to src/Orchard.Web/Core/Localization/Models/LocalizationPart.cs index cc703cdae..de5ab9a85 100644 --- a/src/Orchard.Web/Core/Localization/Models/Localized.cs +++ b/src/Orchard.Web/Core/Localization/Models/LocalizationPart.cs @@ -4,7 +4,7 @@ using Orchard.ContentManagement.Utilities; using Orchard.Localization.Records; namespace Orchard.Core.Localization.Models { - public sealed class Localized : ContentPart { + public sealed class LocalizationPart : ContentPart { private readonly LazyField _culture = new LazyField(); private readonly LazyField _masterContentItem = new LazyField(); diff --git a/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs b/src/Orchard.Web/Core/Localization/Models/LocalizationPartRecord.cs similarity index 75% rename from src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs rename to src/Orchard.Web/Core/Localization/Models/LocalizationPartRecord.cs index cab717d5f..802962a78 100644 --- a/src/Orchard.Web/Core/Localization/Models/LocalizedRecord.cs +++ b/src/Orchard.Web/Core/Localization/Models/LocalizationPartRecord.cs @@ -1,7 +1,7 @@ using Orchard.ContentManagement.Records; namespace Orchard.Core.Localization.Models { - public class LocalizedRecord : ContentPartRecord { + public class LocalizationPartRecord : ContentPartRecord { public virtual int CultureId { get; set; } public virtual int MasterContentItemId { get; set; } } diff --git a/src/Orchard.Web/Core/Localization/Services/ILocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/ILocalizationService.cs index c11ebcb32..fe1e1e16a 100644 --- a/src/Orchard.Web/Core/Localization/Services/ILocalizationService.cs +++ b/src/Orchard.Web/Core/Localization/Services/ILocalizationService.cs @@ -4,9 +4,9 @@ using Orchard.Core.Localization.Models; namespace Orchard.Core.Localization.Services { public interface ILocalizationService : IDependency { - Localized GetLocalizedContentItem(IContent masterContentItem, string culture); + LocalizationPart GetLocalizedContentItem(IContent masterContentItem, string culture); string GetContentCulture(IContent contentItem); void SetContentCulture(IContent contentItem, string culture); - IEnumerable GetLocalizations(IContent contentItem); + IEnumerable GetLocalizations(IContent contentItem); } } diff --git a/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs b/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs index 7bdc5e6d4..812e39a61 100644 --- a/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs +++ b/src/Orchard.Web/Core/Localization/Services/LocalizationService.cs @@ -15,45 +15,45 @@ namespace Orchard.Core.Localization.Services { _cultureManager = cultureManager; } - Localized ILocalizationService.GetLocalizedContentItem(IContent content, string culture) { - return _contentManager.Query(content.ContentItem.ContentType).Join() + LocalizationPart ILocalizationService.GetLocalizedContentItem(IContent content, string culture) { + return _contentManager.Query(content.ContentItem.ContentType).Join() .List() - .Select(i => i.As()) + .Select(i => i.As()) .Where(l => l.MasterContentItem != null && l.MasterContentItem.ContentItem.Id == content.ContentItem.Id && string.Equals(l.Culture.Culture, culture, StringComparison.OrdinalIgnoreCase)) .SingleOrDefault(); } string ILocalizationService.GetContentCulture(IContent content) { - var localized = content.As(); + var localized = content.As(); return localized != null && localized.Culture != null ? localized.Culture.Culture : _cultureManager.GetSiteCulture(); } void ILocalizationService.SetContentCulture(IContent content, string culture) { - var localized = content.As(); + var localized = content.As(); if (localized == null || localized.MasterContentItem == null) return; localized.Culture = _cultureManager.GetCultureByName(culture); } - IEnumerable ILocalizationService.GetLocalizations(IContent content) { - var localized = content.As(); + IEnumerable ILocalizationService.GetLocalizations(IContent content) { + var localized = content.As(); //todo: (heskew) get scheduled content as well if (localized.MasterContentItem != null) - return _contentManager.Query(VersionOptions.Latest, localized.ContentItem.ContentType).Join() + return _contentManager.Query(VersionOptions.Latest, localized.ContentItem.ContentType).Join() .List() - .Select(i => i.As()) + .Select(i => i.As()) .Where(l => l.Id != localized.ContentItem.Id && (l.Id == localized.MasterContentItem.ContentItem.Id || l.MasterContentItem != null && l.MasterContentItem.ContentItem.Id == localized.MasterContentItem.ContentItem.Id)); - return _contentManager.Query(VersionOptions.Latest, localized.ContentItem.ContentType).Join() + return _contentManager.Query(VersionOptions.Latest, localized.ContentItem.ContentType).Join() .List() - .Select(i => i.As()) + .Select(i => i.As()) .Where(l => l.MasterContentItem != null && l.MasterContentItem.ContentItem.Id == localized.ContentItem.Id); } } diff --git a/src/Orchard.Web/Core/Localization/ViewModels/ContentLocalizationsViewModel.cs b/src/Orchard.Web/Core/Localization/ViewModels/ContentLocalizationsViewModel.cs index 2ee7efeda..2645d9582 100644 --- a/src/Orchard.Web/Core/Localization/ViewModels/ContentLocalizationsViewModel.cs +++ b/src/Orchard.Web/Core/Localization/ViewModels/ContentLocalizationsViewModel.cs @@ -3,13 +3,13 @@ using Orchard.Core.Localization.Models; namespace Orchard.Core.Localization.ViewModels { public class ContentLocalizationsViewModel { - public ContentLocalizationsViewModel(Localized part) { + public ContentLocalizationsViewModel(LocalizationPart part) { MasterId = part.MasterContentItem != null ? part.MasterContentItem.ContentItem.Id : part.Id; } public int? MasterId { get; private set; } - public IEnumerable Localizations { get; set; } + public IEnumerable Localizations { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index fef5f3e40..afc54e165 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -108,7 +108,7 @@ - + @@ -156,9 +156,9 @@ - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index 7f9098245..f4c77162c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -195,7 +195,7 @@ namespace Orchard.Setup.Services { .DisplayedAs("Blog Post") .WithPart("CommentsPart") .WithPart("TagsPart") - .WithPart("Localized") + .WithPart("LocalizationPart") .Creatable() .Indexed()); contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg @@ -206,7 +206,7 @@ namespace Orchard.Setup.Services { .WithPart("BodyPart") .WithPart("CommentsPart") .WithPart("TagsPart") - .WithPart("Localized") + .WithPart("LocalizationPart") .Creatable() .Indexed()); contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg