r62426 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r62425‎ \| r62426 \| r62427 >
Date:	13:51, 13 February 2010
Author:	siebrand
Status:	deferred
Tags:
Comment:	* update code formatting, run stylize.php, whitespace updates * rename description message * update Translate accordingly
Modified paths:	/trunk/extensions/ABC/ABC.i18n.php (modified) (history) /trunk/extensions/ABC/ABC.php (modified) (history) /trunk/extensions/Translate/groups/mediawiki-defines.txt (modified) (history)

Diff [purge]

Index: trunk/extensions/ABC/ABC.i18n.php
—	—	@@ -11,7 +11,7 @@
12	12	$messages = array();
13	13
14	14	$messages['en'] = array(
15		~~- 'abcdesc' => 'Adds <tt><abc></tt> tag to format ABC music',~~
	15	+ 'abc-desc' => 'Adds <tt><abc></tt> tag to format ABC music',
16	16	'abcdownload' => 'Download:',
17	17	'abcabc' => 'ABC',
18	18	'abcpdf' => 'PDF',
—	—	@@ -27,7 +27,7 @@
28	28	* @author Raymond
29	29	*/
30	30	$messages['qqq'] = array(
31		~~- 'abcdesc' => 'Short description of the ABC extension, shown in [[Special:Version]]. Do not translate or change links.',~~
	31	+ 'abc-desc' => 'Short description of the ABC extension, shown in [[Special:Version]]. Do not translate or change links.',
32	32	'abcdownload' => '{{Identical\|Download}}',
33	33	'abcabc' => '{{optional}}',
34	34	'abcpdf' => '{{optional}}',
—	—	@@ -40,7 +40,7 @@
41	41	* @author Naudefj
42	42	*/
43	43	$messages['af'] = array(
44		~~- 'abcdesc' => "Maak 'n <tt><abc></tt> etiket beskikbaar vir die opmaak van ABC-musiek",~~
	44	+ 'abc-desc' => "Maak 'n <tt><abc></tt> etiket beskikbaar vir die opmaak van ABC-musiek",
45	45	'abcdownload' => 'Aflaai:',
46	46	);
47	47
—	—	@@ -48,7 +48,7 @@
49	49	* @author Bresta
50	50	*/
51	51	$messages['aln'] = array(
52		~~- 'abcdesc' => "Shton tag'un <tt><abc></tt> me formatu muzikën ABC",~~
	52	+ 'abc-desc' => "Shton tag'un <tt><abc></tt> me formatu muzikën ABC",
53	53	'abcdownload' => 'Shkarko:',
54	54	);
55	55
—	—	@@ -56,7 +56,7 @@
57	57	* @author Meno25
58	58	*/
59	59	$messages['ar'] = array(
60		~~- 'abcdesc' => 'يضيف وسم <tt><abc></tt> لصياغة موسيقى ABC',~~
	60	+ 'abc-desc' => 'يضيف وسم <tt><abc></tt> لصياغة موسيقى ABC',
61	61	'abcdownload' => 'تنزيل:',
62	62	'abcabc' => 'إيه بي سي',
63	63	'abcpdf' => 'بي دي إف',
—	—	@@ -70,7 +70,7 @@
71	71	* @author Meno25
72	72	*/
73	73	$messages['arz'] = array(
74		~~- 'abcdesc' => 'يضيف وسم <tt><abc></tt> لصياغة موسيقى ABC',~~
	74	+ 'abc-desc' => 'يضيف وسم <tt><abc></tt> لصياغة موسيقى ABC',
75	75	'abcdownload' => 'تنزيل:',
76	76	);
77	77
—	—	@@ -79,7 +79,7 @@
80	80	* @author Red Winged Duck
81	81	*/
82	82	$messages['be-tarask'] = array(
83		~~- 'abcdesc' => 'Дадаецца тэг <tt><abc></tt> для музычнага фармату ABC',~~
	83	+ 'abc-desc' => 'Дадаецца тэг <tt><abc></tt> для музычнага фармату ABC',
84	84	'abcdownload' => 'Загрузіць:',
85	85	);
86	86
—	—	@@ -87,7 +87,7 @@
88	88	* @author DCLXVI
89	89	*/
90	90	$messages['bg'] = array(
91		~~- 'abcdesc' => 'Добавя етикет <tt><abc></tt> за форматиране на АВС музика',~~
	91	+ 'abc-desc' => 'Добавя етикет <tt><abc></tt> за форматиране на АВС музика',
92	92	'abcdownload' => 'Изтегляне:',
93	93	);
94	94
—	—	@@ -95,7 +95,7 @@
96	96	* @author Bellayet
97	97	*/
98	98	$messages['bn'] = array(
99		~~- 'abcdesc' => 'ABC music এর জন্য <tt><abc></tt> ফলক যোগ করুন',~~
	99	+ 'abc-desc' => 'ABC music এর জন্য <tt><abc></tt> ফলক যোগ করুন',
100	100	'abcdownload' => 'ডাউনলোড:',
101	101	);
102	102
—	—	@@ -103,7 +103,7 @@
104	104	* @author Usingha
105	105	*/
106	106	$messages['bpy'] = array(
107		~~- 'abcdesc' => 'ABC music পাজালানির কা <tt><abc></tt> টেগহান তিলকর',~~
	107	+ 'abc-desc' => 'ABC music পাজালানির কা <tt><abc></tt> টেগহান তিলকর',
108	108	'abcdownload' => 'ডাউনলোড:',
109	109	);
110	110
—	—	@@ -111,7 +111,7 @@
112	112	* @author Fulup
113	113	*/
114	114	$messages['br'] = array(
115		~~- 'abcdesc' => 'Ouzhpennañ a ra ur valizenn <tt><abc></tt> a-benn furmadiñ sonerezh ABC',~~
	115	+ 'abc-desc' => 'Ouzhpennañ a ra ur valizenn <tt><abc></tt> a-benn furmadiñ sonerezh ABC',
116	116	'abcdownload' => 'Pellgargañ :',
117	117	);
118	118
—	—	@@ -119,7 +119,7 @@
120	120	* @author CERminator
121	121	*/
122	122	$messages['bs'] = array(
123		~~- 'abcdesc' => 'Dodaje <tt><abc></tt> oznaku za formatiranje ABC muzike',~~
	123	+ 'abc-desc' => 'Dodaje <tt><abc></tt> oznaku za formatiranje ABC muzike',
124	124	'abcdownload' => 'Skidanje:',
125	125	);
126	126
—	—	@@ -127,7 +127,7 @@
128	128	* @author Aleator
129	129	*/
130	130	$messages['ca'] = array(
131		~~- 'abcdesc' => "Afegeix l'etiqueta <tt><abc></tt> per a utilitzar la notació musical ''ABC music''",~~
	131	+ 'abc-desc' => "Afegeix l'etiqueta <tt><abc></tt> per a utilitzar la notació musical ''ABC music''",
132	132	'abcdownload' => 'Descarrega:',
133	133	);
134	134
—	—	@@ -135,13 +135,13 @@
136	136	* @author Lhademmor
137	137	*/
138	138	$messages['da'] = array(
139		~~- 'abcdesc' => 'Tilføjer mærket <tt><abc></tt> for at formatere ABC-musik',~~
	139	+ 'abc-desc' => 'Tilføjer mærket <tt><abc></tt> for at formatere ABC-musik',
140	140	'abcdownload' => 'Hent:',
141	141	);
142	142
143	143	/** German (Deutsch) */
144	144	$messages['de'] = array(
145		~~- 'abcdesc' => 'Ergänzt das <tt><abc></tt>-Tag zur Notation von Musik in ABC',~~
	145	+ 'abc-desc' => 'Ergänzt das <tt><abc></tt>-Tag zur Notation von Musik in ABC',
146	146	'abcdownload' => 'Herunterladen:',
147	147	);
148	148
—	—	@@ -149,7 +149,7 @@
150	150	* @author Mirzali
151	151	*/
152	152	$messages['diq'] = array(
153		~~- 'abcdesc' => 'Semedê şekldaena ABC-muziki etiketê <tt><abc></tt>y ilawe keno',~~
	153	+ 'abc-desc' => 'Semedê şekldaena ABC-muziki etiketê <tt><abc></tt>y ilawe keno',
154	154	'abcdownload' => 'Bar ke:',
155	155	);
156	156
—	—	@@ -157,7 +157,7 @@
158	158	* @author Michawiki
159	159	*/
160	160	$messages['dsb'] = array(
161		~~- 'abcdesc' => 'Pśidawa toflicku <tt><abc></tt>, aby se muzika w ABC formatěrowała',~~
	161	+ 'abc-desc' => 'Pśidawa toflicku <tt><abc></tt>, aby se muzika w ABC formatěrowała',
162	162	'abcdownload' => 'Ześěgnuś:',
163	163	);
164	164
—	—	@@ -166,7 +166,7 @@
167	167	* @author Omnipaedista
168	168	*/
169	169	$messages['el'] = array(
170		~~- 'abcdesc' => 'Προσθέτει το tag <tt><abc></tt> για να μορφοποιεί μουσική ABC',~~
	170	+ 'abc-desc' => 'Προσθέτει το tag <tt><abc></tt> για να μορφοποιεί μουσική ABC',
171	171	'abcdownload' => 'Λήψη:',
172	172	);
173	173
—	—	@@ -175,7 +175,7 @@
176	176	* @author Yekrats
177	177	*/
178	178	$messages['eo'] = array(
179		~~- 'abcdesc' => 'Aldonas etikedon <tt><abc></tt> por fomati ABC-muzikon',~~
	179	+ 'abc-desc' => 'Aldonas etikedon <tt><abc></tt> por fomati ABC-muzikon',
180	180	'abcdownload' => 'Elŝuto:',
181	181	);
182	182
—	—	@@ -183,7 +183,7 @@
184	184	* @author Sanbec
185	185	*/
186	186	$messages['es'] = array(
187		~~- 'abcdesc' => "Añade la etiqueta <tt><abc></tt> para usar la notación musical ''ABC music''",~~
	187	+ 'abc-desc' => "Añade la etiqueta <tt><abc></tt> para usar la notación musical ''ABC music''",
188	188	'abcdownload' => 'Descargar:',
189	189	);
190	190
—	—	@@ -192,7 +192,7 @@
193	193	* @author KalmerE.
194	194	*/
195	195	$messages['et'] = array(
196		~~- 'abcdesc' => 'Lisab <tt><abc></tt> laiendi ABC muusika vormindamiseks.',~~
	196	+ 'abc-desc' => 'Lisab <tt><abc></tt> laiendi ABC muusika vormindamiseks.',
197	197	'abcdownload' => 'Laadi alla:',
198	198	);
199	199
—	—	@@ -200,7 +200,7 @@
201	201	* @author Theklan
202	202	*/
203	203	$messages['eu'] = array(
204		~~- 'abcdesc' => '<tt><abc></tt> etiketa gehitzen du ABC musika formatura',~~
	204	+ 'abc-desc' => '<tt><abc></tt> etiketa gehitzen du ABC musika formatura',
205	205	'abcdownload' => 'Jaitsi:',
206	206	);
207	207
—	—	@@ -209,7 +209,7 @@
210	210	* @author Ilaiho
211	211	*/
212	212	$messages['fi'] = array(
213		~~- 'abcdesc' => 'Lisää <tt><abc></tt>-elementin ABC-musiikin muotoilemiseen.',~~
	213	+ 'abc-desc' => 'Lisää <tt><abc></tt>-elementin ABC-musiikin muotoilemiseen.',
214	214	'abcdownload' => 'Lataa:',
215	215	);
216	216
—	—	@@ -217,7 +217,7 @@
218	218	* @author Grondin
219	219	*/
220	220	$messages['fr'] = array(
221		~~- 'abcdesc' => 'Ajoute une balise <tt><abc></tt> pour formater la musique ABC',~~
	221	+ 'abc-desc' => 'Ajoute une balise <tt><abc></tt> pour formater la musique ABC',
222	222	'abcdownload' => 'Télécharger :',
223	223	);
224	224
—	—	@@ -225,7 +225,7 @@
226	226	* @author ChrisPtDe
227	227	*/
228	228	$messages['frp'] = array(
229		~~- 'abcdesc' => 'Apond una balisa <tt><abc></tt> por formatar la musica ABC.',~~
	229	+ 'abc-desc' => 'Apond una balisa <tt><abc></tt> por formatar la musica ABC.',
230	230	'abcdownload' => 'Tèlèchargiér :',
231	231	);
232	232
—	—	@@ -233,7 +233,7 @@
234	234	* @author SK-luuut
235	235	*/
236	236	$messages['fy'] = array(
237		~~- 'abcdesc' => 'Foegt mark <tt><abc></tt> ta foar de opmaak fan ABC-muzyk',~~
	237	+ 'abc-desc' => 'Foegt mark <tt><abc></tt> ta foar de opmaak fan ABC-muzyk',
238	238	'abcdownload' => 'Ynlade:',
239	239	);
240	240
—	—	@@ -241,7 +241,7 @@
242	242	* @author Alison
243	243	*/
244	244	$messages['ga'] = array(
245		~~- 'abcdesc' => 'Cuir clib <tt><abc></tt> chun ceoil ABC a formáidigh',~~
	245	+ 'abc-desc' => 'Cuir clib <tt><abc></tt> chun ceoil ABC a formáidigh',
246	246	'abcdownload' => 'íoslódáil:',
247	247	);
248	248
—	—	@@ -249,7 +249,7 @@
250	250	* @author Toliño
251	251	*/
252	252	$messages['gl'] = array(
253		~~- 'abcdesc' => 'Engade a etiqueta <tt><abc></tt> para dar formato á música ABC',~~
	253	+ 'abc-desc' => 'Engade a etiqueta <tt><abc></tt> para dar formato á música ABC',
254	254	'abcdownload' => 'Descargar:',
255	255	);
256	256
—	—	@@ -257,7 +257,7 @@
258	258	* @author Omnipaedista
259	259	*/
260	260	$messages['grc'] = array(
261		~~- 'abcdesc' => 'Προσθέτει τὸ προσάρτημα <tt><abc></tt> ἵνα μορφώσῃ τὴν μουσικὴν ABC',~~
	261	+ 'abc-desc' => 'Προσθέτει τὸ προσάρτημα <tt><abc></tt> ἵνα μορφώσῃ τὴν μουσικὴν ABC',
262	262	'abcdownload' => 'Καταφόρτισις:',
263	263	);
264	264
—	—	@@ -265,7 +265,7 @@
266	266	* @author Als-Holder
267	267	*/
268	268	$messages['gsw'] = array(
269		~~- 'abcdesc' => 'Tue s <tt><abc></tt>-Tag zuefiege zum Musik in ABC notiere',~~
	269	+ 'abc-desc' => 'Tue s <tt><abc></tt>-Tag zuefiege zum Musik in ABC notiere',
270	270	'abcdownload' => 'Abelade:',
271	271	);
272	272
—	—	@@ -273,7 +273,7 @@
274	274	* @author MacTire02
275	275	*/
276	276	$messages['gv'] = array(
277		~~- 'abcdesc' => 'Cur y lipaid <tt><abc></tt> rish dys kiaull ABC y chummey',~~
	277	+ 'abc-desc' => 'Cur y lipaid <tt><abc></tt> rish dys kiaull ABC y chummey',
278	278	'abcdownload' => 'Laadey neose:',
279	279	);
280	280
—	—	@@ -282,7 +282,7 @@
283	283	* @author YaronSh
284	284	*/
285	285	$messages['he'] = array(
286		~~- 'abcdesc' => 'הוספת תגית <tt><abc></tt> למוסיקה בפורמט ABC',~~
	286	+ 'abc-desc' => 'הוספת תגית <tt><abc></tt> למוסיקה בפורמט ABC',
287	287	'abcdownload' => 'הורדה:',
288	288	);
289	289
—	—	@@ -301,7 +301,7 @@
302	302	* @author Tagimata
303	303	*/
304	304	$messages['hil'] = array(
305		~~- 'abcdesc' => 'Dugangang <tt><abc></tt> tag para ma-formatan ABC musika',~~
	305	+ 'abc-desc' => 'Dugangang <tt><abc></tt> tag para ma-formatan ABC musika',
306	306	'abcdownload' => 'i-download:',
307	307	);
308	308
—	—	@@ -309,7 +309,7 @@
310	310	* @author Dalibor Bosits
311	311	*/
312	312	$messages['hr'] = array(
313		~~- 'abcdesc' => 'Dodaje <tt><abc></tt> oznaku za formatiranje ABC glazbe',~~
	313	+ 'abc-desc' => 'Dodaje <tt><abc></tt> oznaku za formatiranje ABC glazbe',
314	314	'abcdownload' => 'Preuzimanje:',
315	315	);
316	316
—	—	@@ -317,7 +317,7 @@
318	318	* @author Michawiki
319	319	*/
320	320	$messages['hsb'] = array(
321		~~- 'abcdesc' => 'Přidawa tafličku <tt><abc></tt>, zo by so hudźba w ABC formatowała',~~
	321	+ 'abc-desc' => 'Přidawa tafličku <tt><abc></tt>, zo by so hudźba w ABC formatowała',
322	322	'abcdownload' => 'Sćahnyć',
323	323	);
324	324
—	—	@@ -325,7 +325,7 @@
326	326	* @author Glanthor Reviol
327	327	*/
328	328	$messages['hu'] = array(
329		~~- 'abcdesc' => '<tt><abc></tt> tag ABC zeneleírás formázásához',~~
	329	+ 'abc-desc' => '<tt><abc></tt> tag ABC zeneleírás formázásához',
330	330	'abcdownload' => 'Letöltés:',
331	331	);
332	332
—	—	@@ -333,7 +333,7 @@
334	334	* @author McDutchie
335	335	*/
336	336	$messages['ia'] = array(
337		~~- 'abcdesc' => 'Adde le etiquetta <tt><abc></tt> pro formatar musica in notation ABC',~~
	337	+ 'abc-desc' => 'Adde le etiquetta <tt><abc></tt> pro formatar musica in notation ABC',
338	338	'abcdownload' => 'Discargar:',
339	339	);
340	340
—	—	@@ -341,7 +341,7 @@
342	342	* @author Bennylin
343	343	*/
344	344	$messages['id'] = array(
345		~~- 'abcdesc' => 'Tambahkan tag <tt><abc></tt> untuk format musik ABC',~~
	345	+ 'abc-desc' => 'Tambahkan tag <tt><abc></tt> untuk format musik ABC',
346	346	'abcdownload' => 'Unduh:',
347	347	);
348	348
—	—	@@ -349,7 +349,7 @@
350	350	* @author Ukabia
351	351	*/
352	352	$messages['ig'] = array(
353		~~- 'abcdesc' => 'Tinyékwa <tt><abc></tt> ede nyazoro I kwaria égwú ABC',~~
	353	+ 'abc-desc' => 'Tinyékwa <tt><abc></tt> ede nyazoro I kwaria égwú ABC',
354	354	'abcdownload' => 'Danwèré:',
355	355	);
356	356
—	—	@@ -357,7 +357,7 @@
358	358	* @author Melos
359	359	*/
360	360	$messages['it'] = array(
361		~~- 'abcdesc' => 'Aggiunge il tag <tt><abc></tt> per la musica in formato ABC',~~
	361	+ 'abc-desc' => 'Aggiunge il tag <tt><abc></tt> per la musica in formato ABC',
362	362	'abcdownload' => 'Download:',
363	363	);
364	364
—	—	@@ -366,7 +366,7 @@
367	367	* @author Fryed-peach
368	368	*/
369	369	$messages['ja'] = array(
370		~~- 'abcdesc' => 'ABC譜の書式を整える <tt><abc></tt> タグを追加する',~~
	370	+ 'abc-desc' => 'ABC譜の書式を整える <tt><abc></tt> タグを追加する',
371	371	'abcdownload' => 'ダウンロード:',
372	372	);
373	373
—	—	@@ -374,7 +374,7 @@
375	375	* @author Pras
376	376	*/
377	377	$messages['jv'] = array(
378		~~- 'abcdesc' => 'Tambahna tag <tt><abc></tt> kanggo format musik ABC',~~
	378	+ 'abc-desc' => 'Tambahna tag <tt><abc></tt> kanggo format musik ABC',
379	379	'abcdownload' => 'Undhuh:',
380	380	);
381	381
—	—	@@ -389,7 +389,7 @@
390	390	* @author Mirzali
391	391	*/
392	392	$messages['kiu'] = array(
393		~~- 'abcdesc' => 'Seba sıkıldaena ABC-muziki etiketê <tt><abc></tt>y ilawe keno',~~
	393	+ 'abc-desc' => 'Seba sıkıldaena ABC-muziki etiketê <tt><abc></tt>y ilawe keno',
394	394	'abcdownload' => 'Bar ke:',
395	395	);
396	396
—	—	@@ -404,7 +404,7 @@
405	405	* @author Kwj2772
406	406	*/
407	407	$messages['ko'] = array(
408		~~- 'abcdesc' => 'ABC 음악을 포맷하기 위해 <tt><abc></tt> 태그를 추가',~~
	408	+ 'abc-desc' => 'ABC 음악을 포맷하기 위해 <tt><abc></tt> 태그를 추가',
409	409	'abcdownload' => '다운로드:',
410	410	);
411	411
—	—	@@ -412,7 +412,7 @@
413	413	* @author Iltever
414	414	*/
415	415	$messages['krc'] = array(
416		~~- 'abcdesc' => 'ABC музыканы бичер ючюн <tt><abc></tt> тегни къошады',~~
	416	+ 'abc-desc' => 'ABC музыканы бичер ючюн <tt><abc></tt> тегни къошады',
417	417	'abcdownload' => 'Джюкле:',
418	418	);
419	419
—	—	@@ -420,7 +420,7 @@
421	421	* @author Purodha
422	422	*/
423	423	$messages['ksh'] = array(
424		~~- 'abcdesc' => 'Deit dä <tt><abc></tt>-Befähl en et Wiki domet mer Mussik em ABC Fommaat opschrieve kann.',~~
	424	+ 'abc-desc' => 'Deit dä <tt><abc></tt>-Befähl en et Wiki domet mer Mussik em ABC Fommaat opschrieve kann.',
425	425	'abcdownload' => 'Eronger lahde:',
426	426	);
427	427
—	—	@@ -443,7 +443,7 @@
444	444	* @author Robby
445	445	*/
446	446	$messages['lb'] = array(
447		~~- 'abcdesc' => "Setzt den <tt><abc></tt> Tag fir ''ABC music'' ze formatéieren",~~
	447	+ 'abc-desc' => "Setzt den <tt><abc></tt> Tag fir ''ABC music'' ze formatéieren",
448	448	'abcdownload' => 'Eroflueden:',
449	449	);
450	450
—	—	@@ -451,7 +451,7 @@
452	452	* @author Pahles
453	453	*/
454	454	$messages['li'] = array(
455		~~- 'abcdesc' => 'Voog de tag <tt><abc></tt> veur de opmaak van ABC-meziek in',~~
	455	+ 'abc-desc' => 'Voog de tag <tt><abc></tt> veur de opmaak van ABC-meziek in',
456	456	'abcdownload' => 'Downloade:',
457	457	);
458	458
—	—	@@ -459,7 +459,7 @@
460	460	* @author Insübrich
461	461	*/
462	462	$messages['lmo'] = array(
463		~~- 'abcdesc' => 'A giunta el tag <tt><abc></tt> a la müsega in furmaa ABC',~~
	463	+ 'abc-desc' => 'A giunta el tag <tt><abc></tt> a la müsega in furmaa ABC',
464	464	'abcdownload' => 'Descarga:',
465	465	);
466	466
—	—	@@ -467,7 +467,7 @@
468	468	* @author Matasg
469	469	*/
470	470	$messages['lt'] = array(
471		~~- 'abcdesc' => 'Prideda <tt><abc></tt> žymę prie formato ABC music',~~
	471	+ 'abc-desc' => 'Prideda <tt><abc></tt> žymę prie formato ABC music',
472	472	'abcdownload' => 'Atsisiųsti:',
473	473	);
474	474
—	—	@@ -476,7 +476,7 @@
477	477	* @author FnTmLV
478	478	*/
479	479	$messages['lv'] = array(
480		~~- 'abcdesc' => 'Pievieno <tt><abc></tt> tagu lai formatētu ABC mūziku',~~
	480	+ 'abc-desc' => 'Pievieno <tt><abc></tt> tagu lai formatētu ABC mūziku',
481	481	'abcdownload' => 'Ielādēt:',
482	482	);
483	483
—	—	@@ -484,7 +484,7 @@
485	485	* @author Jagwar
486	486	*/
487	487	$messages['mg'] = array(
488		~~- 'abcdesc' => 'Manampy balizy <tt><abc></tt> mba hifôrmaty ny mozika ABC',~~
	488	+ 'abc-desc' => 'Manampy balizy <tt><abc></tt> mba hifôrmaty ny mozika ABC',
489	489	'abcdownload' => 'Ampidino eto:',
490	490	);
491	491
—	—	@@ -492,7 +492,7 @@
493	493	* @author Azim
494	494	*/
495	495	$messages['mhr'] = array(
496		~~- 'abcdesc' => 'ABC музыкым форматированийлан <tt><abc></tt> тегым ешара',~~
	496	+ 'abc-desc' => 'ABC музыкым форматированийлан <tt><abc></tt> тегым ешара',
497	497	'abcdownload' => 'Опташ:',
498	498	);
499	499
—	—	@@ -500,7 +500,7 @@
501	501	* @author Bjankuloski06
502	502	*/
503	503	$messages['mk'] = array(
504		~~- 'abcdesc' => 'Ја додава ознаката <tt><abc></tt> за да форматира ABC музика',~~
	504	+ 'abc-desc' => 'Ја додава ознаката <tt><abc></tt> за да форматира ABC музика',
505	505	'abcdownload' => 'Преземи:',
506	506	);
507	507
—	—	@@ -509,7 +509,7 @@
510	510	* @author Sadik Khalid
511	511	*/
512	512	$messages['ml'] = array(
513		~~- 'abcdesc' => '<tt><abc></tt> അനുബന്ധം എ.ബി.സി. സംഗീതത്തിനു ചേര്‍ക്കുന്നു',~~
	513	+ 'abc-desc' => '<tt><abc></tt> അനുബന്ധം എ.ബി.സി. സംഗീതത്തിനു ചേര്‍ക്കുന്നു',
514	514	'abcdownload' => 'ഡൌൺലോഡ്',
515	515	);
516	516
—	—	@@ -517,7 +517,7 @@
518	518	* @author E.shijir
519	519	*/
520	520	$messages['mn'] = array(
521		~~- 'abcdesc' => 'ABC хөгжимиын горимд <tt><abc></tt> шошгыг нэмэх',~~
	521	+ 'abc-desc' => 'ABC хөгжимиын горимд <tt><abc></tt> шошгыг нэмэх',
522	522	'abcdownload' => 'Өөртөө хуулах:',
523	523	);
524	524
—	—	@@ -525,7 +525,7 @@
526	526	* @author Zamwan
527	527	*/
528	528	$messages['ms'] = array(
529		~~- 'abcdesc' => 'Letak tag <tt><abc></tt> bagi memformat muzik ABC',~~
	529	+ 'abc-desc' => 'Letak tag <tt><abc></tt> bagi memformat muzik ABC',
530	530	'abcdownload' => 'Muat turun:',
531	531	);
532	532
—	—	@@ -533,7 +533,7 @@
534	534	* @author Botuzhaleny-sodamo
535	535	*/
536	536	$messages['myv'] = array(
537		~~- 'abcdesc' => 'Полады <tt><abc></tt> тег ABC музыканть форматировамонь туртов',~~
	537	+ 'abc-desc' => 'Полады <tt><abc></tt> тег ABC музыканть форматировамонь туртов',
538	538	'abcdownload' => 'Таргамс:',
539	539	);
540	540
—	—	@@ -541,7 +541,7 @@
542	542	* @author Fluence
543	543	*/
544	544	$messages['nah'] = array(
545		~~- 'abcdesc' => 'Ticcēntilīz <tt><abc></tt> ic tictequitiltīz ABC cuīcayōtlahtōl',~~
	545	+ 'abc-desc' => 'Ticcēntilīz <tt><abc></tt> ic tictequitiltīz ABC cuīcayōtlahtōl',
546	546	'abcdownload' => 'Tictemōz:',
547	547	);
548	548
—	—	@@ -549,7 +549,7 @@
550	550	* @author Slomox
551	551	*/
552	552	$messages['nds'] = array(
553		~~- 'abcdesc' => 'Föögt dat Tag <tt><abc></tt> för dat Wiesen vun ABC-Musik to',~~
	553	+ 'abc-desc' => 'Föögt dat Tag <tt><abc></tt> för dat Wiesen vun ABC-Musik to',
554	554	'abcdownload' => 'Dalladen:',
555	555	);
556	556
—	—	@@ -557,7 +557,7 @@
558	558	* @author Servien
559	559	*/
560	560	$messages['nds-nl'] = array(
561		~~- 'abcdesc' => 'Voeg de tag <tt><abc></tt> toe veur de opmaak van ABC-meziek',~~
	561	+ 'abc-desc' => 'Voeg de tag <tt><abc></tt> toe veur de opmaak van ABC-meziek',
562	562	'abcdownload' => 'Binnenhaolen:',
563	563	);
564	564
—	—	@@ -565,7 +565,7 @@
566	566	* @author सरोज कुमार ढकाल
567	567	*/
568	568	$messages['ne'] = array(
569		~~- 'abcdesc' => ' ABC संगित <tt><abc></tt> ढाँचावद्ध गर्नलाई ट्याग थप्छ।',~~
	569	+ 'abc-desc' => ' ABC संगित <tt><abc></tt> ढाँचावद्ध गर्नलाई ट्याग थप्छ।',
570	570	'abcdownload' => 'डाउनलोड गर्ने:',
571	571	);
572	572
—	—	@@ -573,7 +573,7 @@
574	574	* @author Siebrand
575	575	*/
576	576	$messages['nl'] = array(
577		~~- 'abcdesc' => 'Voegt de tag <tt><abc></tt> voor de opmaak van ABC-muziek',~~
	577	+ 'abc-desc' => 'Voegt de tag <tt><abc></tt> voor de opmaak van ABC-muziek',
578	578	'abcdownload' => 'Downloaden:',
579	579	);
580	580
—	—	@@ -581,7 +581,7 @@
582	582	* @author Harald Khan
583	583	*/
584	584	$messages['nn'] = array(
585		~~- 'abcdesc' => 'Legg til <tt><abc></tt>-merket for å formatera ABC-musikk',~~
	585	+ 'abc-desc' => 'Legg til <tt><abc></tt>-merket for å formatera ABC-musikk',
586	586	'abcdownload' => 'Last ned:',
587	587	);
588	588
—	—	@@ -589,7 +589,7 @@
590	590	* @author Jon Harald Søby
591	591	*/
592	592	$messages['no'] = array(
593		~~- 'abcdesc' => 'Lager taggen <tt><abc></tt> for å formatere ABC-musikk',~~
	593	+ 'abc-desc' => 'Lager taggen <tt><abc></tt> for å formatere ABC-musikk',
594	594	'abcdownload' => 'Last ned:',
595	595	);
596	596
—	—	@@ -597,7 +597,7 @@
598	598	* @author Cedric31
599	599	*/
600	600	$messages['oc'] = array(
601		~~- 'abcdesc' => 'Apond una balisa <tt><abc></tt> per formatar la musica ABC',~~
	601	+ 'abc-desc' => 'Apond una balisa <tt><abc></tt> per formatar la musica ABC',
602	602	'abcdownload' => 'Telecargar :',
603	603	);
604	604
—	—	@@ -613,7 +613,7 @@
614	614	* @author Sp5uhe
615	615	*/
616	616	$messages['pl'] = array(
617		~~- 'abcdesc' => 'Dodaje znacznik <tt><abc></tt> dla muzyki w formacie ABC',~~
	617	+ 'abc-desc' => 'Dodaje znacznik <tt><abc></tt> dla muzyki w formacie ABC',
618	618	'abcdownload' => 'Pobierz:',
619	619	);
620	620
—	—	@@ -621,7 +621,7 @@
622	622	* @author Dragonòt
623	623	*/
624	624	$messages['pms'] = array(
625		~~- 'abcdesc' => 'A gionta ël tag <tt><abc></tt> a la mùsica an formà ABC',~~
	625	+ 'abc-desc' => 'A gionta ël tag <tt><abc></tt> a la mùsica an formà ABC',
626	626	'abcdownload' => 'Dëscaria:',
627	627	);
628	628
—	—	@@ -629,7 +629,7 @@
630	630	* @author Ahmed-Najib-Biabani-Ibrahimkhel
631	631	*/
632	632	$messages['ps'] = array(
633		~~- 'abcdesc' => 'ABC موسيقي بڼې ته د <tt><abc></tt> لنډنوم ورګډوي',~~
	633	+ 'abc-desc' => 'ABC موسيقي بڼې ته د <tt><abc></tt> لنډنوم ورګډوي',
634	634	'abcdownload' => 'ښکته کول:',
635	635	);
636	636
—	—	@@ -638,7 +638,7 @@
639	639	* @author Waldir
640	640	*/
641	641	$messages['pt'] = array(
642		~~- 'abcdesc' => 'Adiciona a tag <tt><abc></tt> para formatar música em notação ABC',~~
	642	+ 'abc-desc' => 'Adiciona a tag <tt><abc></tt> para formatar música em notação ABC',
643	643	'abcdownload' => 'Descarregar:',
644	644	);
645	645
—	—	@@ -646,7 +646,7 @@
647	647	* @author Eduardo.mps
648	648	*/
649	649	$messages['pt-br'] = array(
650		~~- 'abcdesc' => 'Adiciona a marca <tt><abc></tt> para formatar música em notação ABC',~~
	650	+ 'abc-desc' => 'Adiciona a marca <tt><abc></tt> para formatar música em notação ABC',
651	651	'abcdownload' => 'Descarregar:',
652	652	);
653	653
—	—	@@ -654,7 +654,7 @@
655	655	* @author Aryaz
656	656	*/
657	657	$messages['rif'] = array(
658		~~- 'abcdesc' => 'Irnni tira <tt><abc></tt> afad ad isggm ABC music',~~
	658	+ 'abc-desc' => 'Irnni tira <tt><abc></tt> afad ad isggm ABC music',
659	659	'abcdownload' => 'Zdm/Download',
660	660	);
661	661
—	—	@@ -662,7 +662,7 @@
663	663	* @author Gion
664	664	*/
665	665	$messages['rm'] = array(
666		~~- 'abcdesc' => 'Agiunta il tag <tt><abc></tt> per formatar musica ABC',~~
	666	+ 'abc-desc' => 'Agiunta il tag <tt><abc></tt> per formatar musica ABC',
667	667	'abcdownload' => 'Download:',
668	668	);
669	669
—	—	@@ -670,7 +670,7 @@
671	671	* @author Silviubogan
672	672	*/
673	673	$messages['ro'] = array(
674		~~- 'abcdesc' => 'Adaugă elementul <tt><abc></tt> pentru a formata muzica ABC',~~
	674	+ 'abc-desc' => 'Adaugă elementul <tt><abc></tt> pentru a formata muzica ABC',
675	675	'abcdownload' => 'Descarcă:',
676	676	);
677	677
—	—	@@ -678,7 +678,7 @@
679	679	* @author Joetaras
680	680	*/
681	681	$messages['roa-tara'] = array(
682		~~- 'abcdesc' => "Aggiunge <tt><abc></tt> tag pe formattà 'a musiche de ABC",~~
	682	+ 'abc-desc' => "Aggiunge <tt><abc></tt> tag pe formattà 'a musiche de ABC",
683	683	'abcdownload' => 'Scareche:',
684	684	);
685	685
—	—	@@ -687,7 +687,7 @@
688	688	* @author Александр Сигачёв
689	689	*/
690	690	$messages['ru'] = array(
691		~~- 'abcdesc' => 'Добавляет тег <tt><abc></tt> для форматирования музыки ABC',~~
	691	+ 'abc-desc' => 'Добавляет тег <tt><abc></tt> для форматирования музыки ABC',
692	692	'abcdownload' => 'Загрузить:',
693	693	);
694	694
—	—	@@ -709,7 +709,7 @@
710	710	* @author Dalinanir
711	711	*/
712	712	$messages['shi'] = array(
713		~~- 'abcdesc' => 'Gen <tt><abc></tt> bac atskrt azawan ABC',~~
	713	+ 'abc-desc' => 'Gen <tt><abc></tt> bac atskrt azawan ABC',
714	714	'abcdownload' => 'Srbu',
715	715	);
716	716
—	—	@@ -717,7 +717,7 @@
718	718	* @author Helix84
719	719	*/
720	720	$messages['sk'] = array(
721		~~- 'abcdesc' => 'Pridáva značku <tt><abc></tt> na formátovanie ABC hudby',~~
	721	+ 'abc-desc' => 'Pridáva značku <tt><abc></tt> na formátovanie ABC hudby',
722	722	'abcdownload' => 'Stiahnuť:',
723	723	);
724	724
—	—	@@ -725,7 +725,7 @@
726	726	* @author Puntori
727	727	*/
728	728	$messages['sq'] = array(
729		~~- 'abcdesc' => 'Vendosë kodin <tt><abc></tt> të formatojë muzikë ABC',~~
	729	+ 'abc-desc' => 'Vendosë kodin <tt><abc></tt> të formatojë muzikë ABC',
730	730	'abcdownload' => 'Shkarko:',
731	731	);
732	732
—	—	@@ -733,7 +733,7 @@
734	734	* @author Михајло Анђелковић
735	735	*/
736	736	$messages['sr-ec'] = array(
737		~~- 'abcdesc' => 'Додаје <tt><abc></tt> таг за форматирање ABC музике',~~
	737	+ 'abc-desc' => 'Додаје <tt><abc></tt> таг за форматирање ABC музике',
738	738	'abcdownload' => 'Сними:',
739	739	);
740	740
—	—	@@ -741,7 +741,7 @@
742	742	* @author Michaello
743	743	*/
744	744	$messages['sr-el'] = array(
745		~~- 'abcdesc' => 'Dodaje <tt><abc></tt> tag za formatiranje ABC muzike',~~
	745	+ 'abc-desc' => 'Dodaje <tt><abc></tt> tag za formatiranje ABC muzike',
746	746	'abcdownload' => 'Snimi:',
747	747	);
748	748
—	—	@@ -749,7 +749,7 @@
750	750	* @author Pyt
751	751	*/
752	752	$messages['stq'] = array(
753		~~- 'abcdesc' => 'Föiget dät <tt><abc></tt>-Tag tou ju Notation fon Musik in ABC bietou',~~
	753	+ 'abc-desc' => 'Föiget dät <tt><abc></tt>-Tag tou ju Notation fon Musik in ABC bietou',
754	754	'abcdownload' => 'Deelleede:',
755	755	);
756	756
—	—	@@ -757,7 +757,7 @@
758	758	* @author Kandar
759	759	*/
760	760	$messages['su'] = array(
761		~~- 'abcdesc' => 'Nambah tag <tt><abc></tt> pikeun ngaformat musik ABC',~~
	761	+ 'abc-desc' => 'Nambah tag <tt><abc></tt> pikeun ngaformat musik ABC',
762	762	'abcdownload' => 'Unduh:',
763	763	);
764	764
—	—	@@ -766,7 +766,7 @@
767	767	* @author Najami
768	768	*/
769	769	$messages['sv'] = array(
770		~~- 'abcdesc' => 'Lägger till <tt><abc></tt>-taggen för att formatera ABC-musik',~~
	770	+ 'abc-desc' => 'Lägger till <tt><abc></tt>-taggen för att formatera ABC-musik',
771	771	'abcdownload' => 'Ladda ner:',
772	772	);
773	773
—	—	@@ -775,7 +775,7 @@
776	776	* @author Veeven
777	777	*/
778	778	$messages['te'] = array(
779		~~- 'abcdesc' => 'ABC సంగీతాన్ని చూపించడానికై <tt><abc></tt> అనే ట్యాగుని చేరుస్తుంది',~~
	779	+ 'abc-desc' => 'ABC సంగీతాన్ని చూపించడానికై <tt><abc></tt> అనే ట్యాగుని చేరుస్తుంది',
780	780	'abcdownload' => 'డౌన్‌లోడ్',
781	781	);
782	782
—	—	@@ -783,7 +783,7 @@
784	784	* @author Manop
785	785	*/
786	786	$messages['th'] = array(
787		~~- 'abcdesc' => 'เพิ่มแท็ก <tt><abc></tt> สำหรับใส่รูปแบบดนตรี ABC',~~
	787	+ 'abc-desc' => 'เพิ่มแท็ก <tt><abc></tt> สำหรับใส่รูปแบบดนตรี ABC',
788	788	'abcdownload' => 'ดาวน์โหลด:',
789	789	);
790	790
—	—	@@ -791,7 +791,7 @@
792	792	* @author AnakngAraw
793	793	*/
794	794	$messages['tl'] = array(
795		~~- 'abcdesc' => 'Nagdaragdag ng tatak na <tt><abc></tt> para maipormat ang tugtuging ABC',~~
	795	+ 'abc-desc' => 'Nagdaragdag ng tatak na <tt><abc></tt> para maipormat ang tugtuging ABC',
796	796	'abcdownload' => 'Ikargang-pakuha:',
797	797	);
798	798
—	—	@@ -799,7 +799,7 @@
800	800	* @author Joseph
801	801	*/
802	802	$messages['tr'] = array(
803		~~- 'abcdesc' => 'ABC müziğini biçimlendirmek için <tt><abc></tt> etiketini ekler',~~
	803	+ 'abc-desc' => 'ABC müziğini biçimlendirmek için <tt><abc></tt> etiketini ekler',
804	804	'abcdownload' => 'İndir:',
805	805	);
806	806
—	—	@@ -814,7 +814,7 @@
815	815	* @author AS
816	816	*/
817	817	$messages['uk'] = array(
818		~~- 'abcdesc' => 'Додає тег <tt><abc></tt> для форматування музики ABC',~~
	818	+ 'abc-desc' => 'Додає тег <tt><abc></tt> для форматування музики ABC',
819	819	'abcdownload' => 'Завантажити:',
820	820	);
821	821
—	—	@@ -822,7 +822,7 @@
823	823	* @author Candalua
824	824	*/
825	825	$messages['vec'] = array(
826		~~- 'abcdesc' => 'Zonta el tag <tt><abc></tt> par la musica in formato ABC',~~
	826	+ 'abc-desc' => 'Zonta el tag <tt><abc></tt> par la musica in formato ABC',
827	827	'abcdownload' => 'Descarga:',
828	828	);
829	829
—	—	@@ -830,7 +830,7 @@
831	831	* @author Игорь Бродский
832	832	*/
833	833	$messages['vep'] = array(
834		~~- 'abcdesc' => 'Ližadab <tt><abc></tt>-teg ABC-muzikad formatiruides',~~
	834	+ 'abc-desc' => 'Ližadab <tt><abc></tt>-teg ABC-muzikad formatiruides',
835	835	'abcdownload' => 'Jügutoitta:',
836	836	);
837	837
—	—	@@ -838,7 +838,7 @@
839	839	* @author Vinhtantran
840	840	*/
841	841	$messages['vi'] = array(
842		~~- 'abcdesc' => 'Thêm thẻ <tt><abc></tt> để định dạng nhạc ABC',~~
	842	+ 'abc-desc' => 'Thêm thẻ <tt><abc></tt> để định dạng nhạc ABC',
843	843	'abcdownload' => 'Tải xuống:',
844	844	);
845	845
—	—	@@ -846,7 +846,7 @@
847	847	* @author Smeira
848	848	*/
849	849	$messages['vo'] = array(
850		~~- 'abcdesc' => 'Läükon mali: <tt><abc></tt> musige fomätü ABC',~~
	850	+ 'abc-desc' => 'Läükon mali: <tt><abc></tt> musige fomätü ABC',
851	851	'abcdownload' => 'Donükön:',
852	852	);
853	853
—	—	@@ -854,7 +854,7 @@
855	855	* @author Võrok
856	856	*/
857	857	$messages['vro'] = array(
858		~~- 'abcdesc' => 'Pand mano <tt><abc></tt>-elemendi ABC-muusiga kujondamisõs',~~
	858	+ 'abc-desc' => 'Pand mano <tt><abc></tt>-elemendi ABC-muusiga kujondamisõs',
859	859	'abcdownload' => 'Laadiq alla',
860	860	);
861	861
—	—	@@ -862,8 +862,7 @@
863	863	* @author Hercule
864	864	*/
865	865	$messages['wuu'] = array(
866		~~- 'abcdesc' => '~~
867		~~-增加了<tt><abc></tt>树脂标记美国广播公司的音乐格式',~~
	866	+ 'abc-desc' => '增加了<tt><abc></tt>树脂标记美国广播公司的音乐格式',
868	867	'abcdownload' => '下载:',
869	868	);
870	869
—	—	@@ -871,7 +870,7 @@
872	871	* @author פוילישער
873	872	*/
874	873	$messages['yi'] = array(
875		~~- 'abcdesc' => 'לייגט צו <tt><abc></tt> טאַג צו פארמאַטירן ABC מוזיק',~~
	874	+ 'abc-desc' => 'לייגט צו <tt><abc></tt> טאַג צו פארמאַטירן ABC מוזיק',
876	875	'abcdownload' => 'אַראָפלאָדן',
877	876	);
878	877
—	—	@@ -886,7 +885,7 @@
887	886	* @author Bencmq
888	887	*/
889	888	$messages['zh-hans'] = array(
890		~~- 'abcdesc' => '加入<tt><abc></tt>标签以格式化ABC音乐',~~
	889	+ 'abc-desc' => '加入<tt><abc></tt>标签以格式化ABC音乐',
891	890	'abcdownload' => '下载：',
892	891	);
893	892
—	—	@@ -895,7 +894,7 @@
896	895	* @author Wrightbus
897	896	*/
898	897	$messages['zh-hant'] = array(
899		~~- 'abcdesc' => '加入<tt><abc></tt>標籤以格式化ABC音樂',~~
	898	+ 'abc-desc' => '加入<tt><abc></tt>標籤以格式化ABC音樂',
900	899	'abcdownload' => '下載:',
901	900	);
902	901
Index: trunk/extensions/ABC/ABC.php
—	—	@@ -8,13 +8,13 @@
9	9	*/
10	10	/* $Id$ */
11	11
12		~~-if (!defined('MEDIAWIKI'))~~
	12	+if ( !defined( 'MEDIAWIKI' ) )
13	13	die();
14		-
	14	+
15	15	# The on-disk path where ABC files and rendered images / PDFs
16	16	# will be placed.
17	17	# Example: $abcPath = "/var/www/wiki/abc";
18		~~-$abcPath = false;~~
	18	+$abcPath = false;
19	19
20	20	# The HTTP path where the above directory is found.
21	21	# Example: $abcURL = "/wiki/abc";
—	—	@@ -28,12 +28,12 @@
29	29
30	30	# Path to the abc2midi executable. Optional; set this if you
31	31	# want to enable MIDI rendering.
32		~~-#$abc2midi = "/usr/bin/abc2midi";~~
	32	+# $abc2midi = "/usr/bin/abc2midi";
33	33	$abc2midi = false;
34	34
35	35	# Path to the TiMidity++ executable. Optional; set this if you
36	36	# want Ogg Vorbis rendering. Requires MIDI rendering.
37		~~-#$abctimidity = "/usr/bin/timidity";~~
	37	+# $abctimidity = "/usr/bin/timidity";
38	38	$abctimidity = false;
39	39
40	40	# Default instrument number for Vorbis.
—	—	@@ -47,7 +47,7 @@
48	48	# you must enable Ogg Vorbis rendering.
49	49	$abcOggHandler = false;
50	50
51		~~-# Set this if you will render the outputs (ps, pdf, png, etc.)~~
	51	+# Set this if you will render the outputs (ps, pdf, png, etc.)
52	52	# outside of the extension. Nothing will be generated except the
53	53	# .abc file.
54	54	$abcDelayedRendering = false;
—	—	@@ -58,31 +58,29 @@
59	59	'author' => 'River Tarnell',
60	60	'url' => 'http://www.mediawiki.org/wiki/Extension:ABC',
61	61	'description' => 'Adds <tt><abc></tt> tag to format ABC music',
62		~~- 'descriptionmsg' => 'abcdesc',~~
	62	+ 'descriptionmsg' => 'abc-desc',
63	63	);
64		~~-$wgExtensionMessagesFiles['ABC'] = dirname(__FILE__) . '/ABC.i18n.php';~~
	64	+$wgExtensionMessagesFiles['ABC'] = dirname( __FILE__ ) . '/ABC.i18n.php';
65	65	$wgHooks['ParserFirstCallInit'][] = 'efABCInit';
66	66
67		~~-function~~
68		~~-efABCInit( &$parser ) {~~
69		~~-global $wgOut, $abcOggHandler;~~
70		~~- wfLoadExtensionMessages('ABC');~~
	67	+function efABCInit( &$parser ) {
	68	+ global $wgOut, $abcOggHandler;
	69	+ wfLoadExtensionMessages( 'ABC' );
71	70	$parser->setHook( 'abc', 'efABCRender' );
72		-
73		~~- if ($abcOggHandler) {~~
	71	+
	72	+ if ( $abcOggHandler ) {
74	73	$oh = new OggHandler();
75		~~- $oh->setHeaders($wgOut);~~
	74	+ $oh->setHeaders( $wgOut );
76	75	}
77		-
	76	+
78	77	return true;
79	78	}
80		-
81		~~-function~~
82		~~-efABCRender($input, $args, $parser) {~~
83		~~-global $abcPath, $abcURL, $abc2midi, $abctimidity, $abcOggHandler,~~
	79	+
	80	+function efABCRender( $input, $args, $parser ) {
	81	+ global $abcPath, $abcURL, $abc2midi, $abctimidity, $abcOggHandler,
84	82	$abcDelayedRendering, $wgLang;
85	83
86		~~- if ($abcPath == false \|\| $abcURL == false)~~
	84	+ if ( $abcPath == false \|\| $abcURL == false )
87	85	return 'Error: $abcPath and $abcURL must be set to use the ABC extension.';
88	86
89	87	/*
—	—	@@ -92,22 +90,22 @@
93	91	* on different pages will only cause one rendering.
94	92	*/
95	93	$float = "left";
96		~~- if (isset($args['float']) && $args['float'] == 'right')~~
	94	+ if ( isset( $args['float'] ) && $args['float'] == 'right' )
97	95	$float = "right";
98	96
99		~~- $abc = preg_replace("/^\n+/", "", $input);~~
100		~~- $hash = sha1($input);~~
	97	+ $abc = preg_replace( "/^\n+/", "", $input );
	98	+ $hash = sha1( $input );
101	99	$error = "";
102	100
103	101	$hashbits = array(
104		~~- substr($hash, 0, 2),~~
105		~~- substr($hash, 2, 2),~~
106		~~- substr($hash, 4, 2));~~
	102	+ substr( $hash, 0, 2 ),
	103	+ substr( $hash, 2, 2 ),
	104	+ substr( $hash, 4, 2 ) );
107	105	$directory = "{$hashbits[0]}/{$hashbits[1]}/{$hashbits[2]}";
108	106	$filename = "$abcPath/$directory/$hash";
109	107
110		~~- if (!@file_exists("$abcPath/$directory"))~~
111		~~- if (!@mkdir("$abcPath/$directory", 0777, true))~~
	108	+ if ( !@file_exists( "$abcPath/$directory" ) )
	109	+ if ( !@mkdir( "$abcPath/$directory", 0777, true ) )
112	110	return "Cannot create directory \"$abcPath/$directory\".";
113	111
114	112	/*
—	—	@@ -115,25 +113,25 @@
116	114	* alt text for the image.
117	115	*/
118	116	$title = "Unknown song";
119		~~- if (preg_match("/^T:\s(.)$/m", $input, $matches))~~
	117	+ if ( preg_match( "/^T:\s(.)$/m", $input, $matches ) )
120	118	$title = $matches[1];
121	119
122		~~- if (!abcCreateABC($abc, $filename, $error))~~
123		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
	120	+ if ( !abcCreateABC( $abc, $filename, $error ) )
	121	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
124	122
125		~~- if (!$abcDelayedRendering) {~~
126		~~- if (!abcCreatePS($abc, $filename, $error))~~
127		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
128		~~- if (!abcCreatePNG($abc, $filename, $error))~~
129		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
130		~~- if (!abcCreatePDF($abc, $filename, $error))~~
131		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
132		~~- if ($abc2midi)~~
133		~~- if (!abcCreateMIDI($abc, $filename, $error))~~
134		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
135		~~- if ($abc2midi && $abctimidity)~~
136		~~- if (!abcCreateVorbis($abc, $filename, $error))~~
137		~~- return str_replace("\n", "<br />", htmlspecialchars($error));~~
	123	+ if ( !$abcDelayedRendering ) {
	124	+ if ( !abcCreatePS( $abc, $filename, $error ) )
	125	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
	126	+ if ( !abcCreatePNG( $abc, $filename, $error ) )
	127	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
	128	+ if ( !abcCreatePDF( $abc, $filename, $error ) )
	129	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
	130	+ if ( $abc2midi )
	131	+ if ( !abcCreateMIDI( $abc, $filename, $error ) )
	132	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
	133	+ if ( $abc2midi && $abctimidity )
	134	+ if ( !abcCreateVorbis( $abc, $filename, $error ) )
	135	+ return str_replace( "\n", "<br />", htmlspecialchars( $error ) );
138	136	}
139	137
140	138	/*
—	—	@@ -141,33 +139,33 @@
142	140	* output. We produce an image from the PNG, and include
143	141	* links to the ABC and PS.
144	142	*/
145		~~- $e_title = htmlspecialchars($title);~~
146		~~- $e_imgpath = htmlspecialchars("$abcURL/$directory/$hash.png");~~
147		~~- $e_abcpath = htmlspecialchars("$abcURL/$directory/$hash.abc");~~
148		~~- $e_pspath = htmlspecialchars("$abcURL/$directory/$hash.ps");~~
149		~~- $e_pdfpath = htmlspecialchars("$abcURL/$directory/$hash.pdf");~~
150		~~- $e_midipath = htmlspecialchars("$abcURL/$directory/$hash.mid");~~
151		~~- $e_vorbispath = htmlspecialchars("$abcURL/$directory/$hash.ogg");~~
	143	+ $e_title = htmlspecialchars( $title );
	144	+ $e_imgpath = htmlspecialchars( "$abcURL/$directory/$hash.png" );
	145	+ $e_abcpath = htmlspecialchars( "$abcURL/$directory/$hash.abc" );
	146	+ $e_pspath = htmlspecialchars( "$abcURL/$directory/$hash.ps" );
	147	+ $e_pdfpath = htmlspecialchars( "$abcURL/$directory/$hash.pdf" );
	148	+ $e_midipath = htmlspecialchars( "$abcURL/$directory/$hash.mid" );
	149	+ $e_vorbispath = htmlspecialchars( "$abcURL/$directory/$hash.ogg" );
152	150
153	151	$links = array();
154		~~- $links[] = "<a href=\"$e_abcpath\">" . wfMsg('abcabc') . "</a>";~~
155		~~- $links[] = "<a href=\"$e_pspath\">" . wfMsg('abcps') . "</a>";~~
156		~~- $links[] = "<a href=\"$e_pdfpath\">" . wfMsg('abcpdf') . "</a>";~~
157		~~- if ($abc2midi)~~
158		~~- $links[] = "<a href=\"$e_midipath\">" . wfMsg('abcmidi') . "</a>";~~
159		~~- if ($abctimidity)~~
160		~~- $links[] = "<a href=\"$e_vorbispath\">" . wfMsg('abcvorbis') . "</a>";~~
	152	+ $links[] = "<a href=\"$e_abcpath\">" . wfMsg( 'abcabc' ) . "</a>";
	153	+ $links[] = "<a href=\"$e_pspath\">" . wfMsg( 'abcps' ) . "</a>";
	154	+ $links[] = "<a href=\"$e_pdfpath\">" . wfMsg( 'abcpdf' ) . "</a>";
	155	+ if ( $abc2midi )
	156	+ $links[] = "<a href=\"$e_midipath\">" . wfMsg( 'abcmidi' ) . "</a>";
	157	+ if ( $abctimidity )
	158	+ $links[] = "<a href=\"$e_vorbispath\">" . wfMsg( 'abcvorbis' ) . "</a>";
161	159
162		~~- $e_dllinks = wfMsg('abcdownload') . " " . $wgLang->pipeList( $links );~~
	160	+ $e_dllinks = wfMsg( 'abcdownload' ) . " " . $wgLang->pipeList( $links );
163	161
164	162	$ogghtml = "";
165	163
166		~~- if ($abcOggHandler) {~~
167		~~- $oh = new OggTransformOutput(null,~~
	164	+ if ( $abcOggHandler ) {
	165	+ $oh = new OggTransformOutput( null,
168	166	"$filename.ogg", false,
169		~~- 250, 0, 0, false,~~
170		~~- "$filename.ogg", false);~~
171		~~- $ogghtml = $oh->toHtml(array('alt' => $title));~~
	167	+ 250, 0, 0, false,
	168	+ "$filename.ogg", false );
	169	+ $ogghtml = $oh->toHtml( array( 'alt' => $title ) );
172	170	}
173	171
174	172	$output = <<<EOF
—	—	@@ -184,36 +182,35 @@
185	183	return $output;
186	184	}
187	185
188		~~-function~~
189		~~-abcCreateABC($abc, $pfx, &$error)~~
190		-{
191		~~-global $abcPath;~~
192		~~- if (!@file_exists($abcPath)) {~~
	186	+function abcCreateABC( $abc, $pfx, &$error ) {
	187	+ global $abcPath;
	188	+
	189	+ if ( !@file_exists( $abcPath ) ) {
193	190	$error = "Error: $abcPath does not exist.";
194	191	return false;
195	192	}
196		-
	193	+
197	194	$filename = "$pfx.abc";
198		~~- if (file_exists($filename))~~
	195	+ if ( file_exists( $filename ) )
199	196	return true;
200		-
201		~~- if (($f = @fopen($filename, "w")) === false) {~~
	197	+
	198	+ if ( ( $f = @fopen( $filename, "w" ) ) === false ) {
202	199	$last = error_get_last();
203	200	$msg = $last['msg'];
204	201	$error = "Error: cannot create $filename: $msg";
205	202	return false;
206	203	}
207		-
208		~~- if (@fwrite($f, $abc) === false) {~~
209		~~- @unlink($filename);~~
	204	+
	205	+ if ( @fwrite( $f, $abc ) === false ) {
	206	+ @unlink( $filename );
210	207	$last = error_get_last();
211	208	$msg = $last['msg'];
212	209	$error = "Error: cannot write to $filename: $msg";
213	210	return false;
214	211	}
215		-
216		~~- if (@fclose($f) === false) {~~
217		~~- @unlink($filename);~~
	212	+
	213	+ if ( @fclose( $f ) === false ) {
	214	+ @unlink( $filename );
218	215	$last = error_get_last();
219	216	$msg = $last['msg'];
220	217	$error = "Error: cannot write to $filename: $msg";
—	—	@@ -223,135 +220,130 @@
224	221	return true;
225	222	}
226	223
227		~~-function~~
228		~~-abcCreatePS($abc, $pfx, &$error)~~
229		-{
230		~~-global $abcm2ps, $abcPath;~~
231		~~- if (!@file_exists($abcm2ps)) {~~
	224	+function abcCreatePS( $abc, $pfx, &$error ) {
	225	+ global $abcm2ps, $abcPath;
	226	+
	227	+ if ( !@file_exists( $abcm2ps ) ) {
232	228	$error = "Error: $abcm2ps not found.";
233	229	return false;
234	230	}
235		-
	231	+
236	232	$input = "$pfx.abc";
237	233	$output = "$pfx.ps";
238	234
239		~~- if (file_exists($output))~~
	235	+ if ( file_exists( $output ) )
240	236	return true;
241		-
	237	+
242	238	$cmd = "$abcm2ps -E $input -O $pfx";
243		~~- @exec($cmd, $cmd_out, $ret);~~
244		~~- if ($ret != 0 \|\| !@file_exists("{$pfx}001.eps")) {~~
	239	+ @exec( $cmd, $cmd_out, $ret );
	240	+ if ( $ret != 0 \|\| !@file_exists( "{$pfx}001.eps" ) ) {
245	241	$error = "Error: $abcm2ps failed to convert input (ret: $ret).\n";
246		~~- $error .= "Output: " . join("\n", $cmd_out);~~
	242	+ $error .= "Output: " . join( "\n", $cmd_out );
247	243	return false;
248	244	}
249		-
250		~~- if (@rename("{$pfx}001.eps", "{$pfx}.ps") === false) {~~
	245	+
	246	+ if ( @rename( "{$pfx}001.eps", "{$pfx}.ps" ) === false ) {
251	247	$error = "Error: cannot rename output file.";
252	248	return false;
253	249	}
254		-
	250	+
255	251	return true;
256	252	}
257	253
258		~~-function~~
259		~~-abcCreatePDF($abc, $pfx, &$error)~~
260		-{
261		~~-global $abcps2pdf, $abcPath;~~
262		~~- if (!@file_exists($abcps2pdf)) {~~
	254	+function abcCreatePDF( $abc, $pfx, &$error ) {
	255	+ global $abcps2pdf, $abcPath;
	256	+
	257	+ if ( !@file_exists( $abcps2pdf ) ) {
263	258	$error = "Error: $abcps2pdf not found.";
264	259	return false;
265	260	}
266		-
	261	+
267	262	$input = "$pfx.ps";
268	263	$output = "$pfx.pdf";
269	264
270		~~- if (file_exists($output))~~
	265	+ if ( file_exists( $output ) )
271	266	return true;
272	267
273	268	$cmd = "$abcps2pdf -dEPSCrop $input $output";
274		~~- @exec($cmd, $cmd_out, $ret);~~
275		~~- if ($ret != 0 \|\| !@file_exists("$pfx.pdf")) {~~
	269	+ @exec( $cmd, $cmd_out, $ret );
	270	+ if ( $ret != 0 \|\| !@file_exists( "$pfx.pdf" ) ) {
276	271	$error = "Error: $abcps2pdf failed to convert input (ret: $ret).\n";
277		~~- $error .= "Output: " . join("\n", $cmd_out);~~
	272	+ $error .= "Output: " . join( "\n", $cmd_out );
278	273	return false;
279	274	}
280		-
	275	+
281	276	return true;
282	277	}
283	278
284		~~-function~~
285		~~-abcCreatePNG($abc, $pfx, &$error)~~
286		-{
287		~~-global $wgImageMagickConvertCommand, $abcPath;~~
288		~~- if (!$wgImageMagickConvertCommand) {~~
	279	+function abcCreatePNG( $abc, $pfx, &$error ) {
	280	+ global $wgImageMagickConvertCommand, $abcPath;
	281	+
	282	+ if ( !$wgImageMagickConvertCommand ) {
289	283	$error = "Error: ImageMagick not enabled.";
290	284	return false;
291	285	}
292		-
	286	+
293	287	$input = "$pfx.ps";
294	288	$output = "$pfx.png";
295	289
296		~~- if (file_exists($output))~~
	290	+ if ( file_exists( $output ) )
297	291	return true;
298	292
299	293	$cmd = "$wgImageMagickConvertCommand $input $output";
300		~~- @exec($cmd, $cmd_out, $ret);~~
301		~~- if ($ret != 0 \|\| !@file_exists($output)) {~~
	294	+ @exec( $cmd, $cmd_out, $ret );
	295	+ if ( $ret != 0 \|\| !@file_exists( $output ) ) {
302	296	$error = "Error: ImageMagick failed to convert input [$output] (ret: $ret).";
303		~~- $error .= "Output: " . join("\n", $cmd_out);~~
	297	+ $error .= "Output: " . join( "\n", $cmd_out );
304	298	return false;
305	299	}
306	300
307	301	return true;
308	302	}
309	303
310		~~-function~~
311		~~-abcCreateMIDI($abc, $pfx, &$error)~~
312		-{
313		~~-global $abc2midi, $abcPath;~~
314		~~- if (!$abc2midi) {~~
	304	+function abcCreateMIDI( $abc, $pfx, &$error ) {
	305	+ global $abc2midi, $abcPath;
	306	+
	307	+ if ( !$abc2midi ) {
315	308	$error = "Error: $abc2midi not found.";
316	309	return false;
317	310	}
318		-
	311	+
319	312	$input = "$pfx.abc";
320	313	$output = "$pfx.mid";
321	314
322		~~- if (file_exists($output))~~
	315	+ if ( file_exists( $output ) )
323	316	return true;
324	317
325	318	$cmd = "$abc2midi $input -o $output";
326		~~- @exec($cmd, $cmd_out, $ret);~~
327		~~- if ($ret != 0 \|\| !@file_exists($output)) {~~
	319	+ @exec( $cmd, $cmd_out, $ret );
	320	+ if ( $ret != 0 \|\| !@file_exists( $output ) ) {
328	321	$error = "Error: $abc2midi failed to convert input [$output] (ret: $ret).";
329		~~- $error .= "Output: " . join("\n", $cmd_out);~~
	322	+ $error .= "Output: " . join( "\n", $cmd_out );
330	323	return false;
331	324	}
332	325
333	326	return true;
334	327	}
335	328
336		~~-function~~
337		~~-abcCreateVorbis($abc, $pfx, &$error)~~
338		-{
339		~~-global $abctimidity, $abcMIDIvoice, $abcPath;~~
340		~~- if (!@file_exists($abctimidity)) {~~
	329	+function abcCreateVorbis( $abc, $pfx, &$error ) {
	330	+ global $abctimidity, $abcMIDIvoice, $abcPath;
	331	+
	332	+ if ( !@file_exists( $abctimidity ) ) {
341	333	$error = "Error: TiMidity++ not enabled.";
342	334	return false;
343	335	}
344		-
	336	+
345	337	$input = "$pfx.mid";
346	338	$output = "$pfx.ogg";
347	339
348		~~- if (file_exists($output))~~
	340	+ if ( file_exists( $output ) )
349	341	return true;
350	342
351	343	$cmd = "$abctimidity -Ei$abcMIDIvoice -Ov -id $input";
352		~~- @exec($cmd, $cmd_out, $ret);~~
353		~~- if ($ret != 0 \|\| !@file_exists($output)) {~~
	344	+ @exec( $cmd, $cmd_out, $ret );
	345	+ if ( $ret != 0 \|\| !@file_exists( $output ) ) {
354	346	$error = "Error: TiMidity++ failed to convert input [$output] (ret: $ret).";
355		~~- $error .= "Output: " . join("\n", $cmd_out);~~
	347	+ $error .= "Output: " . join( "\n", $cmd_out );
356	348	return false;
357	349	}
358	350
Index: trunk/extensions/Translate/groups/mediawiki-defines.txt
—	—	@@ -1,5 +1,4 @@
2	2	ABC
3		~~-descmsg = abcdesc~~
4	3	optional = abcabc, abcpdf, abcps, abcmidi, abcvorbis
5	4
6	5	Absentee Landlord

Status & tagging log

07:32, 19 February 2010 Tim Starling (talk | contribs) changed the status of r62426 [removed: new added: deferred]