From 95e1fd7114c198b583a2277d44bd52e4be76d994 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Wed, 21 Jul 2010 21:28:47 -0700
Subject: [PATCH] Store default location for Localization part in initial
 settings

--HG--
branch : dev
---
 .../DataMigrations/LocalizationDataMigration.cs   | 15 ++++++++++++++-
 .../Localization/Drivers/LocalizationDriver.cs    |  6 ++----
 src/Orchard.Web/Core/Localization/Module.txt      |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
index 4cb268eb8..99b67d80a 100644
--- a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
+++ b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
@@ -1,4 +1,9 @@
-using Orchard.Data.Migration;
+using System.Collections.Generic;
+using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Core.Localization.Models;
+using Orchard.Data.Migration;
 
 namespace Orchard.Core.Localization.DataMigrations {
     public class LocalizationDataMigration : DataMigrationImpl {
@@ -13,5 +18,13 @@ namespace Orchard.Core.Localization.DataMigrations {
 
             return 1;
         }
+        public int UpdateFrom1() {
+            ContentDefinitionManager.AlterPartDefinition(typeof(Localized).Name, cfg => cfg
+                .WithLocation(new Dictionary<string, ContentLocation> {
+                    {"Default", new ContentLocation { Zone = "primary", Position = "5" }},
+                    {"Editor", new ContentLocation { Zone = "primary", Position = "1" }},
+                }));
+            return 2;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs b/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs
index a49bca5bb..ac6c9b301 100644
--- a/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs
+++ b/src/Orchard.Web/Core/Localization/Drivers/LocalizationDriver.cs
@@ -27,8 +27,7 @@ namespace Orchard.Core.Localization.Drivers {
                 Localizations = GetDisplayLocalizations(part)
             };
 
-            var location = part.GetLocation(displayType, "primary", "5");
-            return ContentPartTemplate(model, "Parts/Localization.ContentTranslations", TemplatePrefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(location);
+            return ContentPartTemplate(model, "Parts/Localization.ContentTranslations", TemplatePrefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(part.GetLocation(displayType));
         }
 
         protected override DriverResult Editor(Localized part) {
@@ -40,8 +39,7 @@ namespace Orchard.Core.Localization.Drivers {
                 ContentLocalizations = new ContentLocalizationsViewModel(part) { Localizations = localizations }
             };
 
-            var location = part.GetLocation("Editor", "primary", "1");
-            return ContentPartTemplate(model, "Parts/Localization.Translation", TemplatePrefix).Location(location);
+            return ContentPartTemplate(model, "Parts/Localization.Translation", TemplatePrefix).Location(part.GetLocation("Editor"));
         }
 
         protected override DriverResult Editor(Localized part, IUpdateModel updater) {
diff --git a/src/Orchard.Web/Core/Localization/Module.txt b/src/Orchard.Web/Core/Localization/Module.txt
index f3b1d4b11..63d63a8e8 100644
--- a/src/Orchard.Web/Core/Localization/Module.txt
+++ b/src/Orchard.Web/Core/Localization/Module.txt
@@ -8,4 +8,5 @@ description: The localization module enables the localization of content items.
 features:
     Localization:
         Description: Localize content items.
+        Dependencies: Settings
         Category: Content