r60800 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r60799‎ \| r60800 \| r60801 >
Date:	19:25, 7 January 2010
Author:	pdhanda
Status:	ok
Tags:
Comment:	Patch provided by Bawolff. Fixes listed in Bug#21963
Modified paths:	/trunk/extensions/intersection/DynamicPageList.i18n.php (modified) (history) /trunk/extensions/intersection/DynamicPageList.php (modified) (history)

Diff [purge]

Index: trunk/extensions/intersection/DynamicPageList.i18n.php
—	—	@@ -11,7 +11,6 @@
12	12	$messages['en'] = array(
13	13	'intersection-desc' => 'Outputs a bulleted list of the most recent items residing in a category, or an intersection of several categories',
14	14	'intersection_toomanycats' => 'Error: Too many categories!',
15		~~- 'intersection_toofewcats' => 'Error: Too few categories!',~~
16	15	'intersection_noresults' => 'Error: No results!',
17	16	'intersection_noincludecats' => 'Error: You need to include at least one category, or specify a namespace!',
18	17	);
—	—	@@ -28,7 +27,6 @@
29	28	*/
30	29	$messages['af'] = array(
31	30	'intersection_toomanycats' => 'Fout: Te veel kategorieë!',
32		~~- 'intersection_toofewcats' => 'Fout: Te min kategorieë!',~~
33	31	'intersection_noresults' => 'Fout: Geen resultate!',
34	32	);
35	33
—	—	@@ -38,7 +36,6 @@
39	37	$messages['an'] = array(
40	38	'intersection-desc' => "Preduz una lista d'os elementos más rezients que bi ha en una categoría u a unión de barios categorías",
41	39	'intersection_toomanycats' => 'Error: Masiadas categorías!',
42		~~- 'intersection_toofewcats' => 'Error: numero insufizient de categorías!',~~
43	40	'intersection_noresults' => 'Error: No bi ha garra resultau!',
44	41	'intersection_noincludecats' => "Error: Ha d'encluyir á lo menos una categoría u endicar un espazio de nombres!",
45	42	);
—	—	@@ -49,7 +46,6 @@
50	47	$messages['ar'] = array(
51	48	'intersection-desc' => 'يخرج قائمة معلمة بأحدث المدخلات الساكنة في تصنيف، أو اتحاد عدة تصنيفات',
52	49	'intersection_toomanycats' => 'خطأ: تصنيفات كثيرة جدا!',
53		~~- 'intersection_toofewcats' => 'خطأ: تصنيفات قليلة جدا!',~~
54	50	'intersection_noresults' => 'خطأ: لا نتائج!',
55	51	'intersection_noincludecats' => 'خطأ: ينبغي أن تضمن تصنيفا واحدا على الأقل، أو تحدد نطاقا!',
56	52	);
—	—	@@ -61,7 +57,6 @@
62	58	$messages['arz'] = array(
63	59	'intersection-desc' => 'بيطلع لستة مترقمة لاحدث الحاجات الموجودة فى تصنيف,او اتحاد اكتر من تصنيف',
64	60	'intersection_toomanycats' => 'غلط:تصانيف كتيرة خالص!',
65		~~- 'intersection_toofewcats' => 'غلط:تصانيف قليلة خالص!',~~
66	61	'intersection_noresults' => 'غلط:مافيش نتايج!',
67	62	'intersection_noincludecats' => 'غلط: لازم تحط تصنيف واحد على الأقل، أو تحدد نطاق!',
68	63	);
—	—	@@ -72,7 +67,6 @@
73	68	$messages['ast'] = array(
74	69	'intersection-desc' => 'Amuesa una llista de los elementos más recién que tenga una categoría o una xuntanza de varies categoríes',
75	70	'intersection_toomanycats' => 'Error: ¡Demasiaes categoríes!',
76		~~- 'intersection_toofewcats' => 'Error: ¡Demasiaes poques categoríes!',~~
77	71	'intersection_noresults' => 'Error: ¡Nun hai resultaos!',
78	72	'intersection_noincludecats' => 'Error: ¡Necesites amiestar a lo menos una categoría, o especificar un espaciu de nomes!',
79	73	);
—	—	@@ -82,7 +76,6 @@
83	77	*/
84	78	$messages['bcc'] = array(
85	79	'intersection_toomanycats' => 'DynamicPageList: بازگین دسته جات!',
86		~~- 'intersection_toofewcats' => 'DynamicPageList: باز کمین دسته جات!',~~
87	80	'intersection_noresults' => 'DynamicPageList: هچ نتیجه ای',
88	81	'intersection_noincludecats' => 'لیست صفحات دینامیکی: شما لازمنت حداقل یک دسته هور کنیت یا یک نام فضایی مشخص کنیت!',
89	82	);
—	—	@@ -94,7 +87,6 @@
95	88	$messages['be-tarask'] = array(
96	89	'intersection-desc' => "Выводзіць у маркіраваны сьпіс апошнія дабаўленьні да катэгорыі альбо аб'ядноўвае некалькі катэгорыяў",
97	90	'intersection_toomanycats' => 'Памылка: Зашмат катэгорыяў!',
98		~~- 'intersection_toofewcats' => 'Памылка: Занадта мала катэгорыяў!',~~
99	91	'intersection_noresults' => 'Памылка: Няма вынікаў!',
100	92	'intersection_noincludecats' => 'Памылка: Вам неабходна ўключыць хаця б адну катэгорыю альбо ўказаць прастору назваў!',
101	93	);
—	—	@@ -106,7 +98,6 @@
107	99	$messages['bg'] = array(
108	100	'intersection-desc' => 'Извежда списък на най-скорошните записи в дадена категория или сечение на няколко категории',
109	101	'intersection_toomanycats' => 'Грешка: Твърде много категории!',
110		~~- 'intersection_toofewcats' => 'Грешка: Твърде малко категории!',~~
111	102	'intersection_noresults' => 'Грешка: Няма резултати!',
112	103	'intersection_noincludecats' => 'Грешка: Необходимо е да се включи поне една категория или да се посочи именно пространство!',
113	104	);
—	—	@@ -116,7 +107,6 @@
117	108	*/
118	109	$messages['bn'] = array(
119	110	'intersection_toomanycats' => 'Error: অনেক বেশি বিষয়শ্রেণী!',
120		~~- 'intersection_toofewcats' => 'Error: অনেক কম বিষয়শ্রেণী!',~~
121	111	'intersection_noresults' => 'Error: ফলাফল নাই!',
122	112	'intersection_noincludecats' => 'ত্রুটি:আপনার অন্তত একটি বিষয়শ্রেণী যুক্ত করতে, অথবা একটি নেমস্পেস দিতে হবে!',
123	113	);
—	—	@@ -127,7 +117,6 @@
128	118	$messages['br'] = array(
129	119	'intersection-desc' => 'Diskwel a ra ur roll padelliget eus ar pennadoù nevesañ en ur rummad, pe en ur skourr a veur a rummad',
130	120	'intersection_toomanycats' => 'Error: Re a rummadoù !',
131		~~- 'intersection_toofewcats' => 'Error: Re nebeut a rummadoù !',~~
132	121	'intersection_noresults' => "Error: Disoc'h ebet !",
133	122	'intersection_noincludecats' => "Fazi : Ret eo deoc'h merkañ ur rummad da nebeutañ, pe spisaat un esaouenn anv",
134	123	);
—	—	@@ -139,7 +128,6 @@
140	129	$messages['bs'] = array(
141	130	'intersection-desc' => 'Izbacuje listu najčešćih tačaka koje se nalaze u kategoriji ili u sekciji nekoliko kategorija.',
142	131	'intersection_toomanycats' => 'Greška: Previše kategorija!',
143		~~- 'intersection_toofewcats' => 'Greška: Premalo kategorija!',~~
144	132	'intersection_noresults' => 'Greška: Nema rezultata!',
145	133	'intersection_noincludecats' => 'Greška: Potrebno je da uključite najmanje jednu kategoriju ili odredite imenski prostor!',
146	134	);
—	—	@@ -151,7 +139,6 @@
152	140	$messages['ca'] = array(
153	141	'intersection-desc' => "Genera una llista d'elements recents en una categoria o en la intersecció de diverses.",
154	142	'intersection_toomanycats' => 'Error: Massa categories!',
155		~~- 'intersection_toofewcats' => 'Error: Massa poques categories!',~~
156	143	'intersection_noresults' => 'Error: Cap resultat!',
157	144	'intersection_noincludecats' => "Error: Heu d'incloure almenys una categoria o especificar un espai de noms!",
158	145	);
—	—	@@ -163,7 +150,6 @@
164	151	$messages['cs'] = array(
165	152	'intersection-desc' => 'Vypíše seznam nejnovějších položek v kategorii nebo sjednotí několik kategorií',
166	153	'intersection_toomanycats' => 'Error: Příliš mnoho kategorií!',
167		~~- 'intersection_toofewcats' => 'Error: Málo kategorií!',~~
168	154	'intersection_noresults' => 'Error: Žádné výsledky!',
169	155	'intersection_noincludecats' => 'Error: Musíte zahrnout alespoň jednu kategorii nebo určit jmenný prostor!',
170	156	);
—	—	@@ -177,7 +163,6 @@
178	164	$messages['de'] = array(
179	165	'intersection-desc' => 'Ausgabe einer Liste der aktuellsten Einträge in einer Kategorie, oder der Schnittmenge mehrerer Kategorien',
180	166	'intersection_toomanycats' => 'Fehler: Zu viele Kategorien!',
181		~~- 'intersection_toofewcats' => 'Fehler: Zu wenige Kategorien!',~~
182	167	'intersection_noresults' => 'Fehler: Keine Ergebnisse!',
183	168	'intersection_noincludecats' => 'Fehler: Du musst mindestens eine Kategorie einbinden oder gib einen Namensraum an!',
184	169	);
—	—	@@ -195,7 +180,6 @@
196	181	$messages['diq'] = array(
197	182	'intersection-desc' => 'yew kategori de, ya zi unsurê ke yew ra zêd pêgınayişê kategoriyan de esti, listeya maddeya nişanbiyayeyanê ıney unsuran vırazeno',
198	183	'intersection_toomanycats' => 'xeta: kategoriyi zaf zêd ê!',
199		~~- 'intersection_toofewcats' => 'xeta: kategoriyi zaf tay ê!',~~
200	184	'intersection_noresults' => 'xeta: netice çina!',
201	185	'intersection_noincludecats' => 'xeta: tewr tay yew kategori gani têarê bıbo ya zi yew mıntıqaya nameyi diyare bıkerê!',
202	186	);
—	—	@@ -206,7 +190,6 @@
207	191	$messages['dsb'] = array(
208	192	'intersection-desc' => 'Wudawa lisćina nejaktualnjejšych zapiskow w kategoriji abo zgromadneje młogosći někotarych kategorijow',
209	193	'intersection_toomanycats' => 'Zmólka: Pśewjele kategorijow!',
210		~~- 'intersection_toofewcats' => 'Zmólka: Pśemało kategorijow!',~~
211	194	'intersection_noresults' => 'Zmólka: Žedne wuslědki!',
212	195	'intersection_noincludecats' => 'Zmólka: Musyš nanejmjenjej jadnu kategoriju zapśěgnuś abo mjenjowy rum pódaś!',
213	196	);
—	—	@@ -217,7 +200,6 @@
218	201	$messages['el'] = array(
219	202	'intersection-desc' => 'Έχει ως έξοδο μια μη αριθμημένη λίστα των πιο πρόσφατων στοιχείων σε μια κατηγορία, ή μια τομή μερικών κατηγοριών',
220	203	'intersection_toomanycats' => 'Σφάλμα: Πάρα πολλές κατηγορίες!',
221		~~- 'intersection_toofewcats' => 'Σφάλμα: Πολύ λίγες κατηγορίες!',~~
222	204	'intersection_noresults' => 'Σφάλμα: Δεν υπάρχουν αποτελέσματα!',
223	205	'intersection_noincludecats' => 'Σφάλμα: Πρέπει να περιλάβετε τουλάχιστον μία κατηγορία, ή να ορίσετε μια περιοχή ονομάτων!',
224	206	);
—	—	@@ -229,7 +211,6 @@
230	212	$messages['eo'] = array(
231	213	'intersection-desc' => 'Eligas bulpunktitan liston de la plej lastaj kategorianoj, aŭ unuigo de pluraj kategorioj',
232	214	'intersection_toomanycats' => 'Eraro: Tro da kategorioj!',
233		~~- 'intersection_toofewcats' => 'Eraro: Tro malmulte da kategorioj!',~~
234	215	'intersection_noresults' => 'Eraro: Neniom da rezultoj!',
235	216	'intersection_noincludecats' => 'Eraro: Vi devas inkluzivi almenaŭ unu kategorion, aŭ specifu nomspacon!',
236	217	);
—	—	@@ -242,7 +223,6 @@
243	224	$messages['es'] = array(
244	225	'intersection-desc' => 'Devuelve una lista de los elementos más recientes que están en una categoría o en una intersección de varias categorías',
245	226	'intersection_toomanycats' => '¡Error: Demasiadas categorías!',
246		~~- 'intersection_toofewcats' => 'Error: ¡Muy pocas categorías!',~~
247	227	'intersection_noresults' => 'Error: ¡Sin resultados!',
248	228	'intersection_noincludecats' => 'Error: ¡Necesita incluir al menos una categoría, o especificar un espacio de nombres!',
249	229	);
—	—	@@ -253,7 +233,6 @@
254	234	*/
255	235	$messages['et'] = array(
256	236	'intersection_toomanycats' => 'Tõrge: Liiga palju kategooriaid!',
257		~~- 'intersection_toofewcats' => 'Tõrge: Liiga vähe kategooriaid!',~~
258	237	'intersection_noresults' => 'Viga: Tulemusi ei ole!',
259	238	'intersection_noincludecats' => 'Tõrge: Lisa vähemalt üks kategooria või täpsusta nimeruum!',
260	239	);
—	—	@@ -263,7 +242,6 @@
264	243	*/
265	244	$messages['eu'] = array(
266	245	'intersection_toomanycats' => 'Errorea: Kategoria gehiegi!',
267		~~- 'intersection_toofewcats' => 'Errorea: Kategoria gutxiegi!',~~
268	246	'intersection_noresults' => 'Errorea: Emaitzarik ez!',
269	247	'intersection_noincludecats' => 'Errorea: Gutxienez kategoria bat gehitu edo izen bat zehaztu behar duzu!',
270	248	);
—	—	@@ -274,7 +252,6 @@
275	253	$messages['fa'] = array(
276	254	'intersection-desc' => 'فهرست گلوله‌ای از صفحه‌هایی به نمایش در می‌آورد که به تازگی در یک یا چند رده وارد شده‌اند',
277	255	'intersection_toomanycats' => 'DynamicPageList: تعداد رده‌ها زیاد است!',
278		~~- 'intersection_toofewcats' => 'DynamicPageList: تعداد رده‌ها کم است!',~~
279	256	'intersection_noresults' => 'DynamicPageList: نتیجه‌ای وجود ندارد!',
280	257	'intersection_noincludecats' => 'DynamicPageList: شما حداقل باید یک رده را وارد کنید، یا یک فضای نام را مشخص کنید!',
281	258	);
—	—	@@ -285,7 +262,6 @@
286	263	$messages['fi'] = array(
287	264	'intersection-desc' => 'Tulostaa listan luokassa tai useamman luokan yhdisteessä olevista sivuista.',
288	265	'intersection_toomanycats' => 'Error: Liian monta luokkaa.',
289		~~- 'intersection_toofewcats' => 'Error: Liian vähän luokkia.',~~
290	266	'intersection_noresults' => 'Error: Ei tuloksia.',
291	267	'intersection_noincludecats' => 'Error: Lisää vähintään yksi luokka tai määritä nimiavaruus.',
292	268	);
—	—	@@ -298,7 +274,6 @@
299	275	$messages['fr'] = array(
300	276	'intersection-desc' => 'Affiche une liste, à puces, des articles les plus récents dans une catégorie, ou à partir d’une combinaison de plusieurs catégories.',
301	277	'intersection_toomanycats' => 'DynamicPageList : trop de catégories !',
302		~~- 'intersection_toofewcats' => 'DynamicPageList : pas assez de catégories !',~~
303	278	'intersection_noresults' => 'DynamicPageList : aucun résultat !',
304	279	'intersection_noincludecats' => 'Error : vous devez inclure au moins une catégorie, ou préciser un nom d’espace !',
305	280	);
—	—	@@ -309,7 +284,6 @@
310	285	$messages['frp'] = array(
311	286	'intersection-desc' => 'Montre una lista, de puges, des èlèments los ples novéls dens una catègorie, ou ben dês una combinèson d’un mouél de catègories.',
312	287	'intersection_toomanycats' => 'Èrror : trop de catègories !',
313		~~- 'intersection_toofewcats' => 'Èrror : pas prod de catègories !',~~
314	288	'intersection_noresults' => 'Èrror : gins de rèsultat !',
315	289	'intersection_noincludecats' => 'Èrror : vos dête encllure u muens yona catègorie, ou ben spècefiar un èspâço de noms !',
316	290	);
—	—	@@ -321,7 +295,6 @@
322	296	$messages['gl'] = array(
323	297	'intersection-desc' => 'Devolve unha lista punteada dos elementos máis recentes que están nunha categoría ou nunha unión de varias categorías',
324	298	'intersection_toomanycats' => 'Erro: demasiadas categorías!',
325		~~- 'intersection_toofewcats' => 'Erro: moi poucas categorías!',~~
326	299	'intersection_noresults' => 'Erro: ningún resultado!',
327	300	'intersection_noincludecats' => 'Erro: ten que incluír unha categoría polo menos ou especificar un espazo de nomes!',
328	301	);
—	—	@@ -340,7 +313,6 @@
341	314	$messages['gsw'] = array(
342	315	'intersection-desc' => 'Usgabe vun ere Lischt vu dr aktuällschte Yyträg in ere Kategorii, oder vu dr Schnittmängi vu mehrere Kategorie',
343	316	'intersection_toomanycats' => 'Fähler: Zvyyl Kategorie!',
344		~~- 'intersection_toofewcats' => 'Fähler: Zwenig Kategorie!',~~
345	317	'intersection_noresults' => 'Fähler: Kei Ergebnis!',
346	318	'intersection_noincludecats' => 'Fähler: S muess zmindescht ei Kategorii yybunde wäre oder gib e Namensruum aa!',
347	319	);
—	—	@@ -351,7 +323,6 @@
352	324	$messages['gu'] = array(
353	325	'intersection-desc' => 'શ્રેણીમાં અથવા વિવિધ શ્રેણીઓનાં છેદનબિંદુમાં મોજૂદ, હાલની તાજી બાબતોની વિગતવાર યાદી દર્શાવો.',
354	326	'intersection_toomanycats' => 'ત્રુટી:વધુ પડતી શ્રેણીઓ!',
355		~~- 'intersection_toofewcats' => 'ત્રુટી:બહુ ઓછી શ્રેણીઓ!',~~
356	327	'intersection_noresults' => 'ત્રુટી:પરીણામ નથી!',
357	328	'intersection_noincludecats' => 'ત્રુટી:તમારે ઓછામાં ઓછી એક શ્રેણીનો સમાવેશ કરવો, કે નામસ્થળનો ઉલ્લેખ કરવો જરૂરી છે !',
358	329	);
—	—	@@ -362,7 +333,6 @@
363	334	$messages['he'] = array(
364	335	'intersection-desc' => 'רשימה עם תבליטים של הפריטים האחרונים המצויים בקטגוריה, או במספר קטגוריות',
365	336	'intersection_toomanycats' => 'DynamicPageList: קטגוריות רבות מדי!',
366		~~- 'intersection_toofewcats' => 'DynamicPageList: קטגוריות מעטות מדי!',~~
367	337	'intersection_noresults' => 'DynamicPageList: אין תוצאות!',
368	338	'intersection_noincludecats' => 'DynamicPageList: עליכם לכלול לפחות קטגוריה אחת, או לציין מרחב שם!',
369	339	);
—	—	@@ -373,7 +343,6 @@
374	344	$messages['hi'] = array(
375	345	'intersection-desc' => 'एक श्रेणी या श्रेणीसमूहमें उपलब्ध नवीनतम लेख दर्शायें।',
376	346	'intersection_toomanycats' => 'Error: बहुत ज्यादा श्रेणीयां!',
377		~~- 'intersection_toofewcats' => 'Error: बहुत कम श्रेणीयां!',~~
378	347	'intersection_noresults' => 'Error: रिज़ल्ट नहीं!',
379	348	'intersection_noincludecats' => 'Error: कमसे कम एक श्रेणी या नामस्थान देना अनिवार्य हैं!',
380	349	);
—	—	@@ -385,7 +354,6 @@
386	355	$messages['hr'] = array(
387	356	'intersection-desc' => 'Omogućava popis najnovijih stranica ili datoteka iz kategorije, ili presjeka nekoliko kategorija',
388	357	'intersection_toomanycats' => 'Error: Previše kategorija!',
389		~~- 'intersection_toofewcats' => 'Error: Premalo kategorija!',~~
390	358	'intersection_noresults' => 'Error: Nema rezultata!',
391	359	'intersection_noincludecats' => 'Error: Morate uključiti bar jednu kategoriju, ili odabrati imenski prostor!',
392	360	);
—	—	@@ -396,7 +364,6 @@
397	365	$messages['hsb'] = array(
398	366	'intersection-desc' => 'Wudaće lisćiny najaktualnišich zapiskow w jednej kategoriji abo w skupinje kategorijow',
399	367	'intersection_toomanycats' => 'Error: Přewjele kategorijow!',
400		~~- 'intersection_toofewcats' => 'Error: Přemało kategorijow!',~~
401	368	'intersection_noresults' => 'Error: Žane wuslědki!',
402	369	'intersection_noincludecats' => 'Error: Dyrbiš znajmjeńša kednu kategoriju zapřijeć abo mjenowy rum podać!',
403	370	);
—	—	@@ -409,7 +376,6 @@
410	377	$messages['hu'] = array(
411	378	'intersection-desc' => 'Megjeleníti egy adott kategóriában, vagy kategóriák uniójában lévő legújabb szócikkek listáját',
412	379	'intersection_toomanycats' => 'Hiba: Túl sok kategória!',
413		~~- 'intersection_toofewcats' => 'Hiba: Túl kevés kategória!',~~
414	380	'intersection_noresults' => 'Hiba: Nincs eredmény!',
415	381	'intersection_noincludecats' => 'Hiba: Legalább egy listázandó kategóriát meg kell adnod, vagy pedig egy névteret!',
416	382	);
—	—	@@ -420,7 +386,6 @@
421	387	$messages['ia'] = array(
422	388	'intersection-desc' => 'Face un lista a punctos del elementos le plus recente in un categoria, o un union de plure categorias',
423	389	'intersection_toomanycats' => 'Error: Troppo de categorias!',
424		~~- 'intersection_toofewcats' => 'Error: Non bastante categorias!',~~
425	390	'intersection_noresults' => 'Error: Nulle resultatos!',
426	391	'intersection_noincludecats' => 'Error: Tu debe includer al minus un categoria, o specificar un spatio de nomines!',
427	392	);
—	—	@@ -431,7 +396,6 @@
432	397	$messages['id'] = array(
433	398	'intersection-desc' => 'Menghasilkan suatu daftar item terbaru pada suatu kategori atau gabungan beberapa kategori',
434	399	'intersection_toomanycats' => 'DynamicPageList: Terlalu banyak kategori!',
435		~~- 'intersection_toofewcats' => 'DynamicPageList: Terlalu sedikit kategori!',~~
436	400	'intersection_noresults' => 'DynamicPageList: Tak ada hasil yang sesuai!',
437	401	'intersection_noincludecats' => 'DynamicPageList: Anda perlu mencantumkan paling tidak satu kategori, atau menyebutkan satu ruang nama!',
438	402	);
—	—	@@ -441,7 +405,6 @@
442	406	*/
443	407	$messages['io'] = array(
444	408	'intersection_toomanycats' => 'Eroro: Tro multa kategorii!',
445		~~- 'intersection_toofewcats' => 'Eroro: Tro poka kategorii!',~~
446	409	'intersection_noresults' => 'Eroro: Nula rezultaji!',
447	410	'intersection_noincludecats' => 'Eroro: Vu mustas inkluzar adminime un kategorio, o specigez nomaro!',
448	411	);
—	—	@@ -453,7 +416,6 @@
454	417	$messages['it'] = array(
455	418	'intersection-desc' => "Visualizza un elenco puntato con gli elementi più recenti inseriti in una categoria o nell'unione di più categorie",
456	419	'intersection_toomanycats' => 'Errore: Numero di categorie eccessivo.',
457		~~- 'intersection_toofewcats' => 'Errore: Numero di categorie insufficiente.',~~
458	420	'intersection_noresults' => 'Errore: Nessun risultato.',
459	421	'intersection_noincludecats' => 'Errore: È necessario includere almeno una categoria oppure specificare un namespace.',
460	422	);
—	—	@@ -465,7 +427,6 @@
466	428	$messages['ja'] = array(
467	429	'intersection-desc' => '単一カテゴリ内または複数カテゴリ内において最近更新された項目を箇条書きで表示する',
468	430	'intersection_toomanycats' => 'エラー: カテゴリ指定が多すぎます！',
469		~~- 'intersection_toofewcats' => 'エラー: カテゴリ指定が少なすぎます！',~~
470	431	'intersection_noresults' => 'エラー: 最近更新された項目はありません！',
471	432	'intersection_noincludecats' => 'エラー: 1つ以上のカテゴリ、または名前空間を指定する必要があります！',
472	433	);
—	—	@@ -476,7 +437,6 @@
477	438	$messages['jut'] = array(
478	439	'intersection-desc' => 'Outputs en bulleted liste der senestste itemer ræsidende i en klynge, æller æ unje der severæl klynger',
479	440	'intersection_toomanycats' => 'Error: Åverføl klynger!',
480		~~- 'intersection_toofewcats' => 'Error: Åverwæneg klynger!',~~
481	441	'intersection_noresults' => 'Error: Ekke ræsultåter!',
482	442	'intersection_noincludecats' => 'Error: Du nødst til inkludær til mendst en klynge, æller spæsifiær en navnerum!',
483	443	);
—	—	@@ -487,7 +447,6 @@
488	448	$messages['jv'] = array(
489	449	'intersection-desc' => 'Ngasilaké sawijining daftar item paling anyar ing sawijining kategori utawa gabungan sawetara kategori',
490	450	'intersection_toomanycats' => 'Error: Kakèhan kategori!',
491		~~- 'intersection_toofewcats' => 'Error: Kesithikan kategori!',~~
492	451	'intersection_noresults' => 'Error: Ora ana pituwasé (kasilé)!',
493	452	'intersection_noincludecats' => 'Error: Panjenengan perlu minimal mènèhi kategori sawiji, utawa spésifikasi bilik nama sawiji!',
494	453	);
—	—	@@ -498,7 +457,6 @@
499	458	*/
500	459	$messages['km'] = array(
501	460	'intersection_toomanycats' => 'កំហុស៖ ចំណាត់ថ្នាក់ក្រុមច្រើនពេក!',
502		~~- 'intersection_toofewcats' => 'កំហុស៖ ចំណាត់ថ្នាក់ក្រុមតិចពេក!',~~
503	461	'intersection_noresults' => 'កំហុស៖ គ្មានលទ្ធផល!',
504	462	'intersection_noincludecats' => 'កំហុស៖ អ្នកត្រូវតែមានចំណាត់ថ្នាក់ក្រុមមួយយ៉ាងតិច ឬ សំដៅមួយលំហឈ្មោះ!',
505	463	);
—	—	@@ -510,7 +468,6 @@
511	469	*/
512	470	$messages['ko'] = array(
513	471	'intersection_toomanycats' => '오류: 분류가 너무 많습니다!',
514		~~- 'intersection_toofewcats' => '오류: 분류가 너무 적습니다!',~~
515	472	'intersection_noresults' => '오류: 결과가 없습니다!',
516	473	'intersection_noincludecats' => '오류: 분류를 추가하거나 이름공간을 명시해야 합니다!',
517	474	);
—	—	@@ -521,7 +478,6 @@
522	479	$messages['ksh'] = array(
523	480	'intersection-desc' => 'Zeij_en Liß met de neuste Enndrääsch en en Saachjrupp, udder de neuste Enndrääsch, die en alle Jruppe uss_enem Knubbel fun Saachjrupp dren sin.',
524	481	'intersection_toomanycats' => '<i lang="en">DynamicPageList</i> hät ene Fääler jefonge: Dat sinn_er zo vill Saachjroppe!',
525		~~- 'intersection_toofewcats' => '<i lang="en">DynamicPageList</i> hät ene Fääler jefonge: Dat sin ze winnisch Saachjruppe!',~~
526	482	'intersection_noresults' => '<i lang="en">DynamicPageList</i> hät ene Fääler jefonge: Do kohm nix bei erus!',
527	483	'intersection_noincludecats' => '<i lang="en">DynamicPageList</i> hät ene Fääler jefonge: Mer bruch winnischßdens ein Saachjrupp. Söns jivv e Appachtemang aan!',
528	484	);
—	—	@@ -532,7 +488,6 @@
533	489	$messages['lb'] = array(
534	490	'intersection-desc' => 'Generéiert eng Lëscht mat de rezentesten Androungen an eng Kategorie, oder an eng Intersektioun vu méi Kategorien',
535	491	'intersection_toomanycats' => 'Dynamesch Säite-Lëscht: Zevill Kategorien!',
536		~~- 'intersection_toofewcats' => 'Dynamesch Säite-Lëscht: Ze wéineg Kategorien!',~~
537	492	'intersection_noresults' => 'Dynamesch Säite-Lëscht: Kee Resultat!',
538	493	'intersection_noincludecats' => 'Dynamesch Säite-Lëscht: Dir musst mindestens eng Kategorie abannen, oder de Nummraum uginn!',
539	494	);
—	—	@@ -544,7 +499,6 @@
545	500	$messages['li'] = array(
546	501	'intersection-desc' => 'Geeft als uitvoer een ongenummerde lijst met de meest recent toegevoegde items in een categorie, of een combinatie van categorieë',
547	502	'intersection_toomanycats' => 'Error: Te väöl categorieë!',
548		~~- 'intersection_toofewcats' => 'Error: Te weinig categorieë!',~~
549	503	'intersection_noresults' => 'Error: Gein resultate!',
550	504	'intersection_noincludecats' => 'Error: Geer moet tenminste ein categorie of ein naamruumde opgeve!',
551	505	);
—	—	@@ -554,7 +508,6 @@
555	509	*/
556	510	$messages['lt'] = array(
557	511	'intersection_toomanycats' => 'Error: Per daug kategorijų!',
558		~~- 'intersection_toofewcats' => 'Error: Per mažai kategorijų!',~~
559	512	'intersection_noresults' => 'Error: Nėra rezultatų!',
560	513	'intersection_noincludecats' => 'Error: Jums reikia įtraukti bent vieną kategoriją, arba nurodyti vardų sritį!',
561	514	);
—	—	@@ -564,7 +517,6 @@
565	518	*/
566	519	$messages['lv'] = array(
567	520	'intersection_toomanycats' => 'Kļūda: pārāk daudz kategoriju!',
568		~~- 'intersection_toofewcats' => 'Kļūda: pārāk maz kategoriju!',~~
569	521	);
570	522
571	523	/** Malagasy (Malagasy)
—	—	@@ -580,7 +532,6 @@
581	533	$messages['mk'] = array(
582	534	'intersection-desc' => 'Дава листа со потточки на најскорешните содржини во една категорија, или пак вкрстување на неколку категории.',
583	535	'intersection_toomanycats' => 'Грешка: Премногу категории!',
584		~~- 'intersection_toofewcats' => 'Грешка: Премалку категории!',~~
585	536	'intersection_noresults' => 'Грешка: Нема резултати!',
586	537	'intersection_noincludecats' => 'Грешка: Мора да вклучите барем една категорија, или пак да назначите именски простор!',
587	538	);
—	—	@@ -592,7 +543,6 @@
593	544	$messages['ml'] = array(
594	545	'intersection-desc' => 'ഒരു വർഗ്ഗത്തില്‍ പുതിയതായി വന്ന ഇനങ്ങളുടെ ബുള്ളറ്റ് പട്ടികയോ, അല്ലെങ്കില്‍ നിരവധി വർഗ്ഗങ്ങളുടെ കൂട്ടത്തെയോ ഔട്ട് പുട്ടായി കിട്ടുന്നു.',
595	546	'intersection_toomanycats' => 'പിഴവ്: വളരെയധികം വർഗ്ഗങ്ങള്‍!',
596		~~- 'intersection_toofewcats' => 'പിഴവ്: വളരെ കുറച്ച് വർഗ്ഗങ്ങള്‍!',~~
597	547	'intersection_noresults' => 'പിഴവ്: ഫലങ്ങള്‍ ഒന്നുമില്ല!',
598	548	'intersection_noincludecats' => 'പിഴവ്: ചുരുങ്ങിയത് ഒരു വർഗ്ഗമെങ്കിലും ഉള്‍പ്പെടുത്തുകയോ അല്ലെങ്കില്‍ ഒരു നാമമേഖല എങ്കിലും നിഷ്കര്‍ഷിച്ചിരിക്കുകയോ വേണം!',
599	549	);
—	—	@@ -603,7 +553,6 @@
604	554	$messages['mr'] = array(
605	555	'intersection-desc' => 'एखाद्या वर्गातील अथवा वर्गसमूहातील नवीनतम लेख दर्शवितो.',
606	556	'intersection_toomanycats' => 'Error: खूप जास्त वर्ग!',
607		~~- 'intersection_toofewcats' => 'Error: खूप कमी वर्ग!',~~
608	557	'intersection_noresults' => 'Error: निकाल नाहीत!',
609	558	'intersection_noincludecats' => 'Error: कमीतकमी एक वर्ग अथवा नामविश्व देणे गरजेचे आहे!',
610	559	);
—	—	@@ -614,7 +563,6 @@
615	564	$messages['ms'] = array(
616	565	'intersection-desc' => 'Mengoutput senarai item terkini dalam sesebuah kategori atau kesatuan beberapa buah kategori',
617	566	'intersection_toomanycats' => 'Error: Kategori terlalu banyak!',
618		~~- 'intersection_toofewcats' => 'Error: Kategori terlalu sedikit!',~~
619	567	'intersection_noresults' => 'Error: Tiada hasil!',
620	568	'intersection_noincludecats' => 'Error: Anda hendaklah memasukkan sekurang-kurangnya sebuah kategori atau menyatakan sebuah ruang nama!',
621	569	);
—	—	@@ -625,7 +573,6 @@
626	574	$messages['nds'] = array(
627	575	'intersection-desc' => 'Wiest en List mit de aktuellsten Indrääg in en Kategorie, oder de Snittmengd vun mehr Kategorien',
628	576	'intersection_toomanycats' => 'Fehler: Toveel Kategorien!',
629		~~- 'intersection_toofewcats' => 'Fehler: To wenig Kategorien!',~~
630	577	'intersection_noresults' => 'Fehler: Nix funnen!',
631	578	'intersection_noincludecats' => 'Fehler: Dor mutt opminnst een Kategorie angeven warrn! ODer geev en Naamruum an.',
632	579	);
—	—	@@ -637,7 +584,6 @@
638	585	$messages['nl'] = array(
639	586	'intersection-desc' => 'Geeft als uitvoer een ongenummerde lijst met de meest recent toegevoegde items in een categorie, of een combinatie van categorieën',
640	587	'intersection_toomanycats' => 'Fout: Te veel categorieën!',
641		~~- 'intersection_toofewcats' => 'Fout: Te weinig categorieën!',~~
642	588	'intersection_noresults' => 'Fout: Geen resultaten!',
643	589	'intersection_noincludecats' => 'Fout: U moet tenminste een categorie of een naamruimte opgeven!',
644	590	);
—	—	@@ -648,7 +594,6 @@
649	595	$messages['nn'] = array(
650	596	'intersection-desc' => 'Gjev ei punktlista over dei nyaste elementa i ein kategori, eller element som er felles i fleire kategoriar',
651	597	'intersection_toomanycats' => 'Feil: For mange kategoriar!',
652		~~- 'intersection_toofewcats' => 'Feil: For få kategoriar!',~~
653	598	'intersection_noresults' => 'Feil: Ingen resultat!',
654	599	'intersection_noincludecats' => 'Feil: Du må inkludera minst éin kategori, eller oppgje eit namnerom!',
655	600	);
—	—	@@ -659,7 +604,6 @@
660	605	$messages['no'] = array(
661	606	'intersection-desc' => 'Gir en punktliste over de nyeste elementene i en kategori, eller elementer som er felles i flere kategorier',
662	607	'intersection_toomanycats' => 'Dynamisk sideliste: For mange kategorier!',
663		~~- 'intersection_toofewcats' => 'Dynamisk sidelist: For få kategorier!',~~
664	608	'intersection_noresults' => 'Dynamisk sideliste: Ingen resultater!',
665	609	'intersection_noincludecats' => 'Dynamisk sideliste: Du må inkludere minst én kategori, eller oppgi et navnerom!',
666	610	);
—	—	@@ -670,7 +614,6 @@
671	615	$messages['oc'] = array(
672	616	'intersection-desc' => 'Aficha una lista, amb de piuses, dels articles mai recents dins una categoria, o a partir d’una combinason de mantuna categoria.',
673	617	'intersection_toomanycats' => 'Error : Tròp de categorias !',
674		~~- 'intersection_toofewcats' => 'Error : Pas pro de categorias !',~~
675	618	'intersection_noresults' => 'Error : Pas cap de resultat !',
676	619	'intersection_noincludecats' => 'Error : avètz besonh d’inclure almens una categoria, o de precisar un nom d’espaci !',
677	620	);
—	—	@@ -688,7 +631,6 @@
689	632	$messages['pl'] = array(
690	633	'intersection-desc' => 'Zwraca listę wypunktowaną najnowszych elementów w kategorii lub grupie kilku kategorii',
691	634	'intersection_toomanycats' => 'Błąd – zbyt wiele kategorii!',
692		~~- 'intersection_toofewcats' => 'Błąd – zbyt mało kategorii!',~~
693	635	'intersection_noresults' => 'Błąd – brak wyników!',
694	636	'intersection_noincludecats' => 'Błąd – musisz załączyć co najmniej jedną kategorię lub określić przestrzeń nazw!',
695	637	);
—	—	@@ -699,7 +641,6 @@
700	642	$messages['pms'] = array(
701	643	'intersection-desc' => "A visualisa na lista pontà dij pì ressent element anserì ant na categorìa, o ant l'antërsession ëd pì categorìe",
702	644	'intersection_toomanycats' => 'Eror: tròpe categorìe!',
703		~~- 'intersection_toofewcats' => 'Eror: Tròp pòche categorìe!',~~
704	645	'intersection_noresults' => 'Eror: Gnun arzultà!',
705	646	'intersection_noincludecats' => 'Eror: It deuve anserì almanch na categorìa, o spessifié në spassi nominal!',
706	647	);
—	—	@@ -711,7 +652,6 @@
712	653	$messages['pt'] = array(
713	654	'intersection-desc' => 'constrói uma lista pontuada dos itens mais recentes presentes numa categoria, ou uma união de várias categorias',
714	655	'intersection_toomanycats' => 'Error: Categorias em excesso!',
715		~~- 'intersection_toofewcats' => 'Error: Poucas categorias!',~~
716	656	'intersection_noresults' => 'Error: Sem resultados!',
717	657	'intersection_noincludecats' => 'Error: É necessário incluir no mínimo uma categoria ou especificar um espaço nominal!',
718	658	);
—	—	@@ -722,7 +662,6 @@
723	663	$messages['pt-br'] = array(
724	664	'intersection-desc' => 'Exibe uma lista pontuada dos itens mais recentes presentes numa categoria, ou uma intersecção de várias categorias',
725	665	'intersection_toomanycats' => 'Erro: Categorias demais!',
726		~~- 'intersection_toofewcats' => 'Erro: Poucas categorias!',~~
727	666	'intersection_noresults' => 'Erro: Sem resultados!',
728	667	'intersection_noincludecats' => 'Erro: É necessário incluir no mínimo uma categoria ou especificar um espaço nominal!',
729	668	);
—	—	@@ -733,7 +672,6 @@
734	673	$messages['ro'] = array(
735	674	'intersection-desc' => 'Întoarce o lista celor mai recenţi itemi care fac parte dintr-o categorie, sau intersecţia a mai multor categorii',
736	675	'intersection_toomanycats' => 'Eroare: Prea multe categorii!',
737		~~- 'intersection_toofewcats' => 'Eroare: Prea puţine categorii!',~~
738	676	'intersection_noresults' => 'Eroare: Niciun rezultat!',
739	677	'intersection_noincludecats' => 'Eroare: Trebuie să incluzi cel puţin o categorie, sau să specifici un spaţiu de nume!',
740	678	);
—	—	@@ -744,7 +682,6 @@
745	683	$messages['roa-tara'] = array(
746	684	'intersection-desc' => "Fa assè 'na liste cu le palle de le urteme urteme artichele ca stonne jndr'à 'na categorije, o 'n'interseziona de cchiù categorije",
747	685	'intersection_toomanycats' => 'Errore: Troppe categorije!',
748		~~- 'intersection_toofewcats' => 'Errore: Troppe picche categorije!',~~
749	686	'intersection_noresults' => 'Errore: Nisciune resultete!',
750	687	'intersection_noincludecats' => "Errore: Tu è abbesogne de 'ngludere ninde ninde 'na categorije, o specificà 'nu namespace!",
751	688	);
—	—	@@ -756,7 +693,6 @@
757	694	$messages['ru'] = array(
758	695	'intersection-desc' => 'Выводит в маркированный список последние добавления в категорию или объединение нескольких категорий',
759	696	'intersection_toomanycats' => 'Ошибка. Слишком много категорий!',
760		~~- 'intersection_toofewcats' => 'Ошибка. Слишком мало категорий!',~~
761	697	'intersection_noresults' => 'Ошибка. Нет результатов!',
762	698	'intersection_noincludecats' => 'Ошибка. Вы должны включить хотя бы одну категорию или указать пространство имён!',
763	699	);
—	—	@@ -767,7 +703,6 @@
768	704	$messages['sah'] = array(
769	705	'intersection-desc' => 'Категорияларга бүтэһик эбиилэри эбэтэр категориялар холбонууларын бэлиэлээх (маркированнай) испииһэк курдук таһаарар',
770	706	'intersection_toomanycats' => 'Error: категорийата наһаа элбэх!',
771		~~- 'intersection_toofewcats' => 'Error: Категорията наһаа аҕыйах',~~
772	707	'intersection_noresults' => 'Error: Түмүк суох!',
773	708	'intersection_noincludecats' => 'Error: Биир эмит категорияны эбэтэр ааты (пространство имен) талыахтааххын!',
774	709	);
—	—	@@ -778,7 +713,6 @@
779	714	$messages['sk'] = array(
780	715	'intersection-desc' => 'Vypíše zoznam najnovších položiek v kategórii alebo zjednotení niekoľkých kategórií',
781	716	'intersection_toomanycats' => 'Error: Príliš veľa kategórií!',
782		~~- 'intersection_toofewcats' => 'Error: Príliš málo kategórií!',~~
783	717	'intersection_noresults' => 'Error: Žiadne výsledky!',
784	718	'intersection_noincludecats' => 'Error: Musíte uviesť aspoň jednu kategóriu alebo menný priestor!',
785	719	);
—	—	@@ -789,7 +723,6 @@
790	724	$messages['sr-ec'] = array(
791	725	'intersection-desc' => 'Даје редни списак најскорије додатих чланака у једну или више категорија.',
792	726	'intersection_toomanycats' => 'Грешка: Превише категорија!',
793		~~- 'intersection_toofewcats' => 'Грешка:Премало категорија!',~~
794	727	'intersection_noresults' => 'Грешка: Нема резулатата!',
795	728	'intersection_noincludecats' => 'Грешка: Потребно је укључити бар једну категорију или одредити именски простор!',
796	729	);
—	—	@@ -800,7 +733,6 @@
801	734	$messages['sr-el'] = array(
802	735	'intersection-desc' => 'Daje redni spisak najskorije dodatih članaka u jednu ili više kategorija.',
803	736	'intersection_toomanycats' => 'Greška: Previše kategorija!',
804		~~- 'intersection_toofewcats' => 'Greška:Premalo kategorija!',~~
805	737	'intersection_noresults' => 'Greška: Nema rezulatata!',
806	738	'intersection_noincludecats' => 'Greška: Potrebno je uključiti bar jednu kategoriju ili odrediti imenski prostor!',
807	739	);
—	—	@@ -811,7 +743,6 @@
812	744	$messages['stq'] = array(
813	745	'intersection-desc' => 'Uutgoawe fon ne Lieste fon do aktuälste Iendraage in ne Kategorie, of n Truchsnit fon moorere Kategorien.',
814	746	'intersection_toomanycats' => 'Error: Toufuul Kategorien!',
815		~~- 'intersection_toofewcats' => 'Error: Toumin Kategorien!',~~
816	747	'intersection_noresults' => 'Error: Neen Resultoat!',
817	748	'intersection_noincludecats' => 'Error: Der mout mindestens een Kategorie ienbuunen weese of reek n Noomensruum oun!',
818	749	);
—	—	@@ -822,7 +753,6 @@
823	754	$messages['sv'] = array(
824	755	'intersection-desc' => 'Skapar punktlistor över de nyaste sidorna i en eller flera kategorier',
825	756	'intersection_toomanycats' => 'Fel: För många kategorier!',
826		~~- 'intersection_toofewcats' => 'Fel: För få kategorier!',~~
827	757	'intersection_noresults' => 'Fel: Inga resultat!',
828	758	'intersection_noincludecats' => 'Fel: Du måste inkludera minst en kategori eller ange en namnrymd!',
829	759	);
—	—	@@ -832,7 +762,6 @@
833	763	*/
834	764	$messages['te'] = array(
835	765	'intersection_toomanycats' => 'Error: చాలా ఎక్కువ వర్గాలు!',
836		~~- 'intersection_toofewcats' => 'Error: మరీ తక్కువ వర్గాలు!',~~
837	766	'intersection_noresults' => 'Error: ఫలితాలు లేవు!',
838	767	'intersection_noincludecats' => 'Error: మీరు కనీసం ఒక్క వర్గాన్నైనా చేర్చాలి, లేదా ఓ నేమ్&zwnj;స్పేసునైనా ఇవ్వాలి!',
839	768	);
—	—	@@ -843,7 +772,6 @@
844	773	$messages['tg-cyrl'] = array(
845	774	'intersection-desc' => 'Феҳристи гулулае аз саҳифаҳое ба намоиш дар меояд, ки ба тозагӣ дар як ё чанд гурӯҳ ворид шудаанд',
846	775	'intersection_toomanycats' => 'Error: Теъдоди гурӯҳҳо зиёд аст!',
847		~~- 'intersection_toofewcats' => 'Error: Теъдоди гурӯҳҳо кам аст!',~~
848	776	'intersection_noresults' => 'Error: Натиҷае вуҷуд надорад!',
849	777	'intersection_noincludecats' => 'Error: Шумо ҳадди ақал бояд як гурӯҳро ворид кунед, ё як фазои номро мушаххас кунед!',
850	778	);
—	—	@@ -876,7 +804,6 @@
877	805	$messages['tl'] = array(
878	806	'intersection-desc' => 'Naglalabas ng isang tinuldukang talaan ng pinakakamakailang mga bagay-bagay na naninirahan sa loob ng isang kaurian, o isang pinagsangahang daanan ng ilang mga kaurian',
879	807	'intersection_toomanycats' => 'Kamalian: Napakaraming mga kaurian!',
880		~~- 'intersection_toofewcats' => 'Kamalian: Napakakaunti ng mga kaurian!',~~
881	808	'intersection_noresults' => 'Kaurian: Walang mga kinalabasan/resulta!',
882	809	'intersection_noincludecats' => 'Kamalian: Kinakailangan mong magsama ng kahit na isang kaurian, o tumukoy ng isang espasyo ng pangalan!',
883	810	);
—	—	@@ -887,7 +814,6 @@
888	815	$messages['tr'] = array(
889	816	'intersection-desc' => 'Bir kategoride, yada birçok kategorinin kesişiminde bulunan en son öğelerin, madde işaretli listesini üretir',
890	817	'intersection_toomanycats' => 'Hata: Çok fazla kategori!',
891		~~- 'intersection_toofewcats' => 'Hata: Çok az kategori!',~~
892	818	'intersection_noresults' => 'Hata: Sonuç yok!',
893	819	'intersection_noincludecats' => 'Hata: En az bir kategori eklemeli, ya da bir ad alanı belirtmelisiniz!',
894	820	);
—	—	@@ -898,7 +824,6 @@
899	825	$messages['uk'] = array(
900	826	'intersection-desc' => "Виводить у маркований список останні додавання до категорії або об'єднання кількох категорій",
901	827	'intersection_toomanycats' => 'Error: дуже багато категорій!',
902		~~- 'intersection_toofewcats' => 'Error: дуже мало категорій!',~~
903	828	'intersection_noresults' => 'Error: нема результатів!',
904	829	'intersection_noincludecats' => 'Error: ви повинні включити хоча б одну категорію або зазначити простір назв!',
905	830	);
—	—	@@ -909,7 +834,6 @@
910	835	$messages['vec'] = array(
911	836	'intersection-desc' => "Mostra un elenco puntato coi elementi piassè reçenti inserìi in te na categoria o ne l'union de più categorie",
912	837	'intersection_toomanycats' => 'Error: Ghe xe massa categorie!',
913		~~- 'intersection_toofewcats' => 'Error: Ghe xe massa póche categorie!',~~
914	838	'intersection_noresults' => 'Error: Nissun risultato!',
915	839	'intersection_noincludecats' => 'Error: Te ghè da inclùdar almanco na categoria opure specificar un namespace.',
916	840	);
—	—	@@ -920,7 +844,6 @@
921	845	$messages['vep'] = array(
922	846	'intersection-desc' => "Ozutab markiruidud nimikirjutesen nägus jäl'gmäižed ližadused kategorijaha vai kategorijoiden ühtenzoituz",
923	847	'intersection_toomanycats' => 'Error: äjahk kategorijoid!',
924		~~- 'intersection_toofewcats' => 'Error: Vähähk kategorijoid!',~~
925	848	'intersection_noresults' => "Error: Ei ole rezul'tatoid!",
926	849	'intersection_noincludecats' => "Petuz: pidab mülütada hot' üks' kategorii vai märita nimiavaruz!",
927	850	);
—	—	@@ -931,7 +854,6 @@
932	855	$messages['vi'] = array(
933	856	'intersection-desc' => 'Cho ra danh sách những khoản gần đây nhất được xếp vào một thể loại hay hợp của hơn một thể loại',
934	857	'intersection_toomanycats' => 'Error: Nhiều thể loại quá!',
935		~~- 'intersection_toofewcats' => 'Error: Ít thể loại quá!',~~
936	858	'intersection_noresults' => 'Error: Không tìm thấy trang nào!',
937	859	'intersection_noincludecats' => 'Error: Cần phải bao gồm ít nhất một thể loại hay định rõ một không gian tên!',
938	860	);
—	—	@@ -941,7 +863,6 @@
942	864	*/
943	865	$messages['vo'] = array(
944	866	'intersection_toomanycats' => 'Error: Klads tu mödiks!',
945		~~- 'intersection_toofewcats' => 'Error: Klads tu nemödiks!',~~
946	867	'intersection_noresults' => 'Error: Seks nonik!',
947	868	'intersection_noincludecats' => 'Error: Nedol välön kladi pu bali, u nemaspadi!',
948	869	);
—	—	@@ -952,7 +873,6 @@
953	874	$messages['yue'] = array(
954	875	'intersection-desc' => '輸出一個點列最近響分類嘅項目，或者係幾個分類嘅一個聯繫',
955	876	'intersection_toomanycats' => 'DynamicPageList: 太多分類!',
956		~~- 'intersection_toofewcats' => 'DynamicPageList: 太少分類!',~~
957	877	'intersection_noresults' => 'DynamicPageList: 無結果!',
958	878	'intersection_noincludecats' => 'DynamicPageList: 你需要去包含最少一個分類，或者指定一個空間名!',
959	879	);
—	—	@@ -963,7 +883,6 @@
964	884	$messages['zh-hans'] = array(
965	885	'intersection-desc' => '输出一个点列最近在分类中的项目，或者系数个分类的一个联系',
966	886	'intersection_toomanycats' => 'DynamicPageList: 太多分类!',
967		~~- 'intersection_toofewcats' => 'DynamicPageList: 太少分类!',~~
968	887	'intersection_noresults' => 'DynamicPageList: 没有结果!',
969	888	'intersection_noincludecats' => 'DynamicPageList: 您需要去包含最少一个分类，或者指定一个空间名!',
970	889	);
—	—	@@ -974,7 +893,6 @@
975	894	$messages['zh-hant'] = array(
976	895	'intersection-desc' => '輸出一個點列最近在分類中的項目，或者係數個分類的一個聯繫',
977	896	'intersection_toomanycats' => 'DynamicPageList: 太多分類!',
978		~~- 'intersection_toofewcats' => 'DynamicPageList: 太少分類!',~~
979	897	'intersection_noresults' => 'DynamicPageList: 沒有結果!',
980	898	'intersection_noincludecats' => 'DynamicPageList: 您需要去包含最少一個分類，或者指定一個空間名!',
981	899	);
Index: trunk/extensions/intersection/DynamicPageList.php
—	—	@@ -26,20 +26,16 @@
27	27
28	28	Current feature request list
29	29	1. Unset cached of calling page
30		~~- 2. Alternative formatting (not just unordered list)~~
31		~~- 3. Configurable sort order, ascending/descending~~
32		~~- 4. RSS feed output?~~
	30	+ 4. RSS feed output? (GNSM extension?)
