Fixing plural rules for macedonian

cakephp · Jul 21, 2014 · e7b0dd1 · e7b0dd1
1 parent 10cd91e
commit e7b0dd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/I18n/PluralRules.php b/src/I18n/PluralRules.php
@@ -167,7 +167,7 @@ public static function calculate($locale, $n) {
 				return $n % 100 == 1 ? 1 :
 					($n % 100 == 2 ? 2 : ($n % 100 == 3 || $n % 100 == 4 ? 3 : 0));
 			case 8:
-				return $n % 10 == 1 ? 0 : 1;
+				return $n % 10 == 1 ? 0 : ($n % 10 == 2 ? 1 : 2);
 			case 9:
 				return $n == 1 ? 0 :
 					$n == 0 || ($n % 100 > 0 && $n % 100 <= 10) ? 1 :

diff --git a/tests/TestCase/I18n/PluralRulesTest.php b/tests/TestCase/I18n/PluralRulesTest.php
@@ -66,7 +66,11 @@ public function localesProvider() {
 			['sl', 3, 3],
 			['sl', 10, 0],
 			['sl', 101, 1],
-			['sl', 103, 3]
+			['sl', 103, 3],
+			['mk', 0, 2],
+			['mk', 1, 0],
+			['mk', 13, 2],
+			['mk', 21, 0]
 		];
 	}