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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-08 11:44:32 -07:00
parent 11d83885ce 49a45400ed
commit ebdc937835
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -1,4 +1,5 @@
using System.Globalization; using System;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using Orchard.Core.Settings.Models; using Orchard.Core.Settings.Models;
@@ -74,11 +75,15 @@ namespace Orchard.Core.Settings.Controllers {
} }
[HttpPost] [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"))) if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
cultureName = string.IsNullOrWhiteSpace(cultureName) ? systemCultureName : cultureName;
if (!string.IsNullOrWhiteSpace(cultureName)) {
_cultureManager.AddCulture(cultureName); _cultureManager.AddCulture(cultureName);
}
return RedirectToAction("Culture"); return RedirectToAction("Culture");
} }

3
src/Orchard.Web/Core/Settings/Views/Admin/Culture.cshtml
View File

@@ -7,7 +7,8 @@
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset class="addCulture"> <fieldset class="addCulture">
<label for="CultureName">@T("Add a culture...")</label> <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> <button class="primaryAction" type="submit">@T("Add")</button>
</fieldset> </fieldset>
} }

1
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -185,7 +185,6 @@ namespace Orchard.Setup.Services {
// add default culture // add default culture
var cultureManager = environment.Resolve<ICultureManager>(); var cultureManager = environment.Resolve<ICultureManager>();
cultureManager.AddCulture("en-US"); cultureManager.AddCulture("en-US");
cultureManager.AddCulture("fr");
var contentManager = environment.Resolve<IContentManager>(); var contentManager = environment.Resolve<IContentManager>();