Fix plural calculation for Icelandic.

cakephp · Dec 7, 2014 · d9f3e86 · d9f3e86
1 parent c5e32f2
commit d9f3e86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/I18n/PluralRules.php b/src/I18n/PluralRules.php
@@ -66,7 +66,7 @@ class PluralRules {
 		'hr' => 3,
 		'hu' => 1,
 		'id' => 0,
-		'is' => 1,
+		'is' => 15,
 		'it' => 1,
 		'ja' => 0,
 		'jv' => 0,
@@ -191,6 +191,8 @@ public static function calculate($locale, $n) {
 				return $n == 1 ? 0 :
 					($n == 2 ? 1 :
 					($n != 8 && $n != 11 ? 2 : 3));
+			case 15:
+				return ($n % 10 != 1 || $n % 100 == 11) ? 1 : 0;
 		}
 	}
 

diff --git a/tests/TestCase/I18n/PluralRulesTest.php b/tests/TestCase/I18n/PluralRulesTest.php
@@ -61,6 +61,11 @@ public function localesProvider() {
 			['ga', 2, 1],
 			['ga', 7, 3],
 			['ga', 11, 4],
+			['is', 1, 0],
+			['is', 2, 1],
+			['is', 3, 1],
+			['is', 11, 1],
+			['is', 21, 0],
 			['lt', 0, 2],
 			['lt', 1, 0],
 			['lt', 2, 1],