fix russian Kotlin-Polytech#2

vladdenisov · Mar 3, 2022 · 2bb9f17 · 2bb9f17
1 parent db1d94b
commit 2bb9f17
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/lesson4/task1/List.kt b/src/lesson4/task1/List.kt
@@ -352,12 +352,15 @@ fun russian(n: Int): String {
                             triadResult += " две тысячи "
                         } else if (triad[1].digitToIntOrNull()!! in 5..9) {
                             triadResult += firstDecade[triad[1].digitToIntOrNull()!!] + " тысяч "
-                        } else if (triad[1] == '0') {
-                            triadResult += " тысяч "
                         } else {
-                            triadResult += firstDecade[triad[1].digitToIntOrNull()!!] + " тысячи "
-                        }
+                            triadResult += when (triad[1]) {
+                                '0' -> " тысяч "
+                                '1' -> "одна тысяча "
+                                '2' -> " две тысячи "
+                                else -> firstDecade[triad[1].digitToIntOrNull()!!] + " тысячи "
 
+                            }
+                        }
                     } else {
                         if (triad[1] == '0' && triad[2] == '0') {
                             triadResult += hundreds[triad[0].digitToIntOrNull()!!] + " тысяч "