jenkins-bot has submitted this change and it was merged.
Change subject: Update plural data to CLDR 26
......................................................................
Update plural data to CLDR 26
* The updates include incompatible changes for plural forms in Russian,
Prussian, Tagalog, Manx and several languages that fall back to Russian.
In addition there are minor changes for other languages.
* Test cases were updated to reflect these changes.
Bug: 62861
Change-Id: I7cce477925330fe5bbf51a8470060dc1223981d0
---
M RELEASE-NOTES-1.25
M languages/data/plurals-mediawiki.xml
M languages/data/plurals.xml
M tests/phpunit/languages/LanguageGvTest.php
M tests/phpunit/languages/LanguageRuTest.php
M tests/phpunit/languages/LanguageTlTest.php
6 files changed, 182 insertions(+), 154 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 029b36b..28a3958 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -18,6 +18,9 @@
newly-generated token.
=== New features in 1.25 ===
+* (bug 62861) Updated plural rules to CLDR 26. Includes incompatible changes
+ for plural forms in Russian, Prussian, Tagalog, Manx and several languages
+ that fall back to Russian.
* (bug 58139) ResourceLoaderFileModule now supports language fallback
for 'languageScripts'.
* Added a new hook, "ContentAlterParserOutput", to allow extensions to modify
the
diff --git a/languages/data/plurals-mediawiki.xml
b/languages/data/plurals-mediawiki.xml
index aafc393..1ed6a51 100644
--- a/languages/data/plurals-mediawiki.xml
+++ b/languages/data/plurals-mediawiki.xml
@@ -2,14 +2,6 @@
<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
<supplementalData>
<plurals>
- <!-- Lower Sorbian (Dolnoserbski) and Upper Sorbian
(Hornjoserbsce). Not present in CLDR -->
- <pluralRules locales="dsb hsb">
- <pluralRule count="one">n % 100 = 1 @integer 1, 101,
201, 301, …</pluralRule>
- <pluralRule count="two">n % 100 = 2 @integer 2, 102,
202, 302, …</pluralRule>
- <pluralRule count="few">n % 100 = 3..4 @integer 3~4,
103~104, …</pluralRule>
- <pluralRule count="other"> @integer 5, 6, 7, 8, 9, 10,
105, 206, 307, …</pluralRule>
- </pluralRules>
-
<!-- Belarusian in Taraškievica orthography (Беларуская
тарашкевіца). Copied from "be" -->
<pluralRules locales="be-tarask">
<pluralRule count="one">n % 10 = 1 and n % 100 != 11
@integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0,
41.0, 51.0, 61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
diff --git a/languages/data/plurals.xml b/languages/data/plurals.xml
index fd4eaf6..e364f1b 100644
--- a/languages/data/plurals.xml
+++ b/languages/data/plurals.xml
@@ -6,71 +6,148 @@
For terms of use, see http://www.unicode.org/copyright.html
-->
<supplementalData>
- <version number="$Revision: 9369 $"/>
- <generation date="$Date: 2013-09-14 01:26:08 +0530 (ശ, 14 സെപ് 2013) $"/>
+ <version number="$Revision: 10807 $"/>
+ <generation date="$Date: 2014-08-14 14:43:27 -0500 (Thu, 14 Aug 2014) $"/>
<plurals type="cardinal">
<!-- For a canonicalized list, use GeneratedPluralSamples -->
- <!-- if locale is known to have no plurals, there are no rules -->
- <pluralRules locales="ar">
- <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
- <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
- <pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00,
2.000, 2.0000</pluralRule>
- <pluralRule count="few">n % 100 = 3..10 @integer 3~10, 103~110,
1003, … @decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0,
…</pluralRule>
- <pluralRule count="many">n % 100 = 11..99 @integer 11~26, 111,
1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0,
…</pluralRule>
- <pluralRule count="other"> @integer 100~102, 200~202, 300~302,
400~402, 500~502, 600, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9,
1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+
+ <!-- 1: other -->
+
+ <pluralRules locales="bm bo dz id ig ii in ja jbo jv jw kde kea km ko
lkt lo ms my nqo root sah ses sg th to vi wo yo zh">
+ <pluralRule count="other"> @integer 0~15, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="he iw">
- <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
- <pluralRule count="two">i = 2 and v = 0 @integer 2</pluralRule>
- <pluralRule count="many">v = 0 and n != 0..10 and n % 10 = 0
@integer 20, 30, 40, 50, 60, 70, 80, 90, 100, 1000, 10000, 100000, 1000000,
…</pluralRule>
- <pluralRule count="other"> @integer 0, 3~17, 101, 1001, … @decimal
0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="af asa ast az bem bez bg brx cgg chr ckb dv ee
el eo es eu fo fur fy gsw ha haw hu jgo jmc ka kaj kcg kk kkj kl ks ksb ku ky
lb lg mas mgo ml mn nah nb nd ne nn nnh no nr ny nyn om or os pap ps rm rof rwk
saq seh sn so sq ss ssy st syr ta te teo tig tk tn tr ts uz ve vo vun wae xh
xog">
- <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="ak bh guw ln mg nso pa ti wa">
- <pluralRule count="one">n = 0..1 @integer 0, 1 @decimal 0.0, 1.0,
0.00, 1.00, 0.000, 1.000, 0.0000, 1.0000</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+
+ <!-- 2: one,other -->
+
+ <pluralRules locales="am bn fa gu hi kn mr zu">
+ <pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal
0.0~1.0, 0.00~0.04</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 1.1~2.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
</pluralRules>
<pluralRules locales="ff fr hy kab">
<pluralRule count="one">i = 0,1 @integer 0, 1 @decimal
0.0~1.5</pluralRule>
<pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="lv">
+ <pluralRules locales="ast ca de en et fi fy gl it ji nl sv sw ur yi">
+ <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="si">
+ <pluralRule count="one">n = 0,1 or i = 0 and f = 1 @integer 0, 1
@decimal 0.0, 0.1, 1.0, 0.00, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001,
1.0000</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.2~0.9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="ak bh guw ln mg nso pa ti wa">
+ <pluralRule count="one">n = 0..1 @integer 0, 1 @decimal 0.0, 1.0,
0.00, 1.00, 0.000, 1.000, 0.0000, 1.0000</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="tzm">
+ <pluralRule count="one">n = 0..1 or n = 11..99 @integer 0, 1,
11~24 @decimal 0.0, 1.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0,
20.0, 21.0, 22.0, 23.0, 24.0</pluralRule>
+ <pluralRule count="other"> @integer 2~10, 100~106, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="pt">
+ <pluralRule count="one">n = 0..2 and n != 2 @integer 0, 1 @decimal
0.0, 1.0, 0.00, 1.00, 0.000, 1.000, 0.0000, 1.0000</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="af asa az bem bez bg brx cgg chr ckb dv ee el eo
es eu fo fur gsw ha haw hu jgo jmc ka kaj kcg kk kkj kl ks ksb ku ky lb lg mas
mgo ml mn nah nb nd ne nn nnh no nr ny nyn om or os pap ps rm rof rwk saq seh
sn so sq ss ssy st syr ta te teo tig tk tn tr ts ug uz ve vo vun wae xh xog">
+ <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="pt_PT">
+ <pluralRule count="one">n = 1 and v = 0 @integer 1</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="da">
+ <pluralRule count="one">n = 1 or t != 0 and i = 0,1 @integer 1
@decimal 0.1~1.6</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="is">
+ <pluralRule count="one">t = 0 and i % 10 = 1 and i % 100 != 11 or
t != 0 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6,
10.1, 100.1, 1000.1, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0,
100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="mk">
+ <pluralRule count="one">v = 0 and i % 10 = 1 or f % 10 = 1
@integer 1, 11, 21, 31, 41, 51, 61, 71, 101, 1001, … @decimal 0.1, 1.1, 2.1,
3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 2~10, 12~17, 100, 1000,
10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0,
10000.0, 100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="fil tl">
+ <pluralRule count="one">v = 0 and i = 1,2,3 or v = 0 and i % 10 !=
4,6,9 or v != 0 and f % 10 != 4,6,9 @integer 0~3, 5, 7, 8, 10~13, 15, 17, 18,
20, 21, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.3, 0.5, 0.7, 0.8,
1.0~1.3, 1.5, 1.7, 1.8, 2.0, 2.1, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ <pluralRule count="other"> @integer 4, 6, 9, 14, 16, 19, 24, 26,
104, 1004, … @decimal 0.4, 0.6, 0.9, 1.4, 1.6, 1.9, 2.4, 2.6, 10.4, 100.4,
1000.4, …</pluralRule>
+ </pluralRules>
+
+ <!-- 3: zero,one,other -->
+
+ <pluralRules locales="lv prg">
<pluralRule count="zero">n % 10 = 0 or n % 100 = 11..19 or v = 2
and f % 100 = 11..19 @integer 0, 10~20, 30, 40, 50, 60, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0,
100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
<pluralRule count="one">n % 10 = 1 and n % 100 != 11 or v = 2 and
f % 10 = 1 and f % 100 != 11 or v != 2 and f % 10 = 1 @integer 1, 21, 31, 41,
51, 61, 71, 81, 101, 1001, … @decimal 0.1, 1.0, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1,
7.1, 10.1, 100.1, 1000.1, …</pluralRule>
<pluralRule count="other"> @integer 2~9, 22~29, 102, 1002, …
@decimal 0.2~0.9, 1.2~1.9, 10.2, 100.2, 1000.2, …</pluralRule>
</pluralRules>
+ <pluralRules locales="lag">
+ <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
+ <pluralRule count="one">i = 0,1 and n != 0 @integer 1 @decimal
0.1~1.6</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="ksh">
+ <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
+ <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
+ <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+
+ <!-- 3: one,two,other -->
+
<pluralRules locales="iu kw naq se sma smi smj smn sms">
<pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
<pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00,
2.000, 2.0000</pluralRule>
<pluralRule count="other"> @integer 0, 3~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="ga">
- <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
- <pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00,
2.000, 2.0000</pluralRule>
- <pluralRule count="few">n = 3..6 @integer 3~6 @decimal 3.0, 4.0,
5.0, 6.0, 3.00, 4.00, 5.00, 6.00, 3.000, 4.000, 5.000, 6.000, 3.0000, 4.0000,
5.0000, 6.0000</pluralRule>
- <pluralRule count="many">n = 7..10 @integer 7~10 @decimal 7.0,
8.0, 9.0, 10.0, 7.00, 8.00, 9.00, 10.00, 7.000, 8.000, 9.000, 10.000, 7.0000,
8.0000, 9.0000, 10.0000</pluralRule>
- <pluralRule count="other"> @integer 0, 11~25, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+
+ <!-- 3: one,few,other -->
+
+ <pluralRules locales="shi">
+ <pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal
0.0~1.0, 0.00~0.04</pluralRule>
+ <pluralRule count="few">n = 2..10 @integer 2~10 @decimal 2.0, 3.0,
4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00,
8.00</pluralRule>
+ <pluralRule count="other"> @integer 11~26, 100, 1000, 10000,
100000, 1000000, … @decimal 1.1~1.9, 2.1~2.7, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
</pluralRules>
<pluralRules locales="mo ro">
<pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
<pluralRule count="few">v != 0 or n = 0 or n != 1 and n % 100 =
1..19 @integer 0, 2~16, 101, 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0,
10000.0, 100000.0, 1000000.0, …</pluralRule>
<pluralRule count="other"> @integer 20~35, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
</pluralRules>
- <pluralRules locales="lt">
- <pluralRule count="one">n % 10 = 1 and n % 100 != 11..19 @integer
1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0,
51.0, 61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
- <pluralRule count="few">n % 10 = 2..9 and n % 100 != 11..19
@integer 2~9, 22~29, 102, 1002, … @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0,
9.0, 22.0, 102.0, 1002.0, …</pluralRule>
- <pluralRule count="many">f != 0 @decimal 0.1~0.9, 1.1~1.7, 10.1,
100.1, 1000.1, …</pluralRule>
- <pluralRule count="other"> @integer 0, 10~20, 30, 40, 50, 60, 100,
1000, 10000, 100000, 1000000, … @decimal 0.0, 10.0, 11.0, 12.0, 13.0, 14.0,
15.0, 16.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ <pluralRules locales="bs hr sh sr">
+ <pluralRule count="one">v = 0 and i % 10 = 1 and i % 100 != 11 or
f % 10 = 1 and f % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001,
… @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1,
…</pluralRule>
+ <pluralRule count="few">v = 0 and i % 10 = 2..4 and i % 100 !=
12..14 or f % 10 = 2..4 and f % 100 != 12..14 @integer 2~4, 22~24, 32~34,
42~44, 52~54, 62, 102, 1002, … @decimal 0.2~0.4, 1.2~1.4, 2.2~2.4, 3.2~3.4,
4.2~4.4, 5.2, 10.2, 100.2, 1000.2, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 0.5~1.0, 1.5~2.0, 2.5~2.7, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="be">
- <pluralRule count="one">n % 10 = 1 and n % 100 != 11 @integer 1,
21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0, 51.0,
61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
- <pluralRule count="few">n % 10 = 2..4 and n % 100 != 12..14
@integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, … @decimal 2.0, 3.0,
4.0, 22.0, 23.0, 24.0, 32.0, 33.0, 102.0, 1002.0, …</pluralRule>
- <pluralRule count="many">n % 10 = 0 or n % 10 = 5..9 or n % 100 =
11..14 @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0,
5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- <pluralRule count="other"> @decimal 0.1~0.9, 1.1~1.7, 10.1,
100.1, 1000.1, …</pluralRule>
+
+ <!-- 4: one,two,few,other -->
+
+ <pluralRules locales="gd">
+ <pluralRule count="one">n = 1,11 @integer 1, 11 @decimal 1.0,
11.0, 1.00, 11.00, 1.000, 11.000, 1.0000</pluralRule>
+ <pluralRule count="two">n = 2,12 @integer 2, 12 @decimal 2.0,
12.0, 2.00, 12.00, 2.000, 12.000, 2.0000</pluralRule>
+ <pluralRule count="few">n = 3..10,13..19 @integer 3~10, 13~19
@decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0,
18.0, 19.0, 3.00</pluralRule>
+ <pluralRule count="other"> @integer 0, 20~34, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
</pluralRules>
+ <pluralRules locales="sl">
+ <pluralRule count="one">v = 0 and i % 100 = 1 @integer 1, 101,
201, 301, 401, 501, 601, 701, 1001, …</pluralRule>
+ <pluralRule count="two">v = 0 and i % 100 = 2 @integer 2, 102,
202, 302, 402, 502, 602, 702, 1002, …</pluralRule>
+ <pluralRule count="few">v = 0 and i % 100 = 3..4 or v != 0
@integer 3, 4, 103, 104, 203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703,
704, 1003, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="dsb hsb">
+ <pluralRule count="one">v = 0 and i % 100 = 1 or f % 100 = 1
@integer 1, 101, 201, 301, 401, 501, 601, 701, 1001, … @decimal 0.1, 1.1, 2.1,
3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …</pluralRule>
+ <pluralRule count="two">v = 0 and i % 100 = 2 or f % 100 = 2
@integer 2, 102, 202, 302, 402, 502, 602, 702, 1002, … @decimal 0.2, 1.2, 2.2,
3.2, 4.2, 5.2, 6.2, 7.2, 10.2, 100.2, 1000.2, …</pluralRule>
+ <pluralRule count="few">v = 0 and i % 100 = 3..4 or f % 100 = 3..4
@integer 3, 4, 103, 104, 203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703,
704, 1003, … @decimal 0.3, 0.4, 1.3, 1.4, 2.3, 2.4, 3.3, 3.4, 4.3, 4.4, 5.3,
5.4, 6.3, 6.4, 7.3, 7.4, 10.3, 100.3, 1000.3, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 0.5~1.0, 1.5~2.0, 2.5~2.7, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+
+ <!-- 4: one,two,many,other -->
+
+ <pluralRules locales="he iw">
+ <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
+ <pluralRule count="two">i = 2 and v = 0 @integer 2</pluralRule>
+ <pluralRule count="many">v = 0 and n != 0..10 and n % 10 = 0
@integer 20, 30, 40, 50, 60, 70, 80, 90, 100, 1000, 10000, 100000, 1000000,
…</pluralRule>
+ <pluralRule count="other"> @integer 0, 3~17, 101, 1001, … @decimal
0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+
+ <!-- 4: one,few,many,other -->
+
<pluralRules locales="cs sk">
<pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
<pluralRule count="few">i = 2..4 and v = 0 @integer
2~4</pluralRule>
@@ -83,11 +160,17 @@
<pluralRule count="many">v = 0 and i != 1 and i % 10 = 0..1 or v =
0 and i % 10 = 5..9 or v = 0 and i % 100 = 12..14 @integer 0, 5~19, 100, 1000,
10000, 100000, 1000000, …</pluralRule>
<pluralRule count="other"> @decimal 0.0~1.5, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="sl">
- <pluralRule count="one">v = 0 and i % 100 = 1 @integer 1, 101,
201, 301, 401, 501, 601, 701, 1001, …</pluralRule>
- <pluralRule count="two">v = 0 and i % 100 = 2 @integer 2, 102,
202, 302, 402, 502, 602, 702, 1002, …</pluralRule>
- <pluralRule count="few">v = 0 and i % 100 = 3..4 or v != 0
@integer 3, 4, 103, 104, 203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703,
704, 1003, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- <pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
+ <pluralRules locales="be">
+ <pluralRule count="one">n % 10 = 1 and n % 100 != 11 @integer 1,
21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0, 51.0,
61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
+ <pluralRule count="few">n % 10 = 2..4 and n % 100 != 12..14
@integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, … @decimal 2.0, 3.0,
4.0, 22.0, 23.0, 24.0, 32.0, 33.0, 102.0, 1002.0, …</pluralRule>
+ <pluralRule count="many">n % 10 = 0 or n % 10 = 5..9 or n % 100 =
11..14 @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0,
5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
+ <pluralRule count="other"> @decimal 0.1~0.9, 1.1~1.7, 10.1,
100.1, 1000.1, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="lt">
+ <pluralRule count="one">n % 10 = 1 and n % 100 != 11..19 @integer
1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0, 41.0,
51.0, 61.0, 71.0, 81.0, 101.0, 1001.0, …</pluralRule>
+ <pluralRule count="few">n % 10 = 2..9 and n % 100 != 11..19
@integer 2~9, 22~29, 102, 1002, … @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0,
9.0, 22.0, 102.0, 1002.0, …</pluralRule>
+ <pluralRule count="many">f != 0 @decimal 0.1~0.9, 1.1~1.7, 10.1,
100.1, 1000.1, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 10~20, 30, 40, 50, 60, 100,
1000, 10000, 100000, 1000000, … @decimal 0.0, 10.0, 11.0, 12.0, 13.0, 14.0,
15.0, 16.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
<pluralRules locales="mt">
<pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
@@ -95,9 +178,46 @@
<pluralRule count="many">n % 100 = 11..19 @integer 11~19, 111~117,
1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0,
…</pluralRule>
<pluralRule count="other"> @integer 20~35, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
</pluralRules>
- <pluralRules locales="mk">
- <pluralRule count="one">v = 0 and i % 10 = 1 or f % 10 = 1
@integer 1, 11, 21, 31, 41, 51, 61, 71, 101, 1001, … @decimal 0.1, 1.1, 2.1,
3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …</pluralRule>
- <pluralRule count="other"> @integer 0, 2~10, 12~17, 100, 1000,
10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0,
10000.0, 100000.0, 1000000.0, …</pluralRule>
+ <pluralRules locales="ru uk">
+ <pluralRule count="one">v = 0 and i % 10 = 1 and i % 100 != 11
@integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …</pluralRule>
+ <pluralRule count="few">v = 0 and i % 10 = 2..4 and i % 100 !=
12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …</pluralRule>
+ <pluralRule count="many">v = 0 and i % 10 = 0 or v = 0 and i % 10
= 5..9 or v = 0 and i % 100 = 11..14 @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
+ <pluralRule count="other"> @decimal 0.0~1.5, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+
+ <!-- 5: one,two,few,many,other -->
+
+ <pluralRules locales="br">
+ <pluralRule count="one">n % 10 = 1 and n % 100 != 11,71,91
@integer 1, 21, 31, 41, 51, 61, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0,
41.0, 51.0, 61.0, 81.0, 101.0, 1001.0, …</pluralRule>
+ <pluralRule count="two">n % 10 = 2 and n % 100 != 12,72,92
@integer 2, 22, 32, 42, 52, 62, 82, 102, 1002, … @decimal 2.0, 22.0, 32.0,
42.0, 52.0, 62.0, 82.0, 102.0, 1002.0, …</pluralRule>
+ <pluralRule count="few">n % 10 = 3..4,9 and n % 100 !=
10..19,70..79,90..99 @integer 3, 4, 9, 23, 24, 29, 33, 34, 39, 43, 44, 49, 103,
1003, … @decimal 3.0, 4.0, 9.0, 23.0, 24.0, 29.0, 33.0, 34.0, 103.0, 1003.0,
…</pluralRule>
+ <pluralRule count="many">n != 0 and n % 1000000 = 0 @integer
1000000, … @decimal 1000000.0, 1000000.00, 1000000.000, …</pluralRule>
+ <pluralRule count="other"> @integer 0, 5~8, 10~20, 100, 1000,
10000, 100000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="ga">
+ <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
+ <pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00,
2.000, 2.0000</pluralRule>
+ <pluralRule count="few">n = 3..6 @integer 3~6 @decimal 3.0, 4.0,
5.0, 6.0, 3.00, 4.00, 5.00, 6.00, 3.000, 4.000, 5.000, 6.000, 3.0000, 4.0000,
5.0000, 6.0000</pluralRule>
+ <pluralRule count="many">n = 7..10 @integer 7~10 @decimal 7.0,
8.0, 9.0, 10.0, 7.00, 8.00, 9.00, 10.00, 7.000, 8.000, 9.000, 10.000, 7.0000,
8.0000, 9.0000, 10.0000</pluralRule>
+ <pluralRule count="other"> @integer 0, 11~25, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
+ </pluralRules>
+ <pluralRules locales="gv">
+ <pluralRule count="one">v = 0 and i % 10 = 1 @integer 1, 11, 21,
31, 41, 51, 61, 71, 101, 1001, …</pluralRule>
+ <pluralRule count="two">v = 0 and i % 10 = 2 @integer 2, 12, 22,
32, 42, 52, 62, 72, 102, 1002, …</pluralRule>
+ <pluralRule count="few">v = 0 and i % 100 = 0,20,40,60,80 @integer
0, 20, 40, 60, 80, 100, 120, 140, 1000, 10000, 100000, 1000000, …</pluralRule>
+ <pluralRule count="many">v != 0 @decimal 0.0~1.5, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
+ <pluralRule count="other"> @integer 3~10, 13~19, 23, 103, 1003,
…</pluralRule>
+ </pluralRules>
+
+ <!-- 6: zero,one,two,few,many,other -->
+
+ <pluralRules locales="ar">
+ <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
+ <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
+ <pluralRule count="two">n = 2 @integer 2 @decimal 2.0, 2.00,
2.000, 2.0000</pluralRule>
+ <pluralRule count="few">n % 100 = 3..10 @integer 3~10, 103~110,
1003, … @decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0,
…</pluralRule>
+ <pluralRule count="many">n % 100 = 11..99 @integer 11~26, 111,
1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0,
…</pluralRule>
+ <pluralRule count="other"> @integer 100~102, 200~202, 300~302,
400~402, 500~502, 600, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9,
1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
<pluralRules locales="cy">
<pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
@@ -106,95 +226,6 @@
<pluralRule count="few">n = 3 @integer 3 @decimal 3.0, 3.00,
3.000, 3.0000</pluralRule>
<pluralRule count="many">n = 6 @integer 6 @decimal 6.0, 6.00,
6.000, 6.0000</pluralRule>
<pluralRule count="other"> @integer 4, 5, 7~20, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="lag">
- <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
- <pluralRule count="one">i = 0,1 and n != 0 @integer 1 @decimal
0.1~1.6</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="shi">
- <pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal
0.0~1.0, 0.00~0.04</pluralRule>
- <pluralRule count="few">n = 2..10 @integer 2~10 @decimal 2.0, 3.0,
4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00,
8.00</pluralRule>
- <pluralRule count="other"> @integer 11~26, 100, 1000, 10000,
100000, 1000000, … @decimal 1.1~1.9, 2.1~2.7, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="br">
- <pluralRule count="one">n % 10 = 1 and n % 100 != 11,71,91
@integer 1, 21, 31, 41, 51, 61, 81, 101, 1001, … @decimal 1.0, 21.0, 31.0,
41.0, 51.0, 61.0, 81.0, 101.0, 1001.0, …</pluralRule>
- <pluralRule count="two">n % 10 = 2 and n % 100 != 12,72,92
@integer 2, 22, 32, 42, 52, 62, 82, 102, 1002, … @decimal 2.0, 22.0, 32.0,
42.0, 52.0, 62.0, 82.0, 102.0, 1002.0, …</pluralRule>
- <pluralRule count="few">n % 10 = 3..4,9 and n % 100 !=
10..19,70..79,90..99 @integer 3, 4, 9, 23, 24, 29, 33, 34, 39, 43, 44, 49, 103,
1003, … @decimal 3.0, 4.0, 9.0, 23.0, 24.0, 29.0, 33.0, 34.0, 103.0, 1003.0,
…</pluralRule>
- <pluralRule count="many">n != 0 and n % 1000000 = 0 @integer
1000000, … @decimal 1000000.0, 1000000.00, 1000000.000, …</pluralRule>
- <pluralRule count="other"> @integer 0, 5~8, 10~20, 100, 1000,
10000, 100000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="ksh">
- <pluralRule count="zero">n = 0 @integer 0 @decimal 0.0, 0.00,
0.000, 0.0000</pluralRule>
- <pluralRule count="one">n = 1 @integer 1 @decimal 1.0, 1.00,
1.000, 1.0000</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="tzm">
- <pluralRule count="one">n = 0..1 or n = 11..99 @integer 0, 1,
11~24 @decimal 0.0, 1.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0,
20.0, 21.0, 22.0, 23.0, 24.0</pluralRule>
- <pluralRule count="other"> @integer 2~10, 100~106, 1000, 10000,
100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="gv">
- <pluralRule count="one">n % 10 = 1 @integer 1, 11, 21, 31, 41, 51,
61, 71, 101, 1001, … @decimal 1.0, 11.0, 21.0, 31.0, 41.0, 51.0, 61.0, 71.0,
101.0, 1001.0, …</pluralRule>
- <pluralRule count="two">n % 10 = 2 @integer 2, 12, 22, 32, 42, 52,
62, 72, 102, 1002, … @decimal 2.0, 12.0, 22.0, 32.0, 42.0, 52.0, 62.0, 72.0,
102.0, 1002.0, …</pluralRule>
- <pluralRule count="few">n % 100 = 0,20,40,60 @integer 0, 20, 40,
60, 100, 120, 140, 160, 1000, 10000, 100000, 1000000, … @decimal 0.0, 20.0,
40.0, 60.0, 100.0, 120.0, 140.0, 160.0, 1000.0, 10000.0, 100000.0, 1000000.0,
…</pluralRule>
- <pluralRule count="other"> @integer 3~10, 13~19, 23, 103, 1003, …
@decimal 0.1~0.9, 1.1~1.7, 10.0, 100.1, 1000.1, …</pluralRule>
- </pluralRules>
- <pluralRules locales="gd">
- <pluralRule count="one">n = 1,11 @integer 1, 11 @decimal 1.0,
11.0, 1.00, 11.00, 1.000, 11.000, 1.0000</pluralRule>
- <pluralRule count="two">n = 2,12 @integer 2, 12 @decimal 2.0,
12.0, 2.00, 12.00, 2.000, 12.000, 2.0000</pluralRule>
- <pluralRule count="few">n = 3..10,13..19 @integer 3~10, 13~19
@decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0,
18.0, 19.0, 3.00</pluralRule>
- <pluralRule count="other"> @integer 0, 20~34, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.1, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="bm bo dz id ig ii in ja jbo jv jw kde kea km ko
lkt lo ms my nqo sah ses sg th to vi wo yo zh">
- <pluralRule count="other"> @integer 0~15, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="fil tl">
- <pluralRule count="one">i = 0..1 and v = 0 @integer 0,
1</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="ca de en et fi gl it ji nl sv sw ur yi">
- <pluralRule count="one">i = 1 and v = 0 @integer 1</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="pt">
- <pluralRule count="one">i = 1 and v = 0 or i = 0 and t = 1
@integer 1 @decimal 0.1, 0.01, 0.10, 0.001, 0.010, 0.100, 0.0001, 0.0010,
0.0100, 0.1000</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 0.2~1.6, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="da">
- <pluralRule count="one">n = 1 or t != 0 and i = 0,1 @integer 1
@decimal 0.1~1.6</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="pt_PT">
- <pluralRule count="one">n = 1 and v = 0 @integer 1</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="am bn fa gu hi kn mr zu">
- <pluralRule count="one">i = 0 or n = 1 @integer 0, 1 @decimal
0.0~1.0, 0.00~0.04</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 1.1~2.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0,
1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="is">
- <pluralRule count="one">t = 0 and i % 10 = 1 and i % 100 != 11 or
t != 0 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6,
10.1, 100.1, 1000.1, …</pluralRule>
- <pluralRule count="other"> @integer 0, 2~16, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0,
100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="si">
- <pluralRule count="one">n = 0,1 or i = 0 and f = 1 @integer 0, 1
@decimal 0.0, 0.1, 1.0, 0.00, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001,
1.0000</pluralRule>
- <pluralRule count="other"> @integer 2~17, 100, 1000, 10000,
100000, 1000000, … @decimal 0.2~0.9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="bs hr sh sr">
- <pluralRule count="one">v = 0 and i % 10 = 1 and i % 100 != 11 or
f % 10 = 1 and f % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001,
… @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1,
…</pluralRule>
- <pluralRule count="few">v = 0 and i % 10 = 2..4 and i % 100 !=
12..14 or f % 10 = 2..4 and f % 100 != 12..14 @integer 2~4, 22~24, 32~34,
42~44, 52~54, 62, 102, 1002, … @decimal 0.2~0.4, 1.2~1.4, 2.2~2.4, 3.2~3.4,
4.2~4.4, 5.2, 10.2, 100.2, 1000.2, …</pluralRule>
- <pluralRule count="other"> @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, … @decimal 0.0, 0.5~1.0, 1.5~2.0, 2.5~2.7, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="ru">
- <pluralRule count="one">v = 0 and i % 10 = 1 and i % 100 != 11
@integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …</pluralRule>
- <pluralRule count="many">v = 0 and i % 10 = 0 or v = 0 and i % 10
= 5..9 or v = 0 and i % 100 = 11..14 @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
- <pluralRule count="other"> @integer 2~4, 22~24, 32~34, 42~44,
52~54, 62, 102, 1002, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0,
100000.0, 1000000.0, …</pluralRule>
- </pluralRules>
- <pluralRules locales="uk">
- <pluralRule count="one">v = 0 and i % 10 = 1 and i % 100 != 11
@integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …</pluralRule>
- <pluralRule count="few">v = 0 and i % 10 = 2..4 and i % 100 !=
12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …</pluralRule>
- <pluralRule count="many">v = 0 and i % 10 = 0 or v = 0 and i % 10
= 5..9 or v = 0 and i % 100 = 11..14 @integer 0, 5~19, 100, 1000, 10000,
100000, 1000000, …</pluralRule>
- <pluralRule count="other"> @decimal 0.0~1.5, 10.0, 100.0,
1000.0, 10000.0, 100000.0, 1000000.0, …</pluralRule>
</pluralRules>
</plurals>
</supplementalData>
diff --git a/tests/phpunit/languages/LanguageGvTest.php
b/tests/phpunit/languages/LanguageGvTest.php
index fc58022..e6a0cf0 100644
--- a/tests/phpunit/languages/LanguageGvTest.php
+++ b/tests/phpunit/languages/LanguageGvTest.php
@@ -37,7 +37,7 @@
array( 'other', 23 ),
array( 'other', 50 ),
array( 'few', 60 ),
- array( 'other', 80 ),
+ array( 'few', 80 ),
array( 'few', 100 )
);
}
diff --git a/tests/phpunit/languages/LanguageRuTest.php
b/tests/phpunit/languages/LanguageRuTest.php
index f64fc72..1381afb 100644
--- a/tests/phpunit/languages/LanguageRuTest.php
+++ b/tests/phpunit/languages/LanguageRuTest.php
@@ -13,7 +13,7 @@
* @covers Language::convertPlural
*/
public function testPlural( $result, $value ) {
- $forms = array( 'one', 'many', 'other' );
+ $forms = array( 'one', 'few', 'many', 'other' );
$this->assertEquals( $result, $this->getLang()->convertPlural(
$value, $forms ) );
}
@@ -22,9 +22,9 @@
* @covers Language::convertPlural
*/
public function testExplicitPlural() {
- $forms = array( 'one', 'many', 'other', '12=dozen' );
+ $forms = array( 'one', 'few', 'many', 'other', '12=dozen' );
$this->assertEquals( 'dozen', $this->getLang()->convertPlural(
12, $forms ) );
- $forms = array( 'one', 'many', '100=hundred', 'other',
'12=dozen' );
+ $forms = array( 'one', 'few', 'many', '100=hundred', 'other',
'12=dozen' );
$this->assertEquals( 'hundred',
$this->getLang()->convertPlural( 100, $forms ) );
}
@@ -42,10 +42,10 @@
array( 'many', 11 ),
array( 'one', 91 ),
array( 'one', 121 ),
- array( 'other', 2 ),
- array( 'other', 3 ),
- array( 'other', 4 ),
- array( 'other', 334 ),
+ array( 'few', 2 ),
+ array( 'few', 3 ),
+ array( 'few', 4 ),
+ array( 'few', 334 ),
array( 'many', 5 ),
array( 'many', 15 ),
array( 'many', 120 ),
diff --git a/tests/phpunit/languages/LanguageTlTest.php
b/tests/phpunit/languages/LanguageTlTest.php
index 7ac51c6..20f5bd7 100644
--- a/tests/phpunit/languages/LanguageTlTest.php
+++ b/tests/phpunit/languages/LanguageTlTest.php
@@ -28,7 +28,9 @@
return array(
array( 'one', 0 ),
array( 'one', 1 ),
- array( 'other', 2 ),
+ array( 'one', 2 ),
+ array( 'other', 4 ),
+ array( 'other', 6 ),
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/161920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cce477925330fe5bbf51a8470060dc1223981d0
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
