r114238 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r114237‎ \| r114238 \| r114239 >
Date:	08:39, 20 March 2012
Author:	tomasz
Status:	ok
Tags:
Comment:	MFT r114237
Modified paths:	/branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess (modified) (history) /branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php (modified) (history) /branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.body.php
—	—	@@ -109,7 +109,7 @@
110	110	}
111	111	}
112	112
113		~~- if ( self::$isFilePage && self::$acceptBilling !== 'yes' ) {~~
	113	+ if ( self::$isFilePage && self::$acceptBilling !== 'yes' && self::$renderZeroRatedBanner === true ) {
114	114	$acceptBillingYes = Html::rawElement( 'a',
115	115	array( 'href' => str_replace( '.wikipedia.org/', '.m.wikipedia.org/', wfExpandUrl( $wgRequest->appendQuery( 'acceptbilling=yes' . urlencode( $referrer ) ), PROTO_CURRENT ) ) ),
116	116	wfMsg( 'zero-rated-mobile-access-banner-text-data-charges-yes' ) );
Index: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.i18n.php
—	—	@@ -34,6 +34,7 @@
35	35	/** Message documentation (Message documentation)
36	36	* @author EugeneZelenko
37	37	* @author Patrick Reilly
	38	+ * @author SPQRobin
38	39	* @author Siebrand
39	40	*/
40	41	$messages['qqq'] = array(
—	—	@@ -44,7 +45,8 @@
45	46	'zero-rated-mobile-access-home-page-selection' => 'Name of language followed by text to show user in local link to Wikipedia',
46	47	'zero-rated-mobile-access-home-page-selection-text' => 'Text to show user prior to selection of language option',
47	48	'zero-rated-mobile-access-banner-text' => 'Text shown to users of various carriers with carrier name',
48		~~- 'zero-rated-mobile-access-banner-text-digi' => 'Text shown to users of various carriers with carrier name',~~
	49	+ 'zero-rated-mobile-access-banner-text-digi' => 'Text shown to users of various carriers. Parameters:
	50	+* $1 is a carrier name (like "Orange" or "Telenor").',
49	51	'zero-rated-mobile-access-banner-text-wikimedia' => 'Text shown to users of various carriers with carrier name',
50	52	'zero-rated-mobile-access-banner-text-data-charges' => 'Data charges notice to user before images are displayed. Parameters:
51	53	* $1 is {{Msg-mw\|zero-rated-mobile-access-banner-text-data-charges-yes}}
—	—	@@ -57,6 +59,15 @@
58	60	* $1 is the alt text of the image that can be viewed.',
59	61	);
60	62
	63	+/** Ṫuroyo (Ṫuroyo)
	64	+ * @author Ariyo
	65	+ */
	66	+$messages['tru'] = array(
	67	+ 'zero-rated-mobile-access-search' => 'Kruxyo',
	68	+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Eh',
	69	+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'Lo',
	70	+);
	71	+
61	72	/** Asturian (Asturianu)
62	73	* @author Xuacu
63	74	*/
—	—	@@ -84,6 +95,8 @@
85	96	'zero-rated-mobile-access-home-page-selection' => '$1 галоўная старонка',
86	97	'zero-rated-mobile-access-home-page-selection-text' => 'Ці перайсьці на галоўную старонка на мове:',
87	98	'zero-rated-mobile-access-banner-text' => 'Бясплатная {{SITENAME}} ад $1',
	99	+ 'zero-rated-mobile-access-banner-text-digi' => 'Бясплатны доступ у $1 Opera Mini',
	100	+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} бясплатна ад $1',
88	101	'zero-rated-mobile-access-banner-text-data-charges' => 'Пасьля працягу могуць быць сьпісаныя кошты: $1 ці $2',
89	102	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'так',
90	103	'zero-rated-mobile-access-banner-text-data-charges-no' => 'не',
—	—	@@ -139,6 +152,8 @@
140	153	'zero-rated-mobile-access-home-page-selection' => '$1 startowy bok',
141	154	'zero-rated-mobile-access-home-page-selection-text' => 'Abo źi k startowemu bokoju w slědujucej rěcy:',
142	155	'zero-rated-mobile-access-banner-text' => 'Lichotna {{SITENAME}} wót $1',
	156	+ 'zero-rated-mobile-access-banner-text-digi' => 'Lichy pśistup na $1 Opera Mini',
	157	+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'Licha {{SITENAME}} wót $1',
143	158	'zero-rated-mobile-access-banner-text-data-charges' => 'Pśi pśenjasenju datow mógu se płaśonki wuběraś: $1 abo $2',
144	159	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Jo',
145	160	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Ně',
—	—	@@ -193,6 +208,8 @@
194	209	'zero-rated-mobile-access-home-page-selection' => "page d'accueil $1",
195	210	'zero-rated-mobile-access-home-page-selection-text' => "Ou allez à la page d'accueil dans la langue suivante:",
196	211	'zero-rated-mobile-access-banner-text' => '{{SITENAME}} libre depuis $1',
	212	+ 'zero-rated-mobile-access-banner-text-digi' => 'Accès libre sur $1 Opera Mini',
	213	+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} libre depuis $1',
