From 3e40d87a060b46cbb13fda2ddc066a4b2e94d5ea Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Fri, 17 Sep 2010 13:22:08 -0700
Subject: [PATCH] Renamed localization IResourceManager to
 ILocalizedStringManager to avoid confusion with
 Orchard.UI.Resources.IResourceManager.

--HG--
branch : dev
rename : src/Orchard/Localization/Services/DefaultResourceManager.cs => src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
rename : src/Orchard/Localization/Services/IResourceManager.cs => src/Orchard/Localization/Services/ILocalizedStringManager.cs
---
 ...esourceManager.cs => DefaultLocalizedStringManager.cs} | 4 ++--
 .../{IResourceManager.cs => ILocalizedStringManager.cs}   | 2 +-
 src/Orchard/Localization/Text.cs                          | 8 ++++----
 src/Orchard/Orchard.Framework.csproj                      | 4 ++--
 src/ResourceManager.txt                                   | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename src/Orchard/Localization/Services/{DefaultResourceManager.cs => DefaultLocalizedStringManager.cs} (96%)
 rename src/Orchard/Localization/Services/{IResourceManager.cs => ILocalizedStringManager.cs} (67%)

diff --git a/src/Orchard/Localization/Services/DefaultResourceManager.cs b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
similarity index 96%
rename from src/Orchard/Localization/Services/DefaultResourceManager.cs
rename to src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
index 95e12382a..6802f19a4 100644
--- a/src/Orchard/Localization/Services/DefaultResourceManager.cs
+++ b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
@@ -8,7 +8,7 @@ using Orchard.Environment.Extensions;
 using Orchard.FileSystems.WebSite;
 
 namespace Orchard.Localization.Services {
-    public class DefaultResourceManager : IResourceManager {
+    public class DefaultLocalizedStringManager : ILocalizedStringManager {
         private readonly IWebSiteFolder _webSiteFolder;
         private readonly ICultureManager _cultureManager;
         private readonly IExtensionManager _extensionManager;
@@ -20,7 +20,7 @@ namespace Orchard.Localization.Services {
         const string RootLocalizationFilePathFormat = "~/App_Data/Localization/{0}/orchard.root.po";
         const string TenantLocalizationFilePathFormat = "~/App_Data/Sites/{0}/Localization/{1}/orchard.po";
 
-        public DefaultResourceManager(
+        public DefaultLocalizedStringManager(
             ICultureManager cultureManager, 
             IWebSiteFolder webSiteFolder, 
             IExtensionManager extensionManager,
diff --git a/src/Orchard/Localization/Services/IResourceManager.cs b/src/Orchard/Localization/Services/ILocalizedStringManager.cs
similarity index 67%
rename from src/Orchard/Localization/Services/IResourceManager.cs
rename to src/Orchard/Localization/Services/ILocalizedStringManager.cs
index bf4802307..ca9ed8854 100644
--- a/src/Orchard/Localization/Services/IResourceManager.cs
+++ b/src/Orchard/Localization/Services/ILocalizedStringManager.cs
@@ -1,5 +1,5 @@
 namespace Orchard.Localization.Services {
-    public interface IResourceManager : IDependency {
+    public interface ILocalizedStringManager : IDependency {
         string GetLocalizedString(string scope, string text, string cultureName);
     }
 }
diff --git a/src/Orchard/Localization/Text.cs b/src/Orchard/Localization/Text.cs
index 59bd517c3..5eed643aa 100644
--- a/src/Orchard/Localization/Text.cs
+++ b/src/Orchard/Localization/Text.cs
@@ -9,12 +9,12 @@ namespace Orchard.Localization {
     public class Text : IText {
         private readonly string _scope;
         private readonly ICultureManager _cultureManager;
-        private readonly IResourceManager _resourceManager;
+        private readonly ILocalizedStringManager _localizedStringManager;
 
-        public Text(string scope, ICultureManager cultureManager, IResourceManager resourceManager) {
+        public Text(string scope, ICultureManager cultureManager, ILocalizedStringManager localizedStringManager) {
             _scope = scope;
             _cultureManager = cultureManager;
-            _resourceManager = resourceManager;
+            _localizedStringManager = localizedStringManager;
             Logger = NullLogger.Instance;
         }
 
@@ -24,7 +24,7 @@ namespace Orchard.Localization {
             Logger.Debug("{0} localizing '{1}'", _scope, textHint);
 
             string currentCulture = HttpContext.Current == null ? _cultureManager.GetSiteCulture() : _cultureManager.GetCurrentCulture(new HttpContextWrapper(HttpContext.Current));
-            var localizedFormat = _resourceManager.GetLocalizedString(_scope, textHint, currentCulture);
+            var localizedFormat = _localizedStringManager.GetLocalizedString(_scope, textHint, currentCulture);
 
             return args.Length == 0 
                 ? new LocalizedString(localizedFormat, _scope, textHint, args)
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index fab9242d9..cbb9e5f53 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -152,6 +152,8 @@
     <Compile Include="DisplayManagement\Descriptors\ShapeTableBuilder.cs" />
     <Compile Include="DisplayManagement\Implementation\IShapeFactoryEvents.cs" />
     <Compile Include="DisplayManagement\Shapes\ITagBuilderFactory.cs" />
+    <Compile Include="Localization\Services\DefaultLocalizedStringManager.cs" />
+    <Compile Include="Localization\Services\ILocalizedStringManager.cs" />
     <Compile Include="Mvc\IOrchardViewPage.cs" />
     <Compile Include="Mvc\Spooling\HtmlStringWriter.cs" />
     <Compile Include="Mvc\ViewEngines\Razor\RazorViewEngine.cs" />
@@ -546,12 +548,10 @@
     <Compile Include="Indexing\NullSearchBuilder.cs" />
     <Compile Include="Indexing\IIndexNotifierHandler.cs" />
     <Compile Include="Localization\Services\DefaultCultureManager.cs" />
-    <Compile Include="Localization\Services\DefaultResourceManager.cs" />
     <Compile Include="Indexing\DefaultIndexManager.cs" />
     <Compile Include="Indexing\IIndexManager.cs" />
     <Compile Include="Localization\Services\ICultureManager.cs" />
     <Compile Include="Localization\Services\ICultureSelector.cs" />
-    <Compile Include="Localization\Services\IResourceManager.cs" />
     <Compile Include="Localization\Records\CultureRecord.cs" />
     <Compile Include="Localization\Services\SiteCultureSelector.cs" />
     <Compile Include="Mvc\Html\TemplateViewModelExtensions.cs" />
diff --git a/src/ResourceManager.txt b/src/ResourceManager.txt
index eaeb7bb9d..7757f5692 100644
--- a/src/ResourceManager.txt
+++ b/src/ResourceManager.txt
@@ -1,8 +1,8 @@
 ResourceManager Notes from Bertrand
 ====================================
 
-No default parameters
-Refactor to take over resource manager name
+x No default parameters
+x Refactor to take over resource manager name
 Better interface pattern for defining resources
 Script.Load API that is a view engine specific helper and that directs rendering within the using (using Idisposable pattern) to a buffer that can be rendered later.
 Script.Require returns RequireSettings and has fluent api to add stuff later.
@@ -23,12 +23,12 @@ Raw notes from Dave during meeting:
 	Script.Require("~/modules/mymodule/scripts/foo.min?.js")
 	Script.Require("/orchardlocal/dfdfd/foo.js")
 
-// no defualt params
+// x no defualt params
 // better interface/pattern for defining resources
 // Script.Load (view-engine specific helper required)
 // Script.Require returns RequireSettings and has fluent api?
 // Add Script.RequireHead <-- or no due to fluent api
-// Rename Localization resource manager
+// x Rename Localization resource manager
 // Require w/ app relative url means inline definitin of url only, resolved url is resource name
 // Site setting for debug mode true false or from web.config setting
 // Fix TODO items, including moving all copies of jQuery and jQuery related scripts into the new Orchard.jQuery module.