lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Reverting the workcontext change

Browse Source
This commit is contained in:
Nicholas Mayne
2014-08-30 16:13:13 +01:00
parent b469d623d8
commit 1ec0c7a7e3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/TinyMce/Services/TinyMceShapeDisplayEvent.cs
+4 -4
View File
@@ -11,7 +11,7 @@ namespace TinyMce.Services {
private readonly ICacheManager _cacheManager; private readonly ICacheManager _cacheManager;
private readonly ISignals _signals; private readonly ISignals _signals;
private readonly IVirtualPathProvider _virtualPathProvider; private readonly IVirtualPathProvider _virtualPathProvider;
private readonly WorkContext _workContext; private readonly IWorkContextAccessor _workContextAccessor;
private const string CacheKeyFormat = "tinymce-locales-{0}"; private const string CacheKeyFormat = "tinymce-locales-{0}";
private const string DefaultLanguage = "en"; private const string DefaultLanguage = "en";
@@ -19,12 +19,12 @@ namespace TinyMce.Services {
public TinyMceShapeDisplayEvent( public TinyMceShapeDisplayEvent(
ICacheManager cacheManager, ICacheManager cacheManager,
IVirtualPathProvider virtualPathProvider, IVirtualPathProvider virtualPathProvider,
WorkContext workContext, IWorkContextAccessor workContextAccessor,
ISignals signals) { ISignals signals) {
_signals = signals; _signals = signals;
_cacheManager = cacheManager; _cacheManager = cacheManager;
_virtualPathProvider = virtualPathProvider; _virtualPathProvider = virtualPathProvider;
_workContext = workContext; _workContextAccessor = workContextAccessor;
} }
public override void Displaying(ShapeDisplayingContext context) { public override void Displaying(ShapeDisplayingContext context) {
@@ -40,7 +40,7 @@ namespace TinyMce.Services {
} }
private string GetTinyMceLanguageIdentifier() { private string GetTinyMceLanguageIdentifier() {
var currentCulture = CultureInfo.GetCultureInfo(_workContext.CurrentCulture); var currentCulture = CultureInfo.GetCultureInfo(_workContextAccessor.GetContext().CurrentCulture);
if (currentCulture.Name.Equals(DefaultLanguage, StringComparison.OrdinalIgnoreCase)) if (currentCulture.Name.Equals(DefaultLanguage, StringComparison.OrdinalIgnoreCase))
return currentCulture.Name; return currentCulture.Name;