197	214	'zero-rated-mobile-access-banner-text-data-charges' => "Les frais de données peuvent s'appliquer de façon permanente: $1 ou $2",
198	215	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Oui',
199	216	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Non',
—	—	@@ -210,6 +227,8 @@
211	228	'zero-rated-mobile-access-home-page-selection' => 'Páxina principal en $1',
212	229	'zero-rated-mobile-access-home-page-selection-text' => 'Ou vaia á páxina principal na seguinte lingua:',
213	230	'zero-rated-mobile-access-banner-text' => '{{SITENAME}} gratis desde $1',
	231	+ 'zero-rated-mobile-access-banner-text-digi' => 'Acceso gratuíto con $1 Opera Mini',
	232	+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} gratis desde $1',
214	233	'zero-rated-mobile-access-banner-text-data-charges' => 'Poden aplicarse tarifas de datos se continúa: $1 ou $2',
215	234	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'si',
216	235	'zero-rated-mobile-access-banner-text-data-charges-no' => 'non',
—	—	@@ -226,6 +245,8 @@
227	246	'zero-rated-mobile-access-home-page-selection' => 'דף הבית של $1',
228	247	'zero-rated-mobile-access-home-page-selection-text' => 'או ללכת לדף הבית בשפה הבאה:',
229	248	'zero-rated-mobile-access-banner-text' => '{{SITENAME}} בחינם מ{{GRAMMAR:תחילית\|$1}}',
	249	+ 'zero-rated-mobile-access-banner-text-digi' => 'גישה חופשית בדפדפן אופרה מיני בשירות $1',
	250	+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'אתר {{SITENAME}} באדיבות $1',
230	251	'zero-rated-mobile-access-banner-text-data-charges' => 'ייתכן שיחול תשלום על העברת נתונים אם תמשיכו: $1 או $2',
231	252	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'כן',
232	253	'zero-rated-mobile-access-banner-text-data-charges-no' => 'לא',
—	—	@@ -242,6 +263,8 @@
243	264	'zero-rated-mobile-access-home-page-selection' => '$1 startowa strona',
244	265	'zero-rated-mobile-access-home-page-selection-text' => 'Abo wopytaj startowu stronu w slědowacej rěči:',
245	266	'zero-rated-mobile-access-banner-text' => 'Swobodna {{SITENAME}} wot $1',
	267	+ 'zero-rated-mobile-access-banner-text-digi' => 'Swobodny přistup na $1 Opera Mini',
	268	+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'Swobodna {{SITENAME}} wot $1',
246	269	'zero-rated-mobile-access-banner-text-data-charges' => 'Při přenjesenju datow móža so popłatki zběrać: $1 abo $2',
247	270	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Haj',
248	271	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Ně',
—	—	@@ -258,6 +281,8 @@
259	282	'zero-rated-mobile-access-home-page-selection' => 'Pagina principal in $1',
260	283	'zero-rated-mobile-access-home-page-selection-text' => 'O va al pagina principal in lingua:',
261	284	'zero-rated-mobile-access-banner-text' => '{{SITENAME}} gratuite de $1',
	285	+ 'zero-rated-mobile-access-banner-text-digi' => 'Accesso gratuite sur $1 Opera Mini',
	286	+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} gratuite de $1',
262	287	'zero-rated-mobile-access-banner-text-data-charges' => 'Costos de datos pote esser applicate. Continuar ($1 o $2)?',
263	288	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Si',
264	289	'zero-rated-mobile-access-banner-text-data-charges-no' => 'No',
—	—	@@ -272,6 +297,16 @@
273	298	'zero-rated-mobile-access-search' => '検索する',
274	299	);
275	300
	301	+/** Kannada (ಕನ್ನಡ)
	302	+ * @author Nayvik
	303	+ */
	304	+$messages['kn'] = array(
	305	+ 'zero-rated-mobile-access-search' => 'ಹುಡುಕು',
	306	+ 'zero-rated-mobile-access-language-selection' => 'ಎಲ್ಲಾ ಭಾಷೆಗಳು',
	307	+ 'zero-rated-mobile-access-banner-text-data-charges-yes' => 'ಹೌದು',
	308	+ 'zero-rated-mobile-access-banner-text-data-charges-no' => 'ಇಲ್ಲ',
	309	+);
	310	+
