- Refactoring in the Orchard.Localization namespace and folders before things grow out of control.

--HG--
branch : dev

src/Orchard.Tests/Localization/CultureManagerTests.cs

@@ -3,13 +3,12 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Web;
-using System.Web.Routing;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.Localization;
 using Orchard.Localization.Records;
+using Orchard.Localization.Services;
 using Orchard.Tests.ContentManagement;
 
 namespace Orchard.Tests.Localization {

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -9,12 +9,12 @@ using Orchard.Core.Settings.Models;
 using Orchard.Data;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Extensions;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.Topology;
 using Orchard.Environment.Topology.Models;
 using Orchard.Localization;
 using Orchard.ContentManagement.MetaData.Services;
+using Orchard.Localization.Services;
 using Orchard.Security;
 using Orchard.Settings;
 using Orchard.Themes;

src/Orchard/Localization/LocalizationModule.cs

@@ -19,9 +19,6 @@ namespace Orchard.Localization {
                 var scope = registration.Activator.LimitType.FullName;
 
                 registration.Activated += (sender, e) => {
-                    //var authenticationService = e.Context.Resolve<IAuthenticationService>();
-                    //var currentUser = authenticationService.GetAuthenticatedUser();
-
                     var localizer = LocalizationUtilities.Resolve(e.Context, scope);
                     userProperty.SetValue(e.Instance, localizer, null);
                 };

src/Orchard/Localization/Services/DefaultCultureManager.cs

@@ -7,7 +7,7 @@ using System.Web.Routing;
 using Orchard.Data;
 using Orchard.Localization.Records;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class DefaultCultureManager : ICultureManager {
         private readonly IRepository<CultureRecord> _cultureRepository;
         private readonly IEnumerable<ICultureSelector> _cultureSelectors;

src/Orchard/Localization/Services/DefaultResourceManager.cs

@@ -1,4 +1,4 @@
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class DefaultResourceManager : IResourceManager {
         // This will use the .po files shortly.
         public string GetLocalizedString(string key, string cultureName) {

src/Orchard/Localization/Services/ICultureManager.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Web;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public interface ICultureManager : IDependency {
         IEnumerable<string> ListCultures();
         void AddCulture(string cultureName);

src/Orchard/Localization/Services/ICultureSelector.cs

@@ -1,6 +1,6 @@
 using System.Web;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class CultureSelectorResult {
         public int Priority { get; set; }
         public string CultureName { get; set; }

src/Orchard/Localization/Services/IResourceManager.cs

@@ -1,4 +1,4 @@
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public interface IResourceManager : IDependency {
         string GetLocalizedString(string key, string cultureName);
     }

src/Orchard/Localization/Services/SiteCultureSelector.cs

@@ -3,7 +3,7 @@ using System.Web;
 using JetBrains.Annotations;
 using Orchard.Settings;
 
-namespace Orchard.Localization {
+namespace Orchard.Localization.Services {
     public class SiteCultureSelector : ICultureSelector {
        protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
 

src/Orchard/Localization/Text.cs

@@ -1,4 +1,5 @@
 using System.Web;
+using Orchard.Localization.Services;
 using Orchard.Logging;
 
 namespace Orchard.Localization {

src/Orchard/Orchard.Framework.csproj

@@ -143,13 +143,13 @@
     <Compile Include="Environment\State\IShellStateManager.cs" />
     <Compile Include="Environment\State\ShellStateCoordinator.cs" />
     <Compile Include="IDependency.cs" />
-    <Compile Include="Localization\DefaultCultureManager.cs" />
+    <Compile Include="Localization\Services\DefaultCultureManager.cs" />
-    <Compile Include="Localization\DefaultResourceManager.cs" />
+    <Compile Include="Localization\Services\DefaultResourceManager.cs" />
-    <Compile Include="Localization\ICultureManager.cs" />
+    <Compile Include="Localization\Services\ICultureManager.cs" />
-    <Compile Include="Localization\ICultureSelector.cs" />
+    <Compile Include="Localization\Services\ICultureSelector.cs" />
-    <Compile Include="Localization\IResourceManager.cs" />
+    <Compile Include="Localization\Services\IResourceManager.cs" />
     <Compile Include="Localization\Records\CultureRecord.cs" />
-    <Compile Include="Localization\SiteCultureSelector.cs" />
+    <Compile Include="Localization\Services\SiteCultureSelector.cs" />
     <Compile Include="Mvc\Html\ThemeExtensions.cs" />
     <Compile Include="Mvc\Routes\IRoutePublisher.cs" />
     <Compile Include="Mvc\Routes\IRouteProvider.cs" />