From 585f375ac8b35defcf7bd5fc7cd5157ded0fbd0d Mon Sep 17 00:00:00 2001
From: MehdiK <me@mehdi-khalili.com>
Date: Fri, 25 Apr 2014 16:35:20 +0430
Subject: [PATCH] simplified the registration mechanism & removed Localiser

---
 ...provalTest.approve_public_api.approved.txt |  4 ++-
 .../Configuration/FormatterRegistry.cs        | 20 ++++++------
 src/Humanizer/Configuration/Localiser.cs      | 16 ----------
 .../Configuration/LocaliserRegistry.cs        | 32 ++++++++-----------
 .../NumberToWordsConverterRegistry.cs         | 22 ++++++-------
 .../Configuration/OrdinalizerRegistry.cs      | 12 +++----
 src/Humanizer/Humanizer.csproj                |  1 -
 7 files changed, 44 insertions(+), 63 deletions(-)
 delete mode 100644 src/Humanizer/Configuration/Localiser.cs

diff --git a/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt b/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
index 0c2afa6ea..6f8a78b63 100644
--- a/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
+++ b/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
@@ -73,7 +73,9 @@ public class Configurator
 
 public class LocaliserRegistry`1
 {
-    public void Register(System.Func<> localiser, System.Globalization.CultureInfo culture) { }
+    public LocaliserRegistry`1() { }
+    public void Register(string localeCode) { }
+    public void RegisterDefault() { }
     public T ResolveForUiCulture() { }
 }
 
