This commit is contained in:
Nicholas Mayne
2014-08-10 16:52:07 +01:00
parent 87c6414d01
commit 6c9d868e8a
4 changed files with 15 additions and 13 deletions
@@ -68,6 +68,7 @@
<Compile Include="Controllers\AdminController.cs" /> <Compile Include="Controllers\AdminController.cs" />
<Compile Include="Controllers\CutlureSelectorController.cs" /> <Compile Include="Controllers\CutlureSelectorController.cs" />
<Compile Include="Providers\CultureSelectorSelector.cs" /> <Compile Include="Providers\CultureSelectorSelector.cs" />
<Compile Include="Services\DefaultCultureStorageProvider.cs" />
<Compile Include="Services\ICultureService.cs" /> <Compile Include="Services\ICultureService.cs" />
<Compile Include="Drivers\LocalizationPartDriver.cs" /> <Compile Include="Drivers\LocalizationPartDriver.cs" />
<Compile Include="Handlers\LocalizationPartHandler.cs" /> <Compile Include="Handlers\LocalizationPartHandler.cs" />
@@ -78,7 +79,7 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourceManifest.cs" /> <Compile Include="ResourceManifest.cs" />
<Compile Include="Routes.cs" /> <Compile Include="Routes.cs" />
<Compile Include="Services\ICultureStorage.cs" /> <Compile Include="Services\ICultureStorageProvider.cs" />
<Compile Include="Services\ILocalizationService.cs" /> <Compile Include="Services\ILocalizationService.cs" />
<Compile Include="Services\LocalizationDateTimeFormatProvider.cs" /> <Compile Include="Services\LocalizationDateTimeFormatProvider.cs" />
<Compile Include="Services\LocalizationService.cs" /> <Compile Include="Services\LocalizationService.cs" />
@@ -6,13 +6,8 @@ using Orchard.Mvc;
using Orchard.Services; using Orchard.Services;
namespace Orchard.Localization.Services { namespace Orchard.Localization.Services {
public interface ICultureStorage : IDependency {
void SetCulture(string culture);
string GetCulture();
}
[OrchardFeature("Orchard.Localization.CutlureSelector")] [OrchardFeature("Orchard.Localization.CutlureSelector")]
public class DefaultCultureStorage : ICultureStorage { public class DefaultCultureStorageProvider : ICultureStorageProvider {
private readonly IHttpContextAccessor _httpContextAccessor; private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IClock _clock; private readonly IClock _clock;
private readonly ShellSettings _shellSettings; private readonly ShellSettings _shellSettings;
@@ -20,7 +15,7 @@ namespace Orchard.Localization.Services {
private const string CookieName = "OrchardCurrentCulture"; private const string CookieName = "OrchardCurrentCulture";
private const int DefaultExpireTimeYear = 1; private const int DefaultExpireTimeYear = 1;
public DefaultCultureStorage(IHttpContextAccessor httpContextAccessor, public DefaultCultureStorageProvider(IHttpContextAccessor httpContextAccessor,
IClock clock, IClock clock,
ShellSettings shellSettings) { ShellSettings shellSettings) {
_httpContextAccessor = httpContextAccessor; _httpContextAccessor = httpContextAccessor;
@@ -8,17 +8,17 @@ namespace Orchard.Localization.Services {
[OrchardFeature("Orchard.Localization.CutlureSelector")] [OrchardFeature("Orchard.Localization.CutlureSelector")]
public class CultureService : ICultureService { public class CultureService : ICultureService {
private readonly ICultureStorage _cultureStorage; private readonly ICultureStorageProvider _cultureStorageProvider;
public CultureService(ICultureStorage cultureStorage) { public CultureService(ICultureStorageProvider cultureStorageProvider) {
_cultureStorage = cultureStorage; _cultureStorageProvider = cultureStorageProvider;
} }
public void SetCulture(string culture) { public void SetCulture(string culture) {
_cultureStorage.SetCulture(culture); _cultureStorageProvider.SetCulture(culture);
} }
public string GetCulture() { public string GetCulture() {
return _cultureStorage.GetCulture(); return _cultureStorageProvider.GetCulture();
} }
} }
} }
@@ -0,0 +1,6 @@
namespace Orchard.Localization.Services {
public interface ICultureStorageProvider : IDependency {
void SetCulture(string culture);
string GetCulture();
}
}