Merge branch 'master' into features/add_lv

vnsharanin · Apr 1, 2020 · 9a05b49 · 9a05b49
2 parents c89ceb2 + 745ba2d
commit 9a05b49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Humanizer.Tests.Shared/Localisation/es/NumberToWordsTests.cs b/src/Humanizer.Tests.Shared/Localisation/es/NumberToWordsTests.cs
@@ -52,13 +52,13 @@ public void ToWords(int number, string expected)
 
         // TODO: This data is suspect since null cannot go into GramaticalGender
         [Theory]
-        // [InlineData(1, "primer", null)]
+        [InlineData(1, "primer", GrammaticalGender.Neuter)]
         [InlineData(1, "primero", GrammaticalGender.Masculine)]
         [InlineData(1, "primera", GrammaticalGender.Feminine)]
         [InlineData(2, "segundo", GrammaticalGender.Masculine)]
         [InlineData(2, "segunda", GrammaticalGender.Feminine)]
         [InlineData(2, "segundo", GrammaticalGender.Neuter)]
-        // [InlineData(3, "tercer", null)]
+        [InlineData(3, "tercer", GrammaticalGender.Neuter)]
         [InlineData(3, "tercero", GrammaticalGender.Masculine)]
         [InlineData(3, "tercera", GrammaticalGender.Feminine)]
         //  [InlineData(11, "once", null)]

diff --git a/src/Humanizer/Localisation/NumberToWords/SpanishNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/SpanishNumberToWordsConverter.cs
@@ -179,6 +179,10 @@ public override string ConvertToOrdinal(int number, GrammaticalGender gender)
                 {
                     towords = towords.TrimEnd('o') + "a";
                 }
+                else if (gender == GrammaticalGender.Neuter && (number == 1 || number == 3))
+                {
+                    towords = towords.TrimEnd('o');
+                }
 
                 parts.Add(towords);
             }