33	31
34	32	To install, add following to LocalSettings.php
35	33	include("extensions/intersection/DynamicPageList.php");
36	34
37	35	*/
38	36
39		~~-$wgDLPminCategories = 1; // Minimum number of categories to look for~~
40	37	$wgDLPmaxCategories = 6; // Maximum number of categories to look for
41		~~-$wgDLPMinResultCount = 1; // Minimum number of results to allow~~
42		~~-$wgDLPMaxResultCount = 50; // Maximum number of results to allow~~
43		~~-$wgDLPAllowUnlimitedResults = true; // Allow unlimited results~~
	38	+$wgDLPMaxResultCount = 200; // Maximum number of results to allow
	39	+$wgDLPAllowUnlimitedResults = false; // Allow unlimited results
44	40	$wgDLPAllowUnlimitedCategories = false; // Allow unlimited categories
45	41
46	42	$wgHooks['ParserFirstCallInit'][] = 'wfDynamicPageList';
—	—	@@ -67,7 +63,8 @@
68	64	global $wgUser;
69	65	global $wgLang;
70	66	global $wgContLang;
71		~~- global $wgDLPminCategories, $wgDLPmaxCategories,$wgDLPMinResultCount, $wgDLPMaxResultCount;~~
	67	+ global $wgDisableCounters; // to determine if to allow sorting by #hits.
	68	+ global $wgDLPmaxCategories, $wgDLPMaxResultCount;
