Updating WorkContext pointer for class and adding feature names to URL Transliteration generation

src/Orchard.Web/Modules/Orchard.Localization/Events/TransliterationSlugEventHandler.cs

@@ -5,7 +5,7 @@ using Orchard.Environment.Extensions;
 using Orchard.Localization.Services;
 
 namespace Orchard.Localization.Events {
-    [OrchardFeature("Orchard.Localization.Transliteration")]
+    [OrchardFeature("Orchard.Localization.Transliteration.SlugGeneration")]
     public class TransliterationSlugEventHandler : ISlugEventHandler {
         private readonly ITransliterationService _transliterationService;
 

src/Orchard.Web/Modules/Orchard.Localization/Extensions/Constants.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Orchard.Localization {
+namespace Orchard.Localization {
     public static class Constants {
         public static string TransliterationDefaultValue = @"
 [Input]

src/Orchard.Web/Modules/Orchard.Localization/Module.txt

@@ -25,4 +25,9 @@ Features:
 		Description: Enabled transliteration of content
 		Category: Content
 		Name: Transliteration
-		Dependencies: Orchard.Localization
+		Dependencies: Orchard.Localization
+	Orchard.Localization.Transliteration.SlugGeneration:
+		Description: Enabled transliteration of the slug when creating a piece of content
+		Category: Content
+		Name: Url Transliteration
+		Dependencies: Orchard.Localization.Transliteration

src/Orchard.Web/Modules/Orchard.Localization/Providers/CultureStorageProvider.cs

@@ -2,10 +2,11 @@ using System;
 using System.Web;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions;
+using Orchard.Localization.Services;
 using Orchard.Mvc;
 using Orchard.Services;
 
-namespace Orchard.Localization.Services {
+namespace Orchard.Localization.Providers {
     [OrchardFeature("Orchard.Localization.CutlureSelector")]
     public class CultureStorageProvider : ICultureStorageProvider {
         private readonly IHttpContextAccessor _httpContextAccessor;

src/Orchard.Web/Modules/Orchard.Localization/Providers/ICultureStorageProvider.cs

@@ -1,4 +1,4 @@
-namespace Orchard.Localization.Services {
+namespace Orchard.Localization.Providers {
     public interface ICultureStorageProvider : IDependency {
         void SetCulture(string culture);
         string GetCulture();

src/Orchard.Web/Modules/Orchard.Localization/Services/CultureService.cs

@@ -3,6 +3,7 @@ using System.Globalization;
 using System.Linq;
 using Orchard.Data;
 using Orchard.Environment.Extensions;
+using Orchard.Localization.Providers;
 using Orchard.Localization.Records;
 using Orchard.Mvc;
 

src/Orchard.Web/Modules/Orchard.Localization/Views/TransliterationAdmin/Create.cshtml

@@ -1,4 +1,5 @@
 @using System.Globalization
+@using Orchard.Localization
 @model Orchard.Localization.ViewModels.CreateTransliterationViewModel
 
 @{
@@ -7,7 +8,7 @@
     var value = Model.Rules;
 
     if (string.IsNullOrWhiteSpace(value)) {
-        value = Orchard.Localization.Constants.TransliterationDefaultValue;
+        value = Constants.TransliterationDefaultValue;
     }
 
     var cultures = CultureInfo.GetCultures(CultureTypes.SpecificCultures);

src/Orchard.Web/Modules/TinyMce/Services/TinyMceShapeDisplayEvent.cs

@@ -11,7 +11,7 @@ namespace TinyMce.Services {
         private readonly ICacheManager _cacheManager;
         private readonly ISignals _signals;
         private readonly IVirtualPathProvider _virtualPathProvider;
-        private readonly IWorkContextAccessor _workContextAccessor;
+        private readonly WorkContext _workContext;
 
         private const string CacheKeyFormat = "tinymce-locales-{0}";
         private const string DefaultLanguage = "en";
@@ -24,7 +24,7 @@ namespace TinyMce.Services {
             _signals = signals;
             _cacheManager = cacheManager;
             _virtualPathProvider = virtualPathProvider;
-            _workContextAccessor = workContextAccessor;
+            _workContext = workContextAccessor.GetContext();
         }
 
         public override void Displaying(ShapeDisplayingContext context) {
@@ -40,7 +40,7 @@ namespace TinyMce.Services {
         }
 
         private string GetTinyMceLanguageIdentifier() {
-            var currentCulture = CultureInfo.GetCultureInfo(_workContextAccessor.GetContext().CurrentCulture);
+            var currentCulture = CultureInfo.GetCultureInfo(_workContext.CurrentCulture);
 
             if (currentCulture.Name.Equals(DefaultLanguage, StringComparison.OrdinalIgnoreCase))
                 return currentCulture.Name;