diff --git a/src/Orchard/ContentManagement/ContentField.cs b/src/Orchard/ContentManagement/ContentField.cs index 953c94953..671ac54fd 100644 --- a/src/Orchard/ContentManagement/ContentField.cs +++ b/src/Orchard/ContentManagement/ContentField.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.ContentManagement.MetaData.Models; +using Orchard.ContentManagement.MetaData.Models; namespace Orchard.ContentManagement { public class ContentField { diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index 30e9b3a20..58e6301f8 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -1,11 +1,12 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using System.Web; +using JetBrains.Annotations; using Orchard.Data; using Orchard.Localization.Records; +using Orchard.Settings; namespace Orchard.Localization.Services { public class DefaultCultureManager : ICultureManager { @@ -17,6 +18,8 @@ namespace Orchard.Localization.Services { _cultureSelectors = cultureSelectors; } + protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; } + public IEnumerable ListCultures() { var query = from culture in _cultureRepository.Table select culture.Culture; return query.ToList(); @@ -51,6 +54,10 @@ namespace Orchard.Localization.Services { return _cultureRepository.Get(id); } + public string GetSiteCulture() { + return CurrentSite == null ? null : CurrentSite.SiteCulture; + } + // "" or // "-" or // "--" diff --git a/src/Orchard/Localization/Services/ICultureManager.cs b/src/Orchard/Localization/Services/ICultureManager.cs index a2864cd3c..5027105d1 100644 --- a/src/Orchard/Localization/Services/ICultureManager.cs +++ b/src/Orchard/Localization/Services/ICultureManager.cs @@ -8,5 +8,6 @@ namespace Orchard.Localization.Services { void AddCulture(string cultureName); string GetCurrentCulture(HttpContext requestContext); CultureRecord GetCultureById(int id); + string GetSiteCulture(); } }