276	311	/** Korean (한국어)
277	312	* @author Kwj2772
278	313	*/
—	—	@@ -307,6 +342,8 @@
308	343	'zero-rated-mobile-access-home-page-selection' => 'Главна страница на $1',
309	344	'zero-rated-mobile-access-home-page-selection-text' => 'Или пак посетете ја главната страница на следниов јазик:',
310	345	'zero-rated-mobile-access-banner-text' => 'Бесплатна {{SITENAME}} од $1',
	346	+ 'zero-rated-mobile-access-banner-text-digi' => 'Слободен пристап на $1 Opera Mini',
	347	+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'Бесплатна {{SITENAME}} од $1',
311	348	'zero-rated-mobile-access-banner-text-data-charges' => 'Може да ви биде побарана доплата за податоците. Сакате да продолжите? $1 / $2',
312	349	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Да',
313	350	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Не',
—	—	@@ -339,6 +376,8 @@
340	377	'zero-rated-mobile-access-home-page-selection' => 'Laman utama $1',
341	378	'zero-rated-mobile-access-home-page-selection-text' => 'Atau pergi ke laman utama dalam bahasa yang berikut:',
342	379	'zero-rated-mobile-access-banner-text' => '{{SITENAME}} percuma daripada $1',
	380	+ 'zero-rated-mobile-access-banner-text-digi' => 'Akses percuma di $1 Opera Mini',
	381	+ 'zero-rated-mobile-access-banner-text-wikimedia' => '{{SITENAME}} percuma daripada $1',
343	382	'zero-rated-mobile-access-banner-text-data-charges' => 'Tertakluk kepada caj data, sambung? $1 atau $2',
344	383	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ya',
345	384	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Tidak',
—	—	@@ -372,6 +411,8 @@
373	412	'zero-rated-mobile-access-home-page-selection' => 'Startpagina van $1',
374	413	'zero-rated-mobile-access-home-page-selection-text' => 'Of ga naar de startpagina in de volgende taal:',
375	414	'zero-rated-mobile-access-banner-text' => 'Gratis {{SITENAME}} van $1',
	415	+ 'zero-rated-mobile-access-banner-text-digi' => 'Gratis toegang tot $1 Opera Mini',
	416	+ 'zero-rated-mobile-access-banner-text-wikimedia' => 'Gratis {{SITENAME}} van $1',
376	417	'zero-rated-mobile-access-banner-text-data-charges' => 'U moet mogelijk datakosten betalen als u doorgaat: $1 of $2',
377	418	'zero-rated-mobile-access-banner-text-data-charges-yes' => 'Ja',
378	419	'zero-rated-mobile-access-banner-text-data-charges-no' => 'Nee',
Property changes on: branches/wmf/1.19wmf1/extensions/ZeroRatedMobileAccess
___________________________________________________________________
Added: svn:mergeinfo
379	420	Merged /branches/new-installer/phase3/extensions/ZeroRatedMobileAccess:r43664-66004
380	421	Merged /branches/JSTesting/extensions/ZeroRatedMobileAccess:r100352-107913
381	422	Merged /branches/REL1_15/phase3/extensions/ZeroRatedMobileAccess:r51646
382	423	Merged /branches/wmf/1.18wmf1/extensions/ZeroRatedMobileAccess:r97508
383	424	Merged /branches/REL1_17/phase3/extensions/ZeroRatedMobileAccess:r81445,81448
384	425	Merged /trunk/extensions/ZeroRatedMobileAccess:r110933,111011,111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282,112360,112517,112571,112586,112613,112628,112751,112758,112770-112772,112775,112849,112851,112856,112859,112903,112925,112930,112993,113352,113367,113458,113845-114237
385	426	Merged /branches/sqlite/extensions/ZeroRatedMobileAccess:r58211-58321
386	427	Merged /trunk/phase3/extensions/ZeroRatedMobileAccess:r111002,111029,111034,111062,111067,111076,111085,111128,111144,111251

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r114237	fix for bug 35352. this provides at the very least a short term fix to an iss...	tomasz	08:34, 20 March 2012

Status & tagging log

20:50, 20 March 2012 Reedy (talk | contribs) changed the status of r114238 [removed: new added: ok]