Reorganize Localisation namespaces closes Humanizr#206

hazzik · Apr 17, 2014 · d084f3f · d084f3f
1 parent 39a9b44
commit d084f3f
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 71 deletions.
diff --git a/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt b/src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
@@ -66,7 +66,7 @@ public class CasingExtensions
 public class Configurator
 {
     public Humanizer.DateTimeHumanizeStrategy.IDateTimeHumanizeStrategy DateTimeHumanizeStrategy { get; set; }
-    public Humanizer.Localisation.Formatters.IFormatter Formatter { get; }
+    public Humanizer.Localisation.IFormatter Formatter { get; }
 }
 
 public class DateHumanizeExtensions

diff --git a/src/Humanizer/Configuration/Configurator.cs b/src/Humanizer/Configuration/Configurator.cs
@@ -2,7 +2,12 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Humanizer.DateTimeHumanizeStrategy;
-using Humanizer.Localisation.Formatters;
+using Humanizer.Localisation;
+using Humanizer.Localisation.Arabic;
+using Humanizer.Localisation.CzechSlovakPolish;
+using Humanizer.Localisation.Hebrew;
+using Humanizer.Localisation.Romanian;
+using Humanizer.Localisation.Russian;
 
 namespace Humanizer.Configuration
 {

diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj
@@ -64,37 +64,37 @@
     <AssemblyOriginatorKeyFile>Humanizer.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Localisation\NumberToWords\BrazilianPortugueseNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\BrazilianPortuguese\BrazilianPortugueseNumberToWordsConverter.cs" />
     <Compile Include="GrammaticalCase.cs" />
     <Compile Include="GrammaticalGender.cs" />
-    <Compile Include="Localisation\GrammaticalNumber\RussianGrammaticalNumber.cs" />
-    <Compile Include="Localisation\GrammaticalNumber\RussianGrammaticalNumberDetector.cs" />
-    <Compile Include="Localisation\NumberToWords\DutchNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\DefaultNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\FarsiNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\ArabicNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Russian\RussianGrammaticalNumber.cs" />
+    <Compile Include="Localisation\Russian\RussianGrammaticalNumberDetector.cs" />
+    <Compile Include="Localisation\Dutch\DutchNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\DefaultNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Farsi\FarsiNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Arabic\ArabicNumberToWordsConverter.cs" />
     <Compile Include="Bytes\ByteSize.cs" />
     <Compile Include="Bytes\ByteSizeExtensions.cs" />
     <Compile Include="CasingExtensions.cs" />
     <Compile Include="Configuration\Configurator.cs" />
     <Compile Include="DateHumanizeExtensions.cs" />
-    <Compile Include="Localisation\NumberToWords\EnglishNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\FrenchNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\HebrewNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\Formatters\CzechSlovakPolishFormatter.cs" />
+    <Compile Include="Localisation\English\EnglishNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\French\FrenchNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Hebrew\HebrewNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\CzechSlovakPolish\CzechSlovakPolishFormatter.cs" />
     <Compile Include="DateTimeHumanizeStrategy\DefaultDateTimeHumanizeStrategy.cs" />
     <Compile Include="DateTimeHumanizeStrategy\IDateTimeHumanizeStrategy.cs" />
     <Compile Include="DateTimeHumanizeStrategy\PrecisionDateTimeHumanizeStrategy.cs" />
-    <Compile Include="Localisation\NumberToWords\PolishNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\NumberToWords\RussianNumberToWordsConverter.cs" />
-    <Compile Include="Localisation\Formatters\HebrewFormatter.cs" />
-    <Compile Include="Localisation\Ordinalizers\RussianOrdinalizer.cs" />
-    <Compile Include="Localisation\Ordinalizers\SpanishOrdinalizer.cs" />
-    <Compile Include="Localisation\Ordinalizers\DefaultOrdinalizer.cs" />
-    <Compile Include="Localisation\Ordinalizers\EnglishOrdinalizer.cs" />
-    <Compile Include="Localisation\Ordinalizers\BrazilianPortugueseOrdinalizer.cs" />
+    <Compile Include="Localisation\Russian\RussianOrdinalizer.cs" />
+    <Compile Include="Localisation\Spanish\SpanishOrdinalizer.cs" />
+    <Compile Include="Localisation\DefaultOrdinalizer.cs" />
+    <Compile Include="Localisation\English\EnglishOrdinalizer.cs" />
+    <Compile Include="Localisation\BrazilianPortuguese\BrazilianPortugueseOrdinalizer.cs" />
+    <Compile Include="Localisation\CzechSlovakPolish\PolishNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Russian\RussianNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Hebrew\HebrewFormatter.cs" />
     <Compile Include="Localisation\Tense.cs" />
-    <Compile Include="Localisation\NumberToWords\SpanishNumberToWordsConverter.cs" />
+    <Compile Include="Localisation\Spanish\SpanishNumberToWordsConverter.cs" />
     <Compile Include="TimeSpanHumanizeExtensions.cs" />
     <Compile Include="FluentDate\In.SomeTimeFrom.cs">
       <AutoGen>True</AutoGen>
@@ -106,9 +106,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>On.Days.tt</DependentUpon>
     </Compile>
-    <Compile Include="Localisation\Formatters\ArabicFormatter.cs" />
-    <Compile Include="Localisation\Formatters\DefaultFormatter.cs" />
-    <Compile Include="Localisation\Formatters\IFormatter.cs" />
+    <Compile Include="Localisation\Arabic\ArabicFormatter.cs" />
+    <Compile Include="Localisation\DefaultFormatter.cs" />
+    <Compile Include="Localisation\IFormatter.cs" />
     <Compile Include="Localisation\ResourceKeys.Common.cs" />
     <Compile Include="Localisation\ResourceKeys.DateHumanize.cs" />
     <Compile Include="Localisation\ResourceKeys.TimeSpanHumanize.cs" />
@@ -130,8 +130,8 @@
       <DependentUpon>In.Months.tt</DependentUpon>
     </Compile>
     <Compile Include="Localisation\Resources.cs" />
-    <Compile Include="Localisation\Formatters\RomanianFormatter.cs" />
-    <Compile Include="Localisation\Formatters\RussianFormatter.cs" />
+    <Compile Include="Localisation\Romanian\RomanianFormatter.cs" />
+    <Compile Include="Localisation\Russian\RussianFormatter.cs" />
     <Compile Include="NumberToTimeSpanExtensions.cs" />
     <Compile Include="InflectorExtensions.cs" />
     <Compile Include="LetterCasing.cs" />

diff --git a/...ocalisation/Formatters/ArabicFormatter.cs → ...er/Localisation/Arabic/ArabicFormatter.cs b/...ocalisation/Formatters/ArabicFormatter.cs → ...er/Localisation/Arabic/ArabicFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation.Arabic
 {
     internal class ArabicFormatter : DefaultFormatter
     {

diff --git a/...erToWords/ArabicNumberToWordsConverter.cs → ...on/Arabic/ArabicNumberToWordsConverter.cs b/...erToWords/ArabicNumberToWordsConverter.cs → ...on/Arabic/ArabicNumberToWordsConverter.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Arabic
 {
     internal class ArabicNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...zilianPortugueseNumberToWordsConverter.cs → ...zilianPortugueseNumberToWordsConverter.cs b/...zilianPortugueseNumberToWordsConverter.cs → ...zilianPortugueseNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.BrazilianPortuguese
 {
     internal class BrazilianPortugueseNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...alizers/BrazilianPortugueseOrdinalizer.cs → ...tuguese/BrazilianPortugueseOrdinalizer.cs b/...alizers/BrazilianPortugueseOrdinalizer.cs → ...tuguese/BrazilianPortugueseOrdinalizer.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Ordinalizers
+namespace Humanizer.Localisation.BrazilianPortuguese
 {
     internal class BrazilianPortugueseOrdinalizer : DefaultOrdinalizer
     {

diff --git a/.../Formatters/CzechSlovakPolishFormatter.cs → ...lovakPolish/CzechSlovakPolishFormatter.cs b/.../Formatters/CzechSlovakPolishFormatter.cs → ...lovakPolish/CzechSlovakPolishFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation.CzechSlovakPolish
 {
     internal class CzechSlovakPolishFormatter : DefaultFormatter
     {

diff --git a/...erToWords/PolishNumberToWordsConverter.cs → ...vakPolish/PolishNumberToWordsConverter.cs b/...erToWords/PolishNumberToWordsConverter.cs → ...vakPolish/PolishNumberToWordsConverter.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.CzechSlovakPolish
 {
     internal class PolishNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...calisation/Formatters/DefaultFormatter.cs → ...umanizer/Localisation/DefaultFormatter.cs b/...calisation/Formatters/DefaultFormatter.cs → ...umanizer/Localisation/DefaultFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation
 {
     /// <summary>
     /// Default implementation of IFormatter interface.

diff --git a/...rToWords/DefaultNumberToWordsConverter.cs → ...lisation/DefaultNumberToWordsConverter.cs b/...rToWords/DefaultNumberToWordsConverter.cs → ...lisation/DefaultNumberToWordsConverter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation
 {
     internal class DefaultNumberToWordsConverter
     {

diff --git a/...sation/Ordinalizers/DefaultOrdinalizer.cs → ...anizer/Localisation/DefaultOrdinalizer.cs b/...sation/Ordinalizers/DefaultOrdinalizer.cs → ...anizer/Localisation/DefaultOrdinalizer.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Ordinalizers
+namespace Humanizer.Localisation
 {
     internal class DefaultOrdinalizer
     {

diff --git a/...berToWords/DutchNumberToWordsConverter.cs → ...tion/Dutch/DutchNumberToWordsConverter.cs b/...berToWords/DutchNumberToWordsConverter.cs → ...tion/Dutch/DutchNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Dutch
 {
     /// <summary>
     /// Dutch spelling of numbers is not really officially regulated.

diff --git a/...rToWords/EnglishNumberToWordsConverter.cs → .../English/EnglishNumberToWordsConverter.cs b/...rToWords/EnglishNumberToWordsConverter.cs → .../English/EnglishNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.English
 {
     internal class EnglishNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...sation/Ordinalizers/EnglishOrdinalizer.cs → ...ocalisation/English/EnglishOrdinalizer.cs b/...sation/Ordinalizers/EnglishOrdinalizer.cs → ...ocalisation/English/EnglishOrdinalizer.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Ordinalizers
+namespace Humanizer.Localisation.English
 {
     internal class EnglishOrdinalizer : DefaultOrdinalizer
     {

diff --git a/...berToWords/FarsiNumberToWordsConverter.cs → ...tion/Farsi/FarsiNumberToWordsConverter.cs b/...berToWords/FarsiNumberToWordsConverter.cs → ...tion/Farsi/FarsiNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Farsi
 {
     internal class FarsiNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...erToWords/FrenchNumberToWordsConverter.cs → ...on/French/FrenchNumberToWordsConverter.cs b/...erToWords/FrenchNumberToWordsConverter.cs → ...on/French/FrenchNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.French
 {
     internal class FrenchNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/src/Humanizer/Localisation/GrammaticalNumber/RussianGrammaticalNumber.cs b/src/Humanizer/Localisation/GrammaticalNumber/RussianGrammaticalNumber.cs
diff --git a/...ocalisation/Formatters/HebrewFormatter.cs → ...er/Localisation/Hebrew/HebrewFormatter.cs b/...ocalisation/Formatters/HebrewFormatter.cs → ...er/Localisation/Hebrew/HebrewFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation.Hebrew
 {
     internal class HebrewFormatter : DefaultFormatter
     {

diff --git a/...erToWords/HebrewNumberToWordsConverter.cs → ...on/Hebrew/HebrewNumberToWordsConverter.cs b/...erToWords/HebrewNumberToWordsConverter.cs → ...on/Hebrew/HebrewNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Hebrew
 {
     internal class HebrewNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...zer/Localisation/Formatters/IFormatter.cs → src/Humanizer/Localisation/IFormatter.cs b/...zer/Localisation/Formatters/IFormatter.cs → src/Humanizer/Localisation/IFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation
 {
     /// <summary>
     /// Implement this interface if your language has complex rules around dealing with numbers. 

diff --git a/...alisation/Formatters/RomanianFormatter.cs → ...ocalisation/Romanian/RomanianFormatter.cs b/...alisation/Formatters/RomanianFormatter.cs → ...ocalisation/Romanian/RomanianFormatter.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation.Romanian
 {
     internal class RomanianFormatter : DefaultFormatter
     {

diff --git a/...calisation/Formatters/RussianFormatter.cs → .../Localisation/Russian/RussianFormatter.cs b/...calisation/Formatters/RussianFormatter.cs → .../Localisation/Russian/RussianFormatter.cs
@@ -1,6 +1,4 @@
-using Humanizer.Localisation.GrammaticalNumber;
-
-namespace Humanizer.Localisation.Formatters
+namespace Humanizer.Localisation.Russian
 {
     internal class RussianFormatter : DefaultFormatter
     {

diff --git a/src/Humanizer/Localisation/Russian/RussianGrammaticalNumber.cs b/src/Humanizer/Localisation/Russian/RussianGrammaticalNumber.cs
@@ -0,0 +1,9 @@
+namespace Humanizer.Localisation.Russian
+{
+    internal enum RussianGrammaticalNumber
+    {
+        Singular,
+        Paucal,
+        Plural
+    }
+}
diff --git a/...umber/RussianGrammaticalNumberDetector.cs → ...ssian/RussianGrammaticalNumberDetector.cs b/...umber/RussianGrammaticalNumberDetector.cs → ...ssian/RussianGrammaticalNumberDetector.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.GrammaticalNumber
+namespace Humanizer.Localisation.Russian
 {
     internal static class RussianGrammaticalNumberDetector
     {

diff --git a/...rToWords/RussianNumberToWordsConverter.cs → .../Russian/RussianNumberToWordsConverter.cs b/...rToWords/RussianNumberToWordsConverter.cs → .../Russian/RussianNumberToWordsConverter.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Humanizer.Localisation.GrammaticalNumber;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Russian
 {
     internal class RussianNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...sation/Ordinalizers/RussianOrdinalizer.cs → ...ocalisation/Russian/RussianOrdinalizer.cs b/...sation/Ordinalizers/RussianOrdinalizer.cs → ...ocalisation/Russian/RussianOrdinalizer.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Ordinalizers
+namespace Humanizer.Localisation.Russian
 {
     internal class RussianOrdinalizer : DefaultOrdinalizer
     {

diff --git a/...rToWords/SpanishNumberToWordsConverter.cs → .../Spanish/SpanishNumberToWordsConverter.cs b/...rToWords/SpanishNumberToWordsConverter.cs → .../Spanish/SpanishNumberToWordsConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Humanizer.Localisation.NumberToWords
+namespace Humanizer.Localisation.Spanish
 {
     internal class SpanishNumberToWordsConverter : DefaultNumberToWordsConverter
     {

diff --git a/...sation/Ordinalizers/SpanishOrdinalizer.cs → ...ocalisation/Spanish/SpanishOrdinalizer.cs b/...sation/Ordinalizers/SpanishOrdinalizer.cs → ...ocalisation/Spanish/SpanishOrdinalizer.cs
@@ -1,4 +1,4 @@
-namespace Humanizer.Localisation.Ordinalizers
+namespace Humanizer.Localisation.Spanish
 {
     internal class SpanishOrdinalizer : DefaultOrdinalizer
     {

diff --git a/src/Humanizer/NumberToWordsExtension.cs b/src/Humanizer/NumberToWordsExtension.cs
@@ -1,7 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
-using Humanizer.Localisation.NumberToWords;
+using Humanizer.Localisation;
+using Humanizer.Localisation.Arabic;
+using Humanizer.Localisation.BrazilianPortuguese;
+using Humanizer.Localisation.CzechSlovakPolish;
+using Humanizer.Localisation.Dutch;
+using Humanizer.Localisation.English;
+using Humanizer.Localisation.Farsi;
+using Humanizer.Localisation.French;
+using Humanizer.Localisation.Hebrew;
+using Humanizer.Localisation.Russian;
+using Humanizer.Localisation.Spanish;
 
 namespace Humanizer
 {

diff --git a/src/Humanizer/OrdinalizeExtensions.cs b/src/Humanizer/OrdinalizeExtensions.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using Humanizer.Localisation.Ordinalizers;
+using Humanizer.Localisation;
+using Humanizer.Localisation.BrazilianPortuguese;
+using Humanizer.Localisation.English;
+using Humanizer.Localisation.Russian;
+using Humanizer.Localisation.Spanish;
 
 namespace Humanizer
 {