Updated plural rules from CLDR 22

Change-Id: I0325635a8e0fa3d5defbcbc3a0f4746ed4ab14c1

diff --git a/languages/data/plurals.xml b/languages/data/plurals.xml
index 8432df4..a2992c8 100644 (file)
--- a/languages/data/plurals.xml
+++ b/languages/data/plurals.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <supplementalData>
-    <version number="$Revision: 6155 $"/>
-    <generation date="$Date: 2011-09-21 23:51:12 +0530 (ബു, 21 സെപ് 2011) $"/>
+    <version number="$Revision: 7657 $"/>
+    <generation date="$Date: 2012-08-29 11:20:56 -0700 (Wed, 29 Aug 2012) $"/>
     <plurals>
         <!-- if locale is known to have no plurals, there are no rules -->
-        <pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/>
+        <pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/> 
         <pluralRules locales="ar">
             <pluralRule count="zero">n is 0</pluralRule>
             <pluralRule count="one">n is 1</pluralRule>
@@ -13,7 +13,12 @@
             <pluralRule count="few">n mod 100 in 3..10</pluralRule>
             <pluralRule count="many">n mod 100 in 11..99</pluralRule>
         </pluralRules>
-        <pluralRules locales="asa af bem bez bg bn brx ca cgg chr da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw he is it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah nb nd ne nl nn no nr ny nyn om or pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur wae ve vun xh xog zu">
+        <pluralRules locales="he">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="many">n is not 0 AND n mod 10 is 0</pluralRule>
+        </pluralRules>
+        <pluralRules locales="asa ast af bem bez bg bn brx ca cgg chr ckb da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw is it jgo jmc kaj kcg kk kkj kl ks ksb ku ky lb lg mas mgo ml mn mr nah nb nd ne nl nn nnh no nr ny nyn om or os pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur vo wae ve vun xh xog zu">
             <pluralRule count="one">n is 1</pluralRule>
         </pluralRules>
         <pluralRules locales="ak am bh fil tl guw hi ln mg nso ti wa">
@@ -93,7 +98,7 @@
             <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11,71,91</pluralRule>
             <pluralRule count="two">n mod 10 is 2 and n mod 100 not in 12,72,92</pluralRule>
             <pluralRule count="few">n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99</pluralRule>
-            <pluralRule count="many">n mod 1000000 is 0 and n is not 0</pluralRule>
+            <pluralRule count="many">n is not 0 and n mod 1000000 is 0</pluralRule>
         </pluralRules>
         <pluralRules locales="ksh">
             <pluralRule count="zero">n is 0</pluralRule>

diff --git a/tests/phpunit/includes/LocalisationCacheTest.php b/tests/phpunit/includes/LocalisationCacheTest.php
index 356db87..b34847a 100644 (file)
--- a/tests/phpunit/includes/LocalisationCacheTest.php
+++ b/tests/phpunit/includes/LocalisationCacheTest.php
@@ -5,15 +5,15 @@ class LocalisationCacheTest extends MediaWikiTestCase {
                $cache = Language::getLocalisationCache();
 
                $this->assertEquals(
-                       $cache->getItem( 'ru', 'pluralRules' ),
-                       $cache->getItem( 'os', 'pluralRules' ),
-                       'os plural rules (undefined) fallback to ru (defined)'
+                       $cache->getItem( 'ar', 'pluralRules' ),
+                       $cache->getItem( 'arz', 'pluralRules' ),
+                       'arz plural rules (undefined) fallback to ar (defined)'
                );
 
                $this->assertEquals(
-                       $cache->getItem( 'ru', 'compiledPluralRules' ),
-                       $cache->getItem( 'os', 'compiledPluralRules' ),
-                       'os compiled plural rules (undefined) fallback to ru (defined)'
+                       $cache->getItem( 'ar', 'compiledPluralRules' ),
+                       $cache->getItem( 'arz', 'compiledPluralRules' ),
+                       'arz compiled plural rules (undefined) fallback to ar (defined)'
                );
 
                $this->assertNotEquals(