r95183 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r95182‎ \| r95183 \| r95184 >
Date:	23:57, 21 August 2011
Author:	siebrand
Status:	resolved (Comments)
Tags:
Comment:	Update from http://translate.sourceforge.net/wiki/l10n/pluralforms.
Modified paths:	/trunk/extensions/Translate/data/plural-gettext.txt (modified) (history)

Diff [purge]

Index: trunk/extensions/Translate/data/plural-gettext.txt
—	—	@@ -1,3 +1,4 @@
	2	+ach nplurals=2; plural=(n > 1);
2	3	af nplurals=2; plural=(n != 1);
3	4	ak nplurals=2; plural=(n > 1);
4	5	am nplurals=2; plural=(n > 1);
—	—	@@ -3,4 +4,5 @@
4	5	ar nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == 2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= 99) ? 4 : 5 ) ) ) );
5	6	arn nplurals=2; plural=(n > 1);
	7	+ast nplurals=2; plural=(n != 1);
6	8	ay nplurals=1; plural=0;
7	9	az nplurals=2; plural=(n != 1);
—	—	@@ -12,6 +14,7 @@
13	15	br nplurals=2; plural=(n > 1);
14	16	bs nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
15	17	ca nplurals=2; plural=(n != 1);
	18	+cgg nplurals=1; plural=0;
16	19	cs nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : 2 );
17	20	csb nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
18	21	cy nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == 2) ? 2 : ( (n == 3) ? 3 : ( (n == 6) ? 4 : 5 ) ) ) );
—	—	@@ -33,6 +36,7 @@
34	37	fur nplurals=2; plural=(n != 1);
35	38	fy nplurals=2; plural=(n != 1);
36	39	ga nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? 2 : ( (n < 11) ? 3 : 4 ) ) );
	40	+gd nplurals=4; plural=(n==1 \|\| n==11) ? 0 : (n==2 \|\| n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;
37	41	gl nplurals=2; plural=(n != 1);
38	42	gu nplurals=2; plural=(n != 1);
39	43	gun nplurals=2; plural=(n > 1);
—	—	@@ -42,12 +46,15 @@
43	47	hr nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
44	48	hu nplurals=2; plural=(n != 1);
45	49	hy nplurals=2; plural=(n != 1);
	50	+ia nplurals=2; plural=(n != 1);
46	51	id nplurals=1; plural=0;
47	52	is nplurals=2; plural=(n != 1);
48	53	it nplurals=2; plural=(n != 1);
49	54	ja nplurals=1; plural=0;
	55	+jbo nplurals=1; plural=0;
50	56	jv nplurals=2; plural=(n != 0);
51	57	ka nplurals=1; plural=0;
	58	+kk nplurals=1; plural=0;
52	59	km nplurals=1; plural=0;
53	60	kn nplurals=2; plural=(n != 1);
54	61	ko nplurals=1; plural=0;
—	—	@@ -59,11 +66,14 @@
60	67	lo nplurals=1; plural=0;
61	68	lt nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
62	69	lv nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n != 0) ? 1 : 2 );
	70	+mai nplurals=2; plural=(n != 1);
	71	+mfe nplurals=2; plural=(n > 1);
63	72	mg nplurals=2; plural=(n > 1);
64	73	mi nplurals=2; plural=(n > 1);
65	74	mk nplurals=2; plural=(n == 1 \|\| n%10 == 1) ? 0 : 1;
66	75	ml nplurals=2; plural=(n != 1);
67	76	mn nplurals=2; plural=(n != 1);
	77	+mnk nplurals=3; plural=(n==0 ? 0 : n==1 ? 1 : 2;
68	78	mr nplurals=2; plural=(n != 1);
69	79	ms nplurals=1; plural=0;
70	80	mt nplurals=4; plural=(n == 1) ? 0 : ( (n == 0 \|\| (n%100 > 1 && n%100 < 11)) ? 1 : ( (n%100 > 10 && n%100 < 20) ? 2 : 3 ) );
—	—	@@ -75,6 +85,7 @@
76	86	nn nplurals=2; plural=(n != 1);
77	87	no nplurals=2; plural=(n != 1);
78	88	nso nplurals=2; plural=(n > 1);
	89	+oc nplurals=2; plural=(n > 1);
79	90	or nplurals=2; plural=(n != 1);
80	91	pa nplurals=2; plural=(n != 1);
81	92	pap nplurals=2; plural=(n != 1);
—	—	@@ -83,9 +94,11 @@
84	95	ps nplurals=2; plural=(n != 1);
85	96	pt nplurals=2; plural=(n != 1);
86	97	pt-br nplurals=2; plural=(n > 1);
	98	+rm nplurals=2; plural=(n!=1);
87	99	ro nplurals=3; plural=(n == 1) ? 0 : ( (n == 0 \|\| (n%100 > 0 && n%100 < 20)) ? 1 : 2 );
88	100	ru nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
89	101	sco nplurals=2; plural=(n != 1);
	102	+si nplurals=2; plural=(n != 1);
90	103	sk nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : 2 );
91	104	sl nplurals=4; plural=(n%100 == 1) ? 0 : ( (n%100 == 2) ? 1 : ( (n%100 == 3 \|\| n%100 == 4) ? 2 : 3 ) );
92	105	so nplurals=2; plural=(n != 1);
—	—	@@ -93,6 +106,7 @@
94	107	sr nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
95	108	su nplurals=1; plural=0;
96	109	sv nplurals=2; plural=(n != 1);
	110	+sw nplurals=2; plural=(n != 1);
97	111	ta nplurals=2; plural=(n != 1);
98	112	te nplurals=2; plural=(n != 1);
99	113	tg nplurals=2; plural=(n != 1);
—	—	@@ -100,11 +114,15 @@
101	115	ti nplurals=2; plural=(n > 1);
102	116	tk nplurals=2; plural=(n != 1);
103	117	tr nplurals=1; plural=0;
	118	+tt nplurals=1; plural=0;
	119	+ug nplurals=1; plural=0;
104	120	uk nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && (n%100 < 10 \|\| n%100 >= 20)) ? 1 : 2 );
105	121	ur nplurals=2; plural=(n != 1);
106	122	uz nplurals=1; plural=0;
107	123	vi nplurals=1; plural=0;
108	124	wa nplurals=2; plural=(n > 1);
	125	+wo nplurals=1; plural=0;
	126	+yo nplurals=2; plural=(n != 1);
109	127	zh nplurals=1; plural=0;
110	128	zh-hans nplurals=1; plural=0;
111	129	zh-hant nplurals=1; plural=0;

Follow-up revisions

Revision	Commit summary	Author	Date
r95188	Followup r95183 - partial stylize	nikerabbit	06:56, 22 August 2011
r95195	Followup r95183 add missing bracket	reedy	12:31, 22 August 2011

Comments

#Comment by Nikerabbit (talk | contribs) 06:43, 22 August 2011

Did you only add missing ones or did you also check if some of the existing ones are different?

#Comment by Siebrand (talk | contribs) 06:47, 22 August 2011

Kind of did a half ass job here. The former for gettext, somewhat of the former for cldr.

#Comment by Alphos (talk | contribs) 06:58, 22 August 2011

Is it me or is there a missing round bracket here :

+mnk nplurals=3; plural=(n==0 ? 0 : n==1 ? 1 : 2;

Status & tagging log

21:58, 22 August 2011 Reedy (talk | contribs) changed the status of r95183 [removed: new added: resolved]