Fix to words for negative numbers below 1000 in Russian & Ukrainian (#…

…1461)
Humanizr · Feb 25, 2024 · d430089 · d430089
1 parent 96e0130
commit d430089
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Humanizer.Tests/Localisation/ru-RU/NumberToWordsTests.cs b/src/Humanizer.Tests/Localisation/ru-RU/NumberToWordsTests.cs
@@ -4,6 +4,7 @@
 public class NumberToWordsTests
 {
     [Theory]
+    [InlineData(-123, "минус сто двадцать три")]
     [InlineData(0, "ноль")]
     [InlineData(1, "один")]
     [InlineData(10, "десять")]

diff --git a/src/Humanizer.Tests/Localisation/uk-UA/NumberToWordsTests.cs b/src/Humanizer.Tests/Localisation/uk-UA/NumberToWordsTests.cs
@@ -4,6 +4,7 @@
 public class NumberToWordsTests
 {
     [Theory]
+    [InlineData(-123, "мінус сто двадцять три")]
     [InlineData(0, "нуль")]
     [InlineData(1, "один")]
     [InlineData(10, "десять")]

diff --git a/src/Humanizer/Localisation/NumberToWords/RussianNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/RussianNumberToWordsConverter.cs
@@ -31,9 +31,9 @@ public override string Convert(long input, GrammaticalGender gender, bool addAnd
         CollectParts(parts, ref input, 1000000, GrammaticalGender.Masculine, "миллион", "миллиона", "миллионов");
         CollectParts(parts, ref input, 1000, GrammaticalGender.Feminine, "тысяча", "тысячи", "тысяч");
 
-        if (input > 0)
+        if (input != 0)
         {
-            CollectPartsUnderOneThousand(parts, input, gender);
+            CollectPartsUnderOneThousand(parts, Math.Abs(input), gender);
         }
 
         return string.Join(" ", parts);
@@ -175,10 +175,9 @@ static void CollectParts(ICollection<string> parts, ref long number, long diviso
             return;
         }
 
-        number = Math.Abs(number % divisor);
-
         CollectPartsUnderOneThousand(parts, result, gender);
         parts.Add(ChooseOneForGrammaticalNumber(result, forms));
+        number = Math.Abs(number % divisor);
     }
 
     static void CollectOrdinalParts(ICollection<string> parts, ref long number, int divisor, GrammaticalGender gender, string prefixedForm, params string[] forms)

diff --git a/src/Humanizer/Localisation/NumberToWords/UkrainianNumberToWordsConverter.cs b/src/Humanizer/Localisation/NumberToWords/UkrainianNumberToWordsConverter.cs
@@ -31,9 +31,9 @@ public override string Convert(long input, GrammaticalGender gender, bool addAnd
         CollectParts(parts, ref input, 1000000, GrammaticalGender.Masculine, "мільйон", "мільйона", "мільйонів");
         CollectParts(parts, ref input, 1000, GrammaticalGender.Feminine, "тисяча", "тисячі", "тисяч");
 
-        if (input > 0)
+        if (input != 0)
         {
-            CollectPartsUnderOneThousand(parts, input, gender);
+            CollectPartsUnderOneThousand(parts, Math.Abs(input), gender);
         }
 
         return string.Join(" ", parts);
@@ -174,10 +174,9 @@ static void CollectParts(ICollection<string> parts, ref long number, long diviso
             return;
         }
 
-        number = Math.Abs(number % divisor);
-
         CollectPartsUnderOneThousand(parts, result, gender);
         parts.Add(ChooseOneForGrammaticalNumber(result, forms));
+        number = Math.Abs(number % divisor);
     }
 
     static void CollectOrdinalParts(ICollection<string> parts, ref int number, int divisor, GrammaticalGender gender, string prefixedForm, params string[] forms)