diff --git a/src/Humanizer/Configuration/FormatterRegistry.cs b/src/Humanizer/Configuration/FormatterRegistry.cs
index 99b3963be..ec8b1c03a 100644
--- a/src/Humanizer/Configuration/FormatterRegistry.cs
+++ b/src/Humanizer/Configuration/FormatterRegistry.cs
@@ -4,17 +4,17 @@ namespace Humanizer.Configuration
 {
     internal class FormatterRegistry : LocaliserRegistry<IFormatter>
     {
-        public FormatterRegistry() : base(
-            () => new DefaultFormatter(),
-            new Localiser<IFormatter>("ro", () => new RomanianFormatter()),
-            new Localiser<IFormatter>("ru", () => new RussianFormatter()),
-            new Localiser<IFormatter>("ar", () => new ArabicFormatter()),
-            new Localiser<IFormatter>("he", () => new HebrewFormatter()),
-            new Localiser<IFormatter>("sk", () => new CzechSlovakPolishFormatter()),
-            new Localiser<IFormatter>("cs", () => new CzechSlovakPolishFormatter()),
-            new Localiser<IFormatter>("pl", () => new CzechSlovakPolishFormatter()),
-            new Localiser<IFormatter>("sr", () => new SerbianFormatter()))
+        public FormatterRegistry()
         {
+            RegisterDefault<DefaultFormatter>();
+            Register<RomanianFormatter>("ro");
+            Register<RussianFormatter>("ru");
+            Register<ArabicFormatter>("ar");
+            Register<HebrewFormatter>("he");
+            Register<CzechSlovakPolishFormatter>("sk");
+            Register<CzechSlovakPolishFormatter>("cs");
+            Register<CzechSlovakPolishFormatter>("pl");
+            Register<SerbianFormatter>("sr");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Humanizer/Configuration/Localiser.cs b/src/Humanizer/Configuration/Localiser.cs
deleted file mode 100644
index b6a642ba9..000000000
--- a/src/Humanizer/Configuration/Localiser.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Humanizer.Configuration
-{
-    internal class Localiser<T>
-    {
-        public Localiser(string localeCode, Func<T> localiserFactory)
-        {
-            LocaleCode = localeCode;
-            LocaliserFactory = localiserFactory;
-        }
-
-        public string LocaleCode { get; private set; }
-        public Func<T> LocaliserFactory { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Humanizer/Configuration/LocaliserRegistry.cs b/src/Humanizer/Configuration/LocaliserRegistry.cs
index 2caf70669..ada69cec9 100644
--- a/src/Humanizer/Configuration/LocaliserRegistry.cs
+++ b/src/Humanizer/Configuration/LocaliserRegistry.cs
@@ -8,20 +8,11 @@ namespace Humanizer.Configuration
     /// A registry of localised system components with their associated locales
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class LocaliserRegistry<T>
+    public class LocaliserRegistry<T> 
     {
-        private readonly IDictionary<string, Lazy<T>> _localisers;
-
+        private readonly IDictionary<string, Lazy<T>> _localisers = new Dictionary<string, Lazy<T>>();
         private Lazy<T> _defaultLocaliser;
 
-        internal LocaliserRegistry(Func<T> defaultLocaliser, params Localiser<T>[] localisers)
-        {
-            _defaultLocaliser = MakeLazy(defaultLocaliser);
-            _localisers = new Dictionary<string, Lazy<T>>();
-            foreach (var localiser in localisers)
-                _localisers.Add(localiser.LocaleCode, MakeLazy(localiser.LocaliserFactory));
-        }
-
         Lazy<T> MakeLazy(Func<T> factoryMethod)
         {
             return new Lazy<T>(factoryMethod);
@@ -46,16 +37,21 @@ public T ResolveForUiCulture()
         }
 
         /// <summary>
-        /// Set the localiser for the culture provided or the default localiser if the culture is not provided
+        /// Registers the localiser for the culture provided 
         /// </summary>
-        public void Register(Func<T> localiser, CultureInfo culture = null)
+        public void Register<TLocaliser>(string localeCode)
+            where TLocaliser: T, new()
         {
-            var lazyLocaliser = MakeLazy(localiser);
+            _localisers[localeCode] = MakeLazy(() => new TLocaliser());
+        }
 
-            if (culture == null)
-                _defaultLocaliser = lazyLocaliser;
-            else
-                _localisers[culture.Name] = lazyLocaliser;
+        /// <summary>
+        /// Registers the localiser as the catch all 
+        /// </summary>
+        public void RegisterDefault<TLocaliser>()
+            where TLocaliser: T, new ()
+        {
+            _defaultLocaliser = MakeLazy(() => new TLocaliser());
         }
     }
 }
diff --git a/src/Humanizer/Configuration/NumberToWordsConverterRegistry.cs b/src/Humanizer/Configuration/NumberToWordsConverterRegistry.cs
index 6331fc884..40e18ef81 100644
--- a/src/Humanizer/Configuration/NumberToWordsConverterRegistry.cs
+++ b/src/Humanizer/Configuration/NumberToWordsConverterRegistry.cs
@@ -5,18 +5,18 @@ namespace Humanizer.Configuration
     internal class NumberToWordsConverterRegistry : LocaliserRegistry<INumberToWordsConverter>
     {
         public NumberToWordsConverterRegistry()
-            : base(() => new DefaultNumberToWordsConverter(),
-                new Localiser<INumberToWordsConverter>("en", () => new EnglishNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("ar", () => new ArabicNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("fa", () => new FarsiNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("es", () => new SpanishNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("pl", () => new PolishNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("pt-BR", () => new BrazilianPortugueseNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("ru", () => new RussianNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("fr", () => new FrenchNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("nl", () => new DutchNumberToWordsConverter()),
-                new Localiser<INumberToWordsConverter>("he", () => new HebrewNumberToWordsConverter()))
         {
+            RegisterDefault<DefaultNumberToWordsConverter>();
+            Register<EnglishNumberToWordsConverter>("en");
+            Register<ArabicNumberToWordsConverter>("ar");
+            Register<FarsiNumberToWordsConverter>("fa");
+            Register<SpanishNumberToWordsConverter>("es");
+            Register<PolishNumberToWordsConverter>("pl");
+            Register<BrazilianPortugueseNumberToWordsConverter>("pt-BR");
+            Register<RussianNumberToWordsConverter>("ru");
+            Register<FrenchNumberToWordsConverter>("fr");
+            Register<DutchNumberToWordsConverter>("nl");
+            Register<HebrewNumberToWordsConverter>("he");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Humanizer/Configuration/OrdinalizerRegistry.cs b/src/Humanizer/Configuration/OrdinalizerRegistry.cs
index 617594790..6e1249e32 100644
--- a/src/Humanizer/Configuration/OrdinalizerRegistry.cs
+++ b/src/Humanizer/Configuration/OrdinalizerRegistry.cs
@@ -5,12 +5,12 @@ namespace Humanizer.Configuration
     internal class OrdinalizerRegistry : LocaliserRegistry<IOrdinalizer>
     {
         public OrdinalizerRegistry()
-            : base(() => new DefaultOrdinalizer(),
-                new Localiser<IOrdinalizer>("en", () => new EnglishOrdinalizer()),
-                new Localiser<IOrdinalizer>("es", () => new SpanishOrdinalizer()),
-                new Localiser<IOrdinalizer>("pt-BR", () => new BrazilianPortugueseOrdinalizer()),
-                new Localiser<IOrdinalizer>("ru", () => new RussianOrdinalizer()))
         {
+            RegisterDefault<DefaultOrdinalizer>();
+            Register<EnglishOrdinalizer>("en");
+            Register<SpanishOrdinalizer>("es");
+            Register<RussianOrdinalizer>("ru");
+            Register<BrazilianPortugueseOrdinalizer>("pt-BR");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj
index 19733e06b..4846af696 100644
--- a/src/Humanizer/Humanizer.csproj
+++ b/src/Humanizer/Humanizer.csproj
@@ -59,7 +59,6 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Configuration\Localiser.cs" />
     <Compile Include="Localisation\Formatters\SerbianFormatter.cs" />
     <Compile Include="Configuration\LocaliserRegistry.cs" />
     <Compile Include="Configuration\FormatterRegistry.cs" />