diff --git a/src/Orchard/Localization/Services/DefaultCultureManager.cs b/src/Orchard/Localization/Services/DefaultCultureManager.cs index 144d195bc..8ffc0d880 100644 --- a/src/Orchard/Localization/Services/DefaultCultureManager.cs +++ b/src/Orchard/Localization/Services/DefaultCultureManager.cs @@ -12,16 +12,16 @@ namespace Orchard.Localization.Services { private readonly IRepository _cultureRepository; private readonly IEnumerable _cultureSelectors; private readonly ISignals _signals; - private readonly IOrchardServices _orchardServices; + private readonly IWorkContextAccessor _workContextAccessor; public DefaultCultureManager(IRepository cultureRepository, IEnumerable cultureSelectors, ISignals signals, - IOrchardServices orchardServices) { + IWorkContextAccessor workContextAccessor) { _cultureRepository = cultureRepository; _cultureSelectors = cultureSelectors; _signals = signals; - _orchardServices = orchardServices; + _workContextAccessor = workContextAccessor; } public IEnumerable ListCultures() { @@ -76,7 +76,7 @@ namespace Orchard.Localization.Services { } public string GetSiteCulture() { - return _orchardServices.WorkContext.CurrentSite == null ? null : _orchardServices.WorkContext.CurrentSite.SiteCulture; + return _workContextAccessor.GetContext().CurrentSite == null ? null : _workContextAccessor.GetContext().CurrentSite.SiteCulture; } // "" or diff --git a/src/Orchard/Localization/Services/SiteCultureSelector.cs b/src/Orchard/Localization/Services/SiteCultureSelector.cs index 570f1932e..b3e20761a 100644 --- a/src/Orchard/Localization/Services/SiteCultureSelector.cs +++ b/src/Orchard/Localization/Services/SiteCultureSelector.cs @@ -3,14 +3,14 @@ using System.Web; namespace Orchard.Localization.Services { public class SiteCultureSelector : ICultureSelector { - private readonly IOrchardServices _orchardServices; + private readonly IWorkContextAccessor _workContextAccessor; - public SiteCultureSelector(IOrchardServices orchardServices) { - _orchardServices = orchardServices; + public SiteCultureSelector(IWorkContextAccessor workContextAccessor) { + _workContextAccessor = workContextAccessor; } public CultureSelectorResult GetCulture(HttpContextBase context) { - string currentCultureName = _orchardServices.WorkContext.CurrentSite.SiteCulture; + string currentCultureName = _workContextAccessor.GetContext().CurrentSite.SiteCulture; if (String.IsNullOrEmpty(currentCultureName)) { return null;