From 49a45400ed4812d4fbbdd35e1d578ef756830d3a Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Fri, 8 Oct 2010 11:41:07 -0700
Subject: [PATCH] Add freeform entry to Add Supported Culture. Removed 'fr' as
 available culture from setup (enter 'fr' in freeform to add it back).
 Verified module-provided ICultureSelector can supercede the site default
 culture.

--HG--
branch : dev
---
 .../Core/Settings/Controllers/AdminController.cs      | 11 ++++++++---
 .../Core/Settings/Views/Admin/Culture.cshtml          |  3 ++-
 .../Modules/Orchard.Setup/Services/SetupService.cs    |  1 -
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
index eff84a45b..3410c4861 100644
--- a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.Core.Settings.Models;
@@ -74,11 +75,15 @@ namespace Orchard.Core.Settings.Controllers {
         }
 
         [HttpPost]
-        public ActionResult AddCulture(string cultureName) {
+        public ActionResult AddCulture(string systemCultureName, string cultureName) {
             if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings")))
                 return new HttpUnauthorizedResult();
 
-            _cultureManager.AddCulture(cultureName);
+            cultureName = string.IsNullOrWhiteSpace(cultureName) ? systemCultureName : cultureName;
+
+            if (!string.IsNullOrWhiteSpace(cultureName)) {
+                _cultureManager.AddCulture(cultureName);
+            }
             return RedirectToAction("Culture");
         }
 
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
index 9dde5e792..d57168508 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
@@ -7,7 +7,8 @@
 @Html.ValidationSummary()
 <fieldset class="addCulture">
     <label for="CultureName">@T("Add a culture...")</label>
-    @Html.DropDownList("CultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))
+    @Html.DropDownList("SystemCultureName", new SelectList(Model.AvailableSystemCultures.OrderBy(s => s), Model.CurrentCulture))
+	@T("Other"): @Html.TextBox("CultureName")
     <button class="primaryAction" type="submit">@T("Add")</button>
 </fieldset>
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 00cde67c7..63c5959a1 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -185,7 +185,6 @@ namespace Orchard.Setup.Services {
                     // add default culture
                     var cultureManager = environment.Resolve<ICultureManager>();
                     cultureManager.AddCulture("en-US");
-                    cultureManager.AddCulture("fr");
 
                     var contentManager = environment.Resolve<IContentManager>();