72	69	global $wgDLPAllowUnlimitedResults, $wgDLPAllowUnlimitedCategories;
73	70
74	71	$aParams = array();
—	—	@@ -78,21 +75,35 @@
79	76	$sStartItem = '<li>';
80	77	$sEndItem = '</li>';
81	78
	79	+ $bUseGallery = false;
	80	+ $bGalleryFileSize = false;
	81	+ $bGalleryFileName = true;
	82	+ $iGalleryImageHeight = 0;
	83	+ $iGalleryImageWidth = 0;
	84	+ $iGalleryNumbRows = 0;
	85	+ $sGalleryCaption = '';
	86	+ $gallery = NULL;
	87	+
82	88	$sOrderMethod = 'categoryadd';
83	89	$sOrder = 'descending';
84	90	$sRedirects = 'exclude';
85	91	$sStable = $sQuality = 'include';
	92	+ $bFlaggedRevs = false;
86	93
87	94	$bNamespace = false;
88	95	$iNamespace = 0;
89	96
90		~~- $bShowCurId = false;~~
	97	+ $iOffset = 0;
	98	+
91	99	$bGoogleHack = false;
92	100
93	101	$bSuppressErrors = false;
94	102	$bShowNamespace = true;
95	103	$bAddFirstCategoryDate = false;
	104	+ $sDateFormat = '';
	105	+ $bStripYear = false;
96	106
	107	+ $aLinkOptions = array();
97	108	$aCategories = array();
98	109	$aExcludeCategories = array();
99	110
—	—	@@ -101,58 +112,66 @@
102	113	$parser = new Parser;
103	114	$poptions = new ParserOptions;
104	115
105		~~- foreach($aParams as $sParam)~~
106		~~- {~~
107		~~- $aParam = explode("=", $sParam);~~
	116	+ foreach ( $aParams as $sParam ) {
	117	+ $aParam = explode( "=", $sParam, 2 );
108	118	if( count( $aParam ) < 2 )
109	119	continue;
110	120	$sType = trim($aParam[0]);
111	121	$sArg = trim($aParam[1]);
112		~~- if ($sType == 'category')~~
113		~~- {~~
	122	+ switch ( $sType ) {
	123	+ case 'category':
114	124	$title = Title::newFromText( $parser->transformMsg($sArg, $poptions) );
115	125	if( is_null( $title ) )
116	126	continue;
117	127	$aCategories[] = $title;
118		~~- }~~
119		~~- else if ($sType == 'notcategory')~~
120		~~- {~~
	128	+ break;
	129	+ case 'notcategory':
121	130	$title = Title::newFromText( $parser->transformMsg($sArg, $poptions) );
122	131	if( is_null( $title ) )
123	132	continue;
124	133	$aExcludeCategories[] = $title;
125		~~- }~~
126		~~- else if ('namespace' == $sType)~~
127		~~- {~~
	134	+ break;
	135	+ case 'namespace':
128	136	$ns = $wgContLang->getNsIndex($sArg);
129		~~- if (null != $ns)~~
130		~~- {~~
	137	+ if ( NULL != $ns ) {
131	138	$iNamespace = $ns;
132	139	$bNamespace = true;
133		~~- }~~
134		~~- else~~
135		~~- {~~
	140	+ } else {
136	141	$iNamespace = intval($sArg);
137		~~- if ($iNamespace >= 0)~~
138		~~- {~~
	142	+ if ( $iNamespace >= 0 ) {
139	143	$bNamespace = true;
140		~~- }~~
141		~~- else~~
142		~~- {~~
	144	+ } else {
143	145	$bNamespace = false;
144	146	}
145	147	}
146		~~- }~~
147		~~- else if ('count' == $sType)~~
148		~~- {~~
	148	+ break;
	149	+ case 'count':
149	150	//ensure that $iCount is a number;
150	151	$iCount = IntVal( $sArg );
151	152	$bCountSet = true;
152		~~- }~~
153		~~- else if ('mode' == $sType)~~
154		~~- {~~
155		~~- switch ($sArg)~~
156		~~- {~~
	153	+ break;
	154	+ case 'offset':
	155	+ $iOffset = IntVal( $sArg );
	156	+ break;
	157	+ case 'imagewidth':
	158	+ $iGalleryImageWidth = IntVal( $sArg );
	159	+ break;
	160	+ case 'imageheight':
	161	+ $iGalleryImageHeight = IntVal( $sArg );
	162	+ break;
	163	+ case 'imagesperrow':
	164	+ $iGalleryNumbRows = IntVal( $sArg );
	165	+ break;
	166	+ case 'mode':
	167	+ switch ( $sArg ) {
	168	+ case 'gallery':
	169	+ $bUseGallery = true;
	170	+ $gallery = new ImageGallery;
	171	+ $sStartList = '';
	172	+ $sEndList = '';
	173	+ $sStartItem = '';
	174	+ $sEndItem = '';
	175	+ break;
157	176	case 'none':
158	177	$sStartList = '';
159	178	$sEndList = '';
—	—	@@ -173,11 +192,37 @@
174	193	$sEndItem = '</li>';
175	194	break;
176	195	}
	196	+ break;
	197	+ case 'gallerycaption':
	198	+ // Should perhaps actually parse caption instead
	199	+ // as links and what not in caption might be useful.
	200	+ $sGalleryCaption = $parser->transformMsg( $sArg, $poptions );
	201	+ break;
	202	+ case 'galleryshowfilesize':
	203	+ switch ( $sArg ) {
	204	+ case 'no':
	205	+ case 'false':
	206	+ $bGalleryFileSize = false;
	207	+ break;
	208	+ case 'true':
	209	+ default:
	210	+ $bGalleryFileSize = true;
177	211	}
178		~~- else if ('order' == $sType)~~
179		~~- {~~
180		~~- switch ($sArg)~~
181		~~- {~~
	212	+ break;
	213	+ case 'galleryshowfilename':
	214	+ switch ( $sArg ) {
	215	+ case 'no':
	216	+ case 'false':
	217	+ $bGalleryFileName = false;
	218	+ break;
	219	+ case 'true':
	220	+ default:
	221	+ $bGalleryFileName = true;
	222	+ break;
	223	+ }
	224	+ break;
	225	+ case 'order':
	226	+ switch ( $sArg ) {
182	227	case 'ascending':
183	228	$sOrder = 'ascending';
184	229	break;
—	—	@@ -186,24 +231,37 @@
187	232	$sOrder = 'descending';
188	233	break;
189	234	}
190		~~- }~~
191		~~- else if ('ordermethod' == $sType)~~
192		~~- {~~
193		~~- switch ($sArg)~~
194		~~- {~~
	235	+ break;
	236	+ case 'ordermethod':
	237	+ switch ( $sArg ) {
195	238	case 'lastedit':
196	239	$sOrderMethod = 'lastedit';
197	240	break;
	241	+ case 'length':
	242	+ $sOrderMethod = 'length';
	243	+ break;
	244	+ case 'created':
	245	+ $sOrderMethod = 'created';
	246	+ break;
	247	+ case 'sortkey':
	248	+ case 'categorysortkey':
	249	+ $sOrderMethod = 'categorysortkey';
	250	+ break;
	251	+ case 'popularity':
	252	+ if ( !$wgDisableCounters ) {
	253	+ $sOrderMethod = 'popularity';
	254	+ } else {
	255	+ $sOrderMethod = 'categoyadd'; // default if hitcounter disabled.
	256	+ }
	257	+ break;
198	258	case 'categoryadd':
199	259	default:
200	260	$sOrderMethod = 'categoryadd';
201	261	break;
202	262	}
203		~~- }~~
204		~~- else if ('redirects' == $sType)~~
205		~~- {~~
206		~~- switch ($sArg)~~
207		~~- {~~
	263	+ break;
	264	+ case 'redirects':
	265	+ switch ( $sArg ) {
208	266	case 'include':
209	267	$sRedirects = 'include';
210	268	break;
—	—	@@ -215,260 +273,331 @@
216	274	$sRedirects = 'exclude';
217	275	break;
218	276	}
219		~~- }~~
220		~~- else if ('stablepages' == $sType)~~
221		~~- {~~
222		~~- switch ($sArg)~~
223		~~- {~~
	277	+ break;
	278	+ case 'stablepages':
	279	+ switch ( $sArg ) {
224	280	case 'include':
225	281	$sStable = 'include';
226	282	break;
227	283	case 'only':
	284	+ $bFlaggedRevs = true;
228	285	$sStable = 'only';
229	286	break;
230	287	case 'exclude':
231	288	default:
	289	+ $bFlaggedRevs = true;
232	290	$sStable = 'exclude';
233	291	break;
234	292	}
235		~~- }~~
236		~~- else if ('qualitypages' == $sType)~~
237		~~- {~~
238		~~- switch ($sArg)~~
239		~~- {~~
	293	+ break;
	294	+ case 'qualitypages':
	295	+ switch ( $sArg ) {
240	296	case 'include':
241	297	$sQuality = 'include';
242	298	break;
243	299	case 'only':
	300	+ $bFlaggedRevs = true;
244	301	$sQuality = 'only';
245	302	break;
246	303	case 'exclude':
247	304	default:
	305	+ $bFlaggedRevs = true;
248	306	$sQuality = 'exclude';
249	307	break;
250	308	}
251		~~- }~~
252		~~- else if ('suppresserrors' == $sType)~~
253		~~- {~~
254		~~- if ('true' == $sArg)~~
	309	+ break;
	310	+ case 'suppresserrors':
	311	+ if ( 'true' == $sArg ) {
255	312	$bSuppressErrors = true;
256		~~- else~~
	313	+ } else {
257	314	$bSuppressErrors = false;
258	315	}
259		~~- else if ('addfirstcategorydate' == $sType)~~
260		~~- {~~
261		~~- if ('true' == $sArg)~~
	316	+ break;
	317	+ case 'addfirstcategorydate':
	318	+ if ( 'true' == $sArg ) {
262	319	$bAddFirstCategoryDate = true;
263		~~- else~~
	320	+ } elseif ( preg_match( '/^(?:[ymd]{2,3}\|ISO 8601)$/', $sArg ) ) {
	321	+ // if it more or less is valid dateformat.
	322	+ $bAddFirstCategoryDate = true;
	323	+ $sDateFormat = $sArg;
	324	+ if ( strlen( $sDateFormat ) == 2 ) {
	325	+ $sDateFormat = $sDateFormat . 'y'; # DateFormatter does not support no year. work arround
	326	+ $bStripYear = true;
	327	+ }
	328	+ } else {
264	329	$bAddFirstCategoryDate = false;
265	330	}
266		~~- else if ('shownamespace' == $sType)~~
267		~~- {~~
268		~~- if ('false' == $sArg)~~
	331	+ break;
	332	+ case 'shownamespace':
	333	+ if ( 'false' == $sArg ) {
269	334	$bShowNamespace = false;
270		~~- else~~
	335	+ } else {
271	336	$bShowNamespace = true;
272	337	}
273		~~- else if ('showcurid' == $sType )~~
274		~~- {~~
275		~~- if ('false' == $sArg)~~
276		~~- $bShowCurId = false;~~
277		~~- else~~
278		~~- $bShowCurId = true;~~
279		~~- }~~
280		~~- else if ('googlehack' == $sType)~~
281		~~- {~~
282		~~- if ('false' == $sArg)~~
	338	+ break;
	339	+ case 'googlehack':
	340	+ if ( 'false' == $sArg ) {
283	341	$bGoogleHack = false;
284		~~- else~~
	342	+ } else {
285	343	$bGoogleHack = true;
286	344	}
	345	+ break;
	346	+ case 'nofollow': # bug 6658
	347	+ if ( 'false' != $sArg ) {
	348	+ $aLinkOptions['rel'] = 'nofollow';
287	349	}
	350	+ break;
	351	+ }
	352	+ }
288	353
289	354	$iCatCount = count($aCategories);
290	355	$iExcludeCatCount = count($aExcludeCategories);
291	356	$iTotalCatCount = $iCatCount + $iExcludeCatCount;
292	357
293		~~- if ($iCatCount < 1 && false == $bNamespace)~~
294		~~- {~~
295		~~- if (false == $bSuppressErrors)~~
	358	+ if ( $iCatCount < 1 && false == $bNamespace ) {
	359	+ if ( false == $bSuppressErrors ) {
296	360	return htmlspecialchars( wfMsg( 'intersection_noincludecats' ) ); // "!!no included categories!!";
297		~~- else~~
	361	+ } else {
298	362	return '';
299	363	}
300		-
301		~~- if ($iTotalCatCount < $wgDLPminCategories)~~
302		~~- {~~
303		~~- if (false == $bSuppressErrors)~~
304		~~- return htmlspecialchars( wfMsg( 'intersection_toofewcats' ) ); // "!!too few categories!!";~~
305		~~- else~~
306		~~- return '';~~
307	364	}
308	365
309		~~- if ( $iTotalCatCount > $wgDLPmaxCategories && !$wgDLPAllowUnlimitedCategories )~~
310		~~- {~~
311		~~- if (false == $bSuppressErrors)~~
	366	+ if ( $iTotalCatCount > $wgDLPmaxCategories && !$wgDLPAllowUnlimitedCategories ) {
	367	+ if ( false == $bSuppressErrors ) {
312	368	return htmlspecialchars( wfMsg( 'intersection_toomanycats' ) ); // "!!too many categories!!";
313		~~- else~~
	369	+ } else {
314	370	return '';
315	371	}
	372	+ }
316	373
317		~~- if ($bCountSet)~~
318		~~- {~~
319		~~- if ($iCount < $wgDLPMinResultCount)~~
320		~~- $iCount = $wgDLPMinResultCount;~~
321		~~- if ($iCount > $wgDLPMaxResultCount)~~
	374	+ if ( $bCountSet ) {
	375	+ if ( $iCount < 1 ) {
	376	+ $iCount = 1;
	377	+ }
	378	+ if ( $iCount > $wgDLPMaxResultCount ) {
322	379	$iCount = $wgDLPMaxResultCount;
323	380	}
324		~~- else~~
325		~~- {~~
326		~~- if (!$wgDLPAllowUnlimitedResults)~~
327		~~- {~~
	381	+ } elseif ( !$wgDLPAllowUnlimitedResults ) {
328	382	$iCount = $wgDLPMaxResultCount;
329	383	$bCountSet = true;
330	384	}
331		~~- }~~
332	385
333	386	//disallow showing date if the query doesn't have an inclusion category parameter
334		~~- if ($iCatCount < 1)~~
	387	+ if ( $iCatCount < 1 ) {
335	388	$bAddFirstCategoryDate = false;
	389	+ // don't sort by fields relating to categories if there are no categories.
	390	+ if ( $sOrderMethod == 'categoryadd' \|\| $sOrderMethod == 'categorysortkey' ) {
	391	+ $sOrderMethod = 'created';
	392	+ }
	393	+ }
336	394
337	395
338	396	//build the SQL query
339	397	$dbr =& wfGetDB( DB_SLAVE );
340		~~- $sPageTable = $dbr->tableName( 'page' );~~
341		~~- $categorylinks = $dbr->tableName( 'categorylinks' );~~
342		~~- $sSqlSelectFrom = "SELECT page_namespace, page_title, page_id, c1.cl_timestamp FROM $sPageTable";~~
	398	+ $aTables = Array( 'page' );
	399	+ $aFields = Array( 'page_namespace', 'page_title' );
	400	+ $aWhere = Array();
	401	+ $aJoin = Array();
	402	+ $aOptions = Array();
343	403
344		~~- if (true == $bNamespace)~~
345		~~- $sSqlWhere = ' WHERE page_namespace='.$iNamespace.' ';~~
346		~~- else~~
347		~~- $sSqlWhere = ' WHERE 1=1 ';~~
	404	+ if ( $bGoogleHack ) {
	405	+ $aFields[] = 'page_id';
	406	+ }
348	407
	408	+ if ( $bAddFirstCategoryDate ) {
	409	+ $aFields[] = 'c1.cl_timestamp';
	410	+ }
	411	+
	412	+ if ( true == $bNamespace ) {
	413	+ $aWhere['page_namespace'] = $iNamespace;
	414	+ }
	415	+
349	416	// Bug 14943 - Allow filtering based on FlaggedRevs stability.
350	417	// Check if the extension actually exists before changing the query...
351		~~- if( function_exists('efLoadFlaggedRevs') ) {~~
352		~~- $flaggedpages = $dbr->tableName( 'flaggedpages' );~~
353		~~- $filterSet = array('only','exclude');~~
354		~~- # Either involves the same JOIN here...~~
355		~~- if( in_array($sStable,$filterSet) \|\| in_array($sQuality,$filterSet) ) {~~
356		~~- $sSqlSelectFrom .= " LEFT JOIN $flaggedpages ON page_id = fp_page_id";~~
357		~~- }~~
358		~~- switch( $sStable )~~
359		~~- {~~
	418	+ if ( function_exists( 'efLoadFlaggedRevs' ) && $bFlaggedRevs ) {
	419	+ $aTables[] = 'flaggedpages';
	420	+ $aJoin['flaggedpages'] = Array( 'LEFT JOIN', 'page_id = fp_page_id' );
	421	+
	422	+ switch( $sStable ) {
360	423	case 'only':
361		~~- $sSqlWhere .= ' AND fp_stable IS NOT NULL ';~~
	424	+ $aWhere[] = 'fp_stable IS NOT NULL';
362	425	break;
363	426	case 'exclude':
364		~~- $sSqlWhere .= ' AND fp_stable IS NULL ';~~
	427	+ $aWhere['fp_stable'] = null;
365	428	break;
366	429	}
367		~~- switch( $sQuality )~~
368		~~- {~~
	430	+
	431	+ switch( $sQuality ) {
369	432	case 'only':
370		~~- $sSqlWhere .= ' AND fp_quality >= 1';~~
	433	+ $aWhere[] = 'fp_quality >= 1';
371	434	break;
372	435	case 'exclude':
373		~~- $sSqlWhere .= ' AND fp_quality = 0';~~
	436	+ $aWhere[] = 'fp_quality = 0 OR fp_quality IS NULL';
374	437	break;
375	438	}
376	439	}
377	440
378		~~- switch ($sRedirects)~~
379		~~- {~~
	441	+ switch ( $sRedirects ) {
380	442	case 'only':
381		~~- $sSqlWhere .= ' AND page_is_redirect = 1 ';~~
	443	+ $aWhere['page_is_redirect'] = 1;
382	444	break;
383	445	case 'exclude':
384		~~- $sSqlWhere .= ' AND page_is_redirect = 0 ';~~
	446	+ $aWhere['page_is_redirect'] = 0;
385	447	break;
386	448	}
387	449
388		~~- $iCurrentTableNumber = 0;~~
	450	+ $iCurrentTableNumber = 1;
	451	+ $categorylinks = $dbr->tableName( 'categorylinks' );
389	452
390	453	for ($i = 0; $i < $iCatCount; $i++) {
391		~~- $sSqlSelectFrom .= " INNER JOIN $categorylinks AS c" . ($iCurrentTableNumber+1);~~
392		~~- $sSqlSelectFrom .= ' ON page_id = c'.($iCurrentTableNumber+1).'.cl_from';~~
393		~~- $sSqlSelectFrom .= ' AND c'.($iCurrentTableNumber+1).'.cl_to='.~~
394		~~- $dbr->addQuotes( $aCategories[$i]->getDBkey() );~~
	454	+ $aJoin["$categorylinks AS c$iCurrentTableNumber"] = Array( 'INNER JOIN',
	455	+ Array( "page_id = c{$iCurrentTableNumber}.cl_from",
	456	+ "c{$iCurrentTableNumber}.cl_to={$dbr->addQuotes($aCategories[$i]->getDBKey())}"
	457	+ )
	458	+ );
	459	+ $aTables[] = "$categorylinks AS c$iCurrentTableNumber";
395	460
396	461	$iCurrentTableNumber++;
397	462	}
398	463
399	464	for ($i = 0; $i < $iExcludeCatCount; $i++) {
400		~~- $sSqlSelectFrom .= " LEFT OUTER JOIN $categorylinks AS c" . ($iCurrentTableNumber+1);~~
401		~~- $sSqlSelectFrom .= ' ON page_id = c'.($iCurrentTableNumber+1).'.cl_from';~~
402		~~- $sSqlSelectFrom .= ' AND c'.($iCurrentTableNumber+1).'.cl_to='.~~
403		~~- $dbr->addQuotes( $aExcludeCategories[$i]->getDBkey() );~~
404		-
405		~~- $sSqlWhere .= ' AND c'.($iCurrentTableNumber+1).'.cl_to IS NULL';~~
406		-
	465	+ $aJoin["$categorylinks AS c$iCurrentTableNumber"] = Array( 'LEFT OUTER JOIN',
	466	+ Array( "page_id = c{$iCurrentTableNumber}.cl_from",
	467	+ "c{$iCurrentTableNumber}.cl_to={$dbr->addQuotes($aExcludeCategories[$i]->getDBKey())}"
	468	+ )
	469	+ );
	470	+ $aTables[] = "$categorylinks AS c$iCurrentTableNumber";
	471	+ $aWhere["c{$iCurrentTableNumber}.cl_to"] = null;
407	472	$iCurrentTableNumber++;
408	473	}
409	474
410		~~- if ('descending' == $sOrder)~~
	475	+ if ( 'descending' == $sOrder ) {
411	476	$sSqlOrder = 'DESC';
412		~~- else~~
	477	+ } else {
413	478	$sSqlOrder = 'ASC';
	479	+ }
414	480
415		~~- if ('lastedit' == $sOrderMethod)~~
416		~~- $sSqlWhere .= ' ORDER BY page_touched ';~~
417		~~- else~~
418		~~- $sSqlWhere .= ' ORDER BY c1.cl_timestamp ';~~
	481	+ switch ( $sOrderMethod ) {
	482	+ case 'lastedit':
	483	+ $sSqlSort = 'page_touched';
	484	+ break;
	485	+ case 'length':
	486	+ $sSqlSort = 'page_len';
	487	+ break;
	488	+ case 'created':
	489	+ $sSqlSort = 'page_id'; # Since they're never reused and increasing
	490	+ break;
	491	+ case 'categorysortkey':
	492	+ $sSqlSort = 'c1.cl_sortkey';
	493	+ break;
	494	+ case 'popularity':
	495	+ $sSqlSort = 'page_counter';
	496	+ break;
	497	+ case 'categoryadd':
	498	+ default:
	499	+ $sSqlSort = 'c1.cl_timestamp';
	500	+ break;
	501	+ }
419	502
420		~~- $sSqlWhere .= $sSqlOrder;~~
	503	+ $aOptions['ORDER BY'] = "$sSqlSort $sSqlOrder";
421	504
422		-
423		~~- if ($bCountSet)~~
424		~~- {~~
425		~~- $sSqlWhere .= ' LIMIT ' . $iCount;~~
	505	+ if ( $bCountSet ) {
	506	+ $aOptions['LIMIT'] = $iCount;
426	507	}
	508	+ if ( $iOffset > 0 ) {
	509	+ $aOptions['OFFSET'] = $iOffset;
	510	+ }
427	511
428		~~- //DEBUG: output SQL query~~
429		~~- //$output .= 'QUERY: [' . $sSqlSelectFrom . $sSqlWhere . "]<br />";~~
430		-
431	512	// process the query
432		~~- $res = $dbr->query($sSqlSelectFrom . $sSqlWhere);~~
433		-
	513	+ $res = $dbr->select( $aTables, $aFields, $aWhere, __METHOD__, $aOptions, $aJoin );
434	514	$sk =& $wgUser->getSkin();
435	515
436		~~- if ($dbr->numRows( $res ) == 0)~~
437		~~- {~~
438		~~- if (false == $bSuppressErrors)~~
	516	+ if ( $dbr->numRows( $res ) == 0 ) {
	517	+ if ( false == $bSuppressErrors ) {
439	518	return htmlspecialchars( wfMsg( 'intersection_noresults' ) );
440		~~- else~~
	519	+ } else {
441	520	return '';
442	521	}
	522	+ }
443	523
444	524	//start unordered list
445	525	$output = $sStartList . "\n";
446	526
	527	+ $categoryDate = '';
	528	+ $df = null;
	529	+ if ( $sDateFormat != '' && $bAddFirstCategoryDate ) {
	530	+ $df = DateFormatter::getInstance();
	531	+ }
	532	+
447	533	//process results of query, outputing equivalent of <li>[[Article]]</li> for each result,
448	534	//or something similar if the list uses other startlist/endlist
449	535	while ($row = $dbr->fetchObject( $res ) ) {
450	536	$title = Title::makeTitle( $row->page_namespace, $row->page_title);
451	537	$output .= $sStartItem;
452		~~- if (true == $bAddFirstCategoryDate)~~
453		~~- $output .= $wgLang->date( wfTimestamp( TS_MW, $row->cl_timestamp ) ) . wfMsg( 'colon-separator' );~~
	538	+ if ( true == $bAddFirstCategoryDate ) {
	539	+ if ( $sDateFormat != '' ) {
	540	+ # this is a tad ugly
	541	+ # use DateFormatter, and support disgarding year.
	542	+ $categoryDate = wfTimestamp( TS_ISO_8601, $row->cl_timestamp );
	543	+ if ( $bStripYear ) {
	544	+ $categoryDate = $wgContLang->getMonthName( substr( $categoryDate, 5, 2 ) )
	545	+ . ' ' . substr ( $categoryDate, 8, 2 );
	546	+ } else {
	547	+ $categoryDate = substr( $categoryDate, 0, 10 );
	548	+ }
	549	+ $categoryDate = $df->reformat( $sDateFormat, $categoryDate, array( 'match-whole' ) );
	550	+ } else {
	551	+ $categoryDate = $wgLang->date( wfTimestamp( TS_MW, $row->cl_timestamp ) );
	552	+ }
	553	+ if ( !$bUseGallery ) {
	554	+ $categoryDate .= wfMsg( 'colon-separator' );
	555	+ } else {
	556	+ $categoryDate .= ' ';
	557	+ }
	558	+ }
454	559
455	560	$query = array();
456		~~- if (true == $bShowCurId)~~
457		~~- $query['curid'] = intval($row->page_id);~~
458		~~- if ($bGoogleHack)~~
	561	+
	562	+ if ( true == $bGoogleHack ) {
459	563	$query['dpl_id'] = intval($row->page_id);
	564	+ }
460	565
461		~~- if (true == $bShowNamespace)~~
	566	+ if ( true == $bShowNamespace ) {
462	567	$titleText = $title->getPrefixedText();
463		~~- else~~
	568	+ } else {
464	569	$titleText = $title->getText();
	570	+ }
465	571
466		~~- $output .= $sk->link($title, htmlspecialchars($titleText), array(), $query, array( 'forcearticlepath', 'known' ) );~~
467		-
	572	+ if ( $bUseGallery ) {
	573	+ # Note, $categoryDate is treated as raw html
	574	+ # this is safe since the only html present
	575	+ # would come from the dateformatter <span>.
	576	+ $gallery->add( $title, $categoryDate );
	577	+ } else {
	578	+ $output .= $categoryDate;
	579	+ $output .= $sk->link( $title, htmlspecialchars( $titleText ), $aLinkOptions, $query, array( 'forcearticlepath', 'known' ) );
468	580	$output .= $sEndItem . "\n";
469	581	}
	582	+ }
470	583
471	584	//end unordered list
	585	+ if ( $bUseGallery ) {
	586	+ $gallery->setHideBadImages();
	587	+ $gallery->setShowFilename( $bGalleryFileName );
	588	+ $gallery->setShowBytes( $bGalleryFileSize );
	589	+ if ( $iGalleryImageHeight > 0 )
	590	+ $gallery->setHeights( $iGalleryImageHeight );
	591	+ if ( $iGalleryImageWidth > 0 )
	592	+ $gallery->setWidths( $iGalleryImageWidth );
	593	+ if ( $iGalleryNumbRows > 0 )
	594	+ $gallery->setPerRow( $iGalleryNumbRows );
	595	+ if ( $sGalleryCaption != '' )
	596	+ $gallery->setCaption( $sGalleryCaption ); # gallery class escapes string
	597	+ $output = $gallery->toHtml();
	598	+
	599	+ } else {
472	600	$output .= $sEndList . "\n";
	601	+ }
473	602
474	603	return $output;
475	604	}

Status & tagging log

05:43, 21 January 2010 Tim Starling (talk | contribs) changed the status of r60800 [removed: new added: ok]