merged with upstream

Humanizr · Jun 7, 2015 · eb46690 · eb46690
2 parents 86f4fda + e392dc0
commit eb46690
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -1,4 +1,5 @@
 ###In Development
+ - [#416](https://github.com/MehdiK/Humanizer/pull/416): Change BrazilianPortugueseOrdinalizer to PortugueseOrdinalizer
 
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.36.0...master)
 

diff --git a/src/Humanizer/Configuration/OrdinalizerRegistry.cs b/src/Humanizer/Configuration/OrdinalizerRegistry.cs
@@ -11,10 +11,10 @@ public OrdinalizerRegistry() : base(new DefaultOrdinalizer())
             Register("es", new SpanishOrdinalizer());
             Register("it", new ItalianOrdinalizer());
             Register("nl", new DutchOrdinalizer());
-            Register("pt-BR", new BrazilianPortugueseOrdinalizer());
+            Register("pt", new PortugueseOrdinalizer());
             Register("ru", new RussianOrdinalizer());
             Register("tr", new TurkishOrdinalizer());
             Register("uk", new UkrainianOrdinalizer());
         }
     }
-}
+}
diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj
@@ -109,12 +109,12 @@
     <Compile Include="Localisation\NumberToWords\TurkishNumberToWordConverter.cs" />
     <Compile Include="Localisation\Ordinalizers\IOrdinalizer.cs" />
     <Compile Include="Localisation\Ordinalizers\GermanOrdinalizer.cs" />
+    <Compile Include="Localisation\Ordinalizers\PortugueseOrdinalizer.cs" />
     <Compile Include="Localisation\Ordinalizers\RussianOrdinalizer.cs" />
     <Compile Include="Localisation\Ordinalizers\DutchOrdinalizer.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\Ordinalizers\TurkishOrdinalizer.cs" />
     <Compile Include="Localisation\Ordinalizers\ItalianOrdinalizer.cs" />
     <Compile Include="Localisation\Ordinalizers\UkrainianOrdinalizer.cs" />
@@ -194,6 +194,7 @@
     <None Include="Humanizer.snk" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.pt.resx" />
     <EmbeddedResource Include="Properties\Resources.uk.resx" />
     <EmbeddedResource Include="Properties\Resources.zh-Hant.resx" />
     <EmbeddedResource Include="Properties\Resources.zh-Hans.resx" />
@@ -226,7 +227,6 @@
     <EmbeddedResource Include="Properties\Resources.nl.resx" />
     <EmbeddedResource Include="Properties\Resources.resx" />
     <EmbeddedResource Include="Properties\Resources.ro.resx" />
-    <EmbeddedResource Include="Properties\Resources.pt-BR.resx" />
     <EmbeddedResource Include="Properties\Resources.sk.resx" />
     <EmbeddedResource Include="Properties\Resources.sr-Latn.resx" />
     <EmbeddedResource Include="Properties\Resources.sr.resx" />

diff --git a/...alizers/BrazilianPortugueseOrdinalizer.cs → ...ion/Ordinalizers/PortugueseOrdinalizer.cs b/...alizers/BrazilianPortugueseOrdinalizer.cs → ...ion/Ordinalizers/PortugueseOrdinalizer.cs
@@ -1,6 +1,6 @@
 namespace Humanizer.Localisation.Ordinalizers
 {
-    internal class BrazilianPortugueseOrdinalizer : DefaultOrdinalizer
+    internal class PortugueseOrdinalizer : DefaultOrdinalizer
     {
         public override string Convert(int number, string numberString)
         {
@@ -19,4 +19,4 @@ public override string Convert(int number, string numberString, GrammaticalGende
             return numberString + "º";
         }
     }
-}
+}
diff --git a/...Humanizer/Properties/Resources.pt-BR.resx → src/Humanizer/Properties/Resources.pt.resx b/...Humanizer/Properties/Resources.pt-BR.resx → src/Humanizer/Properties/Resources.pt.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema