r94184 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r94183‎ \| r94184 \| r94185 >
Date:	18:57, 10 August 2011
Author:	preilly
Status:	ok
Tags:
Comment:	update deployment branch to newest Mobile Frontend changes for opt-in opt-out and x-device support
Modified paths:	/branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php (modified) (history) /branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history) /branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optin.html.php (added) (history) /branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optout.html.php (added) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
—	—	@@ -43,7 +43,17 @@
44	44	'mobile-frontend-file-namespace' => 'File',
45	45	'mobile-frontend-wml-continue' => 'Continue ...',
46	46	'mobile-frontend-wml-back' => 'Back ...',
47		~~- 'mobile-frontend-view' => 'Mobile View',~~
	47	+ 'mobile-frontend-view' => 'Mobile view',
	48	+ 'mobile-frontend-opt-in-message' => 'Join our opt-in testing of the new mobile frontend?',
	49	+ 'mobile-frontend-opt-in-yes-button' => 'yes',
	50	+ 'mobile-frontend-opt-in-no-button' => 'no',
	51	+ 'mobile-frontend-opt-in-title' => 'Opt-In for Testing',
	52	+ 'mobile-frontend-opt-in-explain' => 'This allows you to enter the test',
	53	+ 'mobile-frontend-opt-out-message' => 'Leave opt-in testing of the new mobile frontend?',
	54	+ 'mobile-frontend-opt-out-yes-button' => 'yes',
	55	+ 'mobile-frontend-opt-out-no-button' => 'no',
	56	+ 'mobile-frontend-opt-out-title' => 'Opt-Out of Testing',
	57	+ 'mobile-frontend-opt-out-explain' => 'This allows you to leave the test',
48	58	);
49	59
50	60	/** Moroccan Spoken Arabic (Maġribi) */
—	—	@@ -264,6 +274,23 @@
265	275	'mobile-frontend-file-namespace' => 'ملف',
266	276	);
267	277
	278	+/** Aramaic (ܐܪܡܝܐ)
	279	+ * @author Basharh
	280	+ */
	281	+$messages['arc'] = array(
	282	+ 'mobile-frontend-search-submit' => 'ܙܠ',
	283	+ 'mobile-frontend-search-results' => 'ܦܠܛ̈ܐ ܕܒܘܨܝܐ',
	284	+ 'mobile-frontend-home-button' => 'ܪܝܫܝܬܐ',
	285	+ 'mobile-frontend-random-button' => 'ܚܘܝܚܐܝܬ',
	286	+ 'mobile-frontend-nav-end' => 'ܫܘܠܡܐ',
	287	+ 'mobile-frontend-nav-top' => 'ܥܠܝܐ',
	288	+ 'mobile-frontend-nav-edit' => 'ܫܚܠܦ',
	289	+ 'mobile-frontend-nav-history' => 'ܬܫܥܝܬܐ',
	290	+ 'mobile-frontend-search-text' => 'ܒܨܝ',
	291	+ 'mobile-frontend-file-namespace' => 'ܠܦܦܐ',
	292	+ 'mobile-frontend-view' => 'ܓܠܚܐ ܒܙܥܘܩܐ ܟܘܪܝܐ (ܡܫܢܝܢܐ)',
	293	+);
	294	+
268	295	/** Asturian (Asturianu) */
269	296	$messages['ast'] = array(
270	297	'mobile-frontend-search-submit' => 'Dir',
—	—	@@ -801,16 +828,16 @@
802	829	'mobile-frontend-regular-site' => 'Zur klassischen {{SITENAME}}-Ansicht wechseln',
803	830	'mobile-frontend-perm-stop-redirect' => 'Mobile Ansicht dauerhaft deaktivieren',
804	831	'mobile-frontend-error-page-title' => 'Es ist ein Problem aufgetreten.',
805		- 'mobile-frontend-error-page-text' => 'Die mobile {{SITENAME}}-Ansicht befindet sich noch in der Entwicklung und wir bemühen uns, noch bestehende interne Fehler zu beheben. Wir wurden über diesen Fehler informiert und werden das Problem in Kürze lösen. Bitte versuche es später noch einmal.',
	832	+ 'mobile-frontend-error-page-text' => 'Die mobile Ansicht von {{SITENAME}} befindet sich noch in der Entwicklung und wir bemühen uns, noch bestehende interne Fehler zu beheben. Wir wurden über diesen Fehler informiert und werden das Problem in Kürze lösen. Bitte versuche es später noch einmal.',
806	833	'mobile-frontend-are-you-sure' => 'Bist du dir sicher?',
807		- 'mobile-frontend-explain-disable' => 'Bist du dir sicher, dass du die mobile {{SITENAME}}-Ansicht deaktivieren möchtest? Sofern du <b>Deaktivieren</b> wählst, wirst du von nun an bei einem Besuch von {{SITENAME}} nicht mehr automatisch auf die mobile {{SITENAME}}-Ansicht weitergeleitet.',
	834	+ 'mobile-frontend-explain-disable' => 'Bist du dir sicher, dass du die mobile Ansicht von {{SITENAME}} deaktivieren möchtest? Sofern du <b>Deaktivieren</b> wählst, wirst du von nun an bei einem Besuch von {{SITENAME}} nicht mehr automatisch auf die mobile Ansicht von {{SITENAME}} weitergeleitet.',
808	835	'mobile-frontend-nav-end' => 'Ende',
809	836	'mobile-frontend-nav-top' => 'Oben',
810	837	'mobile-frontend-nav-edit' => 'Bearbeiten',
811	838	'mobile-frontend-nav-history' => 'Verlauf',
812	839	'mobile-frontend-search-text' => 'Suche',
813	840	'mobile-frontend-contact-us' => 'Im Fall von Fragen oder Anmerkungen kontaktiere uns bitte unter der E-Mail-Adresse mobile@wikipedia.org',
814		~~- 'mobile-frontend-author-link' => 'Diese Datei in der regulären {{SITENAME}} anzeigen, um Informationen über Autoren, Lizenz und erweiterte Beschreibungen zu sehen.',~~
	841	+ 'mobile-frontend-author-link' => 'Diese Datei in der regulären Ansicht von {{SITENAME}} anzeigen, um Informationen über Autoren, Lizenz und erweiterte Beschreibungen zu sehen.',
815	842	'mobile-frontend-download-full-version' => 'Vollversion downloaden',
816	843	'mobile-frontend-file-namespace' => 'Datei',
817	844	'mobile-frontend-wml-continue' => 'Weiter ...',
—	—	@@ -822,9 +849,9 @@
823	850	* @author Kghbln
824	851	*/
825	852	$messages['de-formal'] = array(
826		- 'mobile-frontend-error-page-text' => 'Die mobile {{SITENAME}}-Ansicht befindet sich noch in der Entwicklung und wir bemühen uns, noch bestehende interne Fehler zu beheben. Wir wurden über diesen Fehler informiert und werden das Problem in Kürze lösen. Bitte versuchen Sie es später noch einmal.',
	853	+ 'mobile-frontend-error-page-text' => 'Die mobile Ansicht von {{SITENAME}} befindet sich noch in der Entwicklung und wir bemühen uns, noch bestehende interne Fehler zu beheben. Wir wurden über diesen Fehler informiert und werden das Problem in Kürze lösen. Bitte versuchen Sie es später noch einmal.',
827	854	'mobile-frontend-are-you-sure' => 'Sind Sie sich sicher?',
828		- 'mobile-frontend-explain-disable' => 'Sind Sie sich sicher, dass Sie die mobile {{SITENAME}}-Ansicht deaktivieren möchten? Sofern Sie <b>Deaktivieren</b> wählen, werden Sie von nun an bei einem Besuch von {{SITENAME}} nicht mehr automatisch auf die mobile {{SITENAME}}-Ansicht weitergeleitet.',
	855	+ 'mobile-frontend-explain-disable' => 'Sind Sie sich sicher, dass Sie die mobile Ansicht von {{SITENAME}} deaktivieren möchten? Sofern Sie <b>Deaktivieren</b> wählen, werden Sie von nun an bei einem Besuch von {{SITENAME}} nicht mehr automatisch auf die mobile Ansicht {{SITENAME}} weitergeleitet.',
829	856	'mobile-frontend-contact-us' => 'Im Fall von Fragen oder Anmerkungen kontaktieren Sie uns bitte unter der E-Mail-Adresse mobile@wikipedia.org',
830	857	);
831	858
—	—	@@ -981,7 +1008,9 @@
982	1009	'mobile-frontend-file-namespace' => 'Dosiero',
983	1010	);
984	1011
985		~~-/** Spanish (Español) */~~
	1012	+/** Spanish (Español)
	1013	+ * @author Crazymadlover
	1014	+ */
986	1015	$messages['es'] = array(
987	1016	'mobile-frontend-search-submit' => 'Ir',
988	1017	'mobile-frontend-search-results' => 'Resultados de la búsqueda',
—	—	@@ -998,16 +1027,16 @@
999	1028	'mobile-frontend-regular-site' => 'Ver esta página en {{SITENAME}} estándar',
1000	1029	'mobile-frontend-perm-stop-redirect' => 'Desactivar permanentemente el sitio móvil',
1001	1030	'mobile-frontend-error-page-title' => '¡Tenemos un problema!',
1002		- 'mobile-frontend-error-page-text' => '{{SITENAME}} para móviles está todavía bajo desarrollo activo y estamos trabajando intensamente para arreglar todos nuestros errores internos. Hemos sido notificados de este error y lo arreglaremos pronto. Por favor, revise regularmente si la petición ha sido o no atendida.',
	1031	+ 'mobile-frontend-error-page-text' => '{{SITENAME}} para móviles está todavía bajo desarrollo activo y estamos trabajando intensamente para arreglar todos nuestros errores internos. Hemos sido notificados de este error y lo arreglaremos pronto. Por favor,revíselo después.',
1003	1032	'mobile-frontend-are-you-sure' => '¿Estás seguro?',
1004		- 'mobile-frontend-explain-disable' => '¿Estas seguro que deseas desactivar la versión móvil de {{SITENAME}}? Si escoges <b>Desactivar</b>, de ahora en adelante, cuando visites {{SITENAME}}, no serás redirigido a esta vista móvil de {{SITENAME}}.',
	1033	+ 'mobile-frontend-explain-disable' => 'Estas seguro que deseas desactivar la versión móvil de {{SITENAME}}? Si escoges <b>Desactivar</b>, de ahora en adelante, cuando visites {{SITENAME}}, no serás redirigido a esta vista móvil de {{SITENAME}}.',
1005	1034	'mobile-frontend-nav-end' => 'Fin',
1006	1035	'mobile-frontend-nav-top' => 'Arriba',
1007	1036	'mobile-frontend-nav-edit' => 'Editar',
1008	1037	'mobile-frontend-nav-history' => 'Historial',
1009	1038	'mobile-frontend-search-text' => 'Buscar',
1010	1039	'mobile-frontend-contact-us' => 'Si tienes alguna pregunta o comentario siéntete libre de enviarnos un correo electrónico a mobile@wikipedia.org',
1011		~~- 'mobile-frontend-author-link' => 'Ver este archivo de media en {{SITENAME}} para ver la información sobre la autoría, licencia y descripciones adicionales.',~~
	1040	+ 'mobile-frontend-author-link' => 'Ver este archivo de medios en la versión regular de {{SITENAME}} para ver la información sobre la autoría, licencia y descripciones adicionales.',
1012	1041	'mobile-frontend-download-full-version' => 'Descargar la versión completa',
1013	1042	'mobile-frontend-file-namespace' => 'Archivo',
1014	1043	);
—	—	@@ -1212,7 +1241,7 @@
1213	1242	'mobile-frontend-hide-button' => 'Cachiér',
1214	1243	'mobile-frontend-disable-button' => 'Dèsactivar',
1215	1244	'mobile-frontend-back-button' => 'Tornar',
1216		~~- 'mobile-frontend-regular-site' => 'Fâre vêre ceta pâge dessus Vouiquipèdia classica',~~
	1245	+ 'mobile-frontend-regular-site' => 'Fâre vêre ceta pâge dessus {{SITENAME}} classica',
1217	1246	'mobile-frontend-error-page-title' => 'Dèsolâ ! Nos avens un problèmo.',
1218	1247	'mobile-frontend-are-you-sure' => 'Éte-vos de sûr ?',
1219	1248	'mobile-frontend-nav-end' => 'Fin',
—	—	@@ -1222,6 +1251,8 @@
1223	1252	'mobile-frontend-search-text' => 'Rechèrchiér',
1224	1253	'mobile-frontend-download-full-version' => 'Tèlèchargiér la vèrsion complèta',
1225	1254	'mobile-frontend-file-namespace' => 'Fichiér',
	1255	+ 'mobile-frontend-wml-continue' => 'Continuar ...',
	1256	+ 'mobile-frontend-wml-back' => 'Retôrn ...',
1226	1257	);
1227	1258
1228	1259	/** Friulian (Furlan) */
—	—	@@ -1308,16 +1339,19 @@
1309	1340	'mobile-frontend-error-page-title' => 'Vaites, temos un problema!',
1310	1341	'mobile-frontend-error-page-text' => '{{SITENAME}} móbil aínda está en desenvolvemento activo e estamos a traballar arreo para arranxar os nosos erros internos. Xa se nos avisou deste erro e axiña o resolveremos. Ata a próxima!',
1311	1342	'mobile-frontend-are-you-sure' => 'Está seguro?',
1312		- 'mobile-frontend-explain-disable' => 'Está seguro de querer desactivar a versión móbil da {{SITENAME}}? Se escolle a opción "<b>Desactivar</b>", a partir de entón, cando visite a {{SITENAME}}, non será redirixido a esta versión móbil da {{SITENAME}}.',
	1343	+ 'mobile-frontend-explain-disable' => 'Está seguro de querer desactivar a versión móbil de {{SITENAME}}? Se escolle a opción "<b>Desactivar</b>", a partir de entón, cando visite {{SITENAME}}, non será redirixido a esta versión móbil de {{SITENAME}}.',
1313	1344	'mobile-frontend-nav-end' => 'Fin',
1314	1345	'mobile-frontend-nav-top' => 'Comezo',
1315	1346	'mobile-frontend-nav-edit' => 'Editar',
1316	1347	'mobile-frontend-nav-history' => 'Historial',
1317	1348	'mobile-frontend-search-text' => 'Procurar',
1318	1349	'mobile-frontend-contact-us' => 'Se ten calquera pregunta, comentario ou dúbida, síntase libre de enviarnos un correo electrónico a mobile@wikipedia.org',
1319		~~- 'mobile-frontend-author-link' => 'Ollar este ficheiro na {{SITENAME}} normal para ver a información sobre a autoría, a licenza e calquera descrición adicional.',~~
	1350	+ 'mobile-frontend-author-link' => 'Ollar este ficheiro en {{SITENAME}} normal para ver a información sobre a autoría, a licenza e calquera descrición adicional.',
1320	1351	'mobile-frontend-download-full-version' => 'Descargar a versión completa',
1321	1352	'mobile-frontend-file-namespace' => 'Ficheiro',
	1353	+ 'mobile-frontend-wml-continue' => 'Continuar...',
	1354	+ 'mobile-frontend-wml-back' => 'Volver...',
	1355	+ 'mobile-frontend-view' => 'Vista móbil',
1322	1356	);
1323	1357
1324	1358	/** Ancient Greek (Ἀρχαία ἑλληνικὴ) */
—	—	@@ -1666,6 +1700,9 @@
1667	1701	'mobile-frontend-author-link' => 'Vide iste file multimedia sur le {{SITENAME}} normal pro vider information super le autores, le licentia, e descriptiones additional.',
1668	1702	'mobile-frontend-download-full-version' => 'Discargar version complete',
1669	1703	'mobile-frontend-file-namespace' => 'File',
	1704	+ 'mobile-frontend-wml-continue' => 'Continuar ...',
	1705	+ 'mobile-frontend-wml-back' => 'Retornar…',
	1706	+ 'mobile-frontend-view' => 'Version mobile',
1670	1707	);
1671	1708
1672	1709	/** Indonesian (Bahasa Indonesia) */
—	—	@@ -2166,12 +2203,12 @@
2167	2204	'mobile-frontend-hide-button' => 'Verstoppen',
2168	2205	'mobile-frontend-disable-button' => 'Ausschalten',
2169	2206	'mobile-frontend-back-button' => 'Zréck',
2170		~~- 'mobile-frontend-regular-site' => 'Dës Säit als klassesch Wikiedia-Säit weisen',~~
	2207	+ 'mobile-frontend-regular-site' => 'Dës Säit als klassesch {{SITENAME}}-Säit weisen',
2171	2208	'mobile-frontend-perm-stop-redirect' => 'Mobile Site dauerhaft ausschalten',
2172	2209	'mobile-frontend-error-page-title' => 'Mir hunn e Problem!',
2173		- 'mobile-frontend-error-page-text' => '{{SITENAME}}-Mobil gëtt nach ëmmer weiderentwéckelt a mir schaffen drun fir all eis intern Feeler ze verbesseren. Mir goufe vun dësem Feeler informéiert a wäerten en esou séier wéi méiglech verbesseren. Versicht et w.e.g. geschwënn nachemol!',
	2210	+ 'mobile-frontend-error-page-text' => '{{SITENAME}}-Mobil gëtt nach ëmmer weiderentwéckelt a mir schaffen dru fir all eis intern Feeler ze verbesseren. Mir goufe vun dësem Feeler informéiert a wäerten en esou séier wéi méiglech verbesseren. Versicht et w.e.g. geschwënn nachemol!',
2174	2211	'mobile-frontend-are-you-sure' => 'Sidd Dir sécher?',
2175		- 'mobile-frontend-explain-disable' => 'Sidd Dir sécher datt Dir déi mobil Versioun vu {{SITENAME}} ausschalte wëllt? Wann Dir <b>Ausschalten</b> wielt, da gitt Dir vun dann un, wann dir {{SITENAME}} besicht, net méi op dës mobil Versioun vu {{SITENAME}} virugeleet.',
	2212	+ 'mobile-frontend-explain-disable' => 'Sidd Dir sécher datt Dir déi mobil Versioun vu {{SITENAME}} ausschalte wëllt? Wann Dir <b>Ausschalten</b> wielt, da gitt Dir vun elo un, wann dir {{SITENAME}} besicht, net méi op dës mobil Versioun vu {{SITENAME}} virugeleet.',
2176	2213	'mobile-frontend-nav-end' => 'Schluss',
2177	2214	'mobile-frontend-nav-top' => 'Uewen',
2178	2215	'mobile-frontend-nav-edit' => 'Änneren',
—	—	@@ -2395,7 +2432,7 @@
2396	2433	'mobile-frontend-hide-button' => 'Скриј',
2397	2434	'mobile-frontend-disable-button' => 'Оневозможи',
2398	2435	'mobile-frontend-back-button' => 'Назад',
2399		~~- 'mobile-frontend-regular-site' => 'Погледајте ја страницава на обична Википедија',~~
	2436	+ 'mobile-frontend-regular-site' => 'Погледајте ја страницава во обичен режим на {{SITENAME}}',
2400	2437	'mobile-frontend-perm-stop-redirect' => 'Трајно оневозможи ја оваа мобилна страница',
2401	2438	'mobile-frontend-error-page-title' => 'Имаме проблем!',
2402	2439	'mobile-frontend-error-page-text' => 'Мобилното издание на {{SITENAME}} е сè уште во активен развој, и работиме напорно за да ги поправиме сите внатрешни грешки. Известени сме за оваа грешка и набргу ќе ја поправиме. Проверете повторно!',
—	—	@@ -2549,16 +2586,16 @@
2550	2587	'mobile-frontend-regular-site' => 'Lihat laman ini di {{SITENAME}} biasa',
2551	2588	'mobile-frontend-perm-stop-redirect' => 'Lumpuhkan versi bergerak secara kekal',
2552	2589	'mobile-frontend-error-page-title' => 'Kami mempunyai masalah!',
2553		- 'mobile-frontend-error-page-text' => "''{{SITENAME}} mobile'' masih dalam pembangunan aktif dan kami sedang berusaha keras memperbaiki semua ralat dalaman kami. Kami telah dimaklumkan mengenai ralat ini dan akan segera memperbaikinya. Sila semak semula nanti!",
	2590	+ 'mobile-frontend-error-page-text' => '{{SITENAME}} mobile masih dalam pembangunan aktif dan kami sedang berusaha keras memperbaiki semua ralat dalaman kami. Kami telah dimaklumkan mengenai ralat ini dan akan segera memperbaikinya. Sila datang balik nanti!',
2554	2591	'mobile-frontend-are-you-sure' => 'Adakah anda pasti?',
2555		- 'mobile-frontend-explain-disable' => 'Adakah anda pasti anda hendak melumpuhkan versi bergerak {{SITENAME}}? Jika anda memilih <b>Lumpuhkan</b>, maka dari sekarang, apabila anda melawat {{SITENAME}}, anda tidak akan dilencongkan ke paparan bergerak {{SITENAME}} ini.',
	2592	+ 'mobile-frontend-explain-disable' => 'Adakah anda pasti anda hendak melumpuhkan versi bergerak {{SITENAME}}? Jika anda memilih <b>Lumpuhkan</b>, maka dari sekarang, apabila anda melawat {{SITENAME}}, anda tidak akan dilencongkan ke paparan mudah alih {{SITENAME}} ini.',
2556	2593	'mobile-frontend-nav-end' => 'Tamat',
2557	2594	'mobile-frontend-nav-top' => 'Puncak',
2558	2595	'mobile-frontend-nav-edit' => 'Sunting',
2559	2596	'mobile-frontend-nav-history' => 'Sejarah',
2560	2597	'mobile-frontend-search-text' => 'Cari',
2561	2598	'mobile-frontend-contact-us' => 'Jika anda mempunyai pertanyaan atau ulasan sila e-mel kami di mobile@wikipedia.org',
2562		~~- 'mobile-frontend-author-link' => 'Paparkan fail media ini dalam {{SITENAME}} biasa untuk melihat maklumat pembuat, perlesenan dan huraian tambahannya.',~~
	2599	+ 'mobile-frontend-author-link' => 'Paparkan fail media ini di dalam {{SITENAME}} biasa untuk melihat maklumat pengarang, perlesenan dan huraian tambahan.',
2563	2600	'mobile-frontend-download-full-version' => 'Muat Turun Versi Penuh',
2564	2601	'mobile-frontend-file-namespace' => 'Fail',
2565	2602	'mobile-frontend-wml-continue' => 'Teruskan ...',
—	—	@@ -2660,7 +2697,9 @@
2661	2698	'mobile-frontend-contact-us' => "A'j nog vragen of opmarkingen hebben, stuur ons gerust n berichjen op t adres mobile@wikipedia.org",
2662	2699	);
2663	2700
2664		~~-/** Nepali (नेपाली) */~~
	2701	+/** Nepali (नेपाली)
	2702	+ * @author RajeshPandey
	2703	+ */
2665	2704	$messages['ne'] = array(
2666	2705	'mobile-frontend-search-submit' => 'जाने \\',
2667	2706	'mobile-frontend-search-results' => 'खोज नतिजाहरु',
—	—	@@ -2675,7 +2714,7 @@
2676	2715	'mobile-frontend-disable-button' => 'निष्क्रिय',
2677	2716	'mobile-frontend-back-button' => 'पछाडि',
2678	2717	'mobile-frontend-regular-site' => 'यो पृष्ठलाई नियमित विकिपीडियामा हेर्ने \\',
2679		~~- 'mobile-frontend-perm-stop-redirect' => 'मोबाइल साइट स्थाइरुमा असक्षम पार्ने \\',~~
	2718	+ 'mobile-frontend-perm-stop-redirect' => 'मोबाइल साइट स्थाइरुमा असक्षम पार्ने',
2680	2719	'mobile-frontend-error-page-title' => 'हामीलाई समस्या आइरेको छ।',
2681	2720	'mobile-frontend-error-page-text' => 'विकिपीडिया मोबाइल अझै विकासको क्रममा नै रहेको छ र सबै आन्तरिक त्रुटिहरु सच्याउनामा हामी लागि परेका छौँ । यस त्रुटिका बारेमा हामीलाई जानकारी गराइएको छ र निकट भविष्यमा नै सच्याइने छ । कृपया पुन जाँच गर्नुहोला ।',
2682	2721	'mobile-frontend-are-you-sure' => 'पक्का हो?',
—	—	@@ -2824,7 +2863,9 @@
2825	2864	'mobile-frontend-file-namespace' => 'Fichièr',
2826	2865	);
2827	2866
2828		~~-/** Oriya (ଓଡ଼ିଆ) */~~
	2867	+/** Oriya (ଓଡ଼ିଆ)
	2868	+ * @author Psubhashish
	2869	+ */
2829	2870	$messages['or'] = array(
2830	2871	'mobile-frontend-search-results' => 'ଖୋଜିବାରୁ ମିଳିଲା',
2831	2872	'mobile-frontend-show-button' => 'ଦେଖାଇବେ',
—	—	@@ -2834,6 +2875,7 @@
2835	2876	'mobile-frontend-nav-history' => 'ଇତିହାସ',
2836	2877	'mobile-frontend-search-text' => 'ଖୋଜିବା',
2837	2878	'mobile-frontend-file-namespace' => 'ଫାଇଲ',
	2879	+ 'mobile-frontend-view' => 'ମୋବାଇଲ ଦେଖଣା',
2838	2880	);
2839	2881
2840	2882	/** Ossetic (Ирон) */
—	—	@@ -2952,22 +2994,24 @@
2953	2995	'mobile-frontend-hide-button' => 'Ukryj',
2954	2996	'mobile-frontend-disable-button' => 'Wyłącz',
2955	2997	'mobile-frontend-back-button' => 'Powrót',
2956		~~- 'mobile-frontend-regular-site' => 'Zobacz tę stronę w standardowej Wikipedii',~~
	2998	+ 'mobile-frontend-regular-site' => 'Zobacz tę stronę w {{GRAMMAR:MS.lp\|{{SITENAME}}}}',
2957	2999	'mobile-frontend-perm-stop-redirect' => 'Trwale wyłącz mobilną wersję strony',
2958	3000	'mobile-frontend-error-page-title' => 'Wystąpił problem!',
2959		- 'mobile-frontend-error-page-text' => 'Mobilna wersja Wikipedii jest w ciągłym rozwoju i intensywnie pracujemy nad naprawą wszystkich błędów. Zostaliśmy poinformowani o tym błędzie i niedługo go naprawimy. Wróć później aby sprawdzić czy już działa!',
	3001	+ 'mobile-frontend-error-page-text' => 'Mobilna wersja {{GRAMMAR:D.lp\|{{SITENAME}}}} jest wciąż rozwijana, ale równie intensywnie pracujemy nad naprawą wszystkich błędów. Zostaliśmy poinformowani o tym błędzie i niedługo go naprawimy. Wróć później, aby sprawdzić!',
2960	3002	'mobile-frontend-are-you-sure' => 'Czy jesteś pewien?',
2961		- 'mobile-frontend-explain-disable' => 'Czy na pewno chcesz wyłączyć mobilną wersję Wikipedii? Jeśli wybierzesz opcję <b>Wyłącz</b>, to następnym razem odwiedzając Wikipedię, nie zostaniesz przekierowany do obecnie włączonej wersji mobilnej Wikipedii.',
	3003	+ 'mobile-frontend-explain-disable' => 'Czy na pewno chcesz wyłączyć mobilną wersję {{GRAMMAR:D.lp\|{{SITENAME}}}}? Jeśli wybierzesz opcję <b>Wyłącz</b>, to gdy następnym razem odwiedzisz {{GRAMMAR:B.lp\|{{SITENAME}}}}, nie zostaniesz przekierowany do obecnie włączonej wersji mobilnej {{GRAMMAR:D.lp\|{{SITENAME}}}}.',
2962	3004	'mobile-frontend-nav-end' => 'Zakończ',
2963	3005	'mobile-frontend-nav-top' => 'Do góry',
2964	3006	'mobile-frontend-nav-edit' => 'Edytuj',
2965	3007	'mobile-frontend-nav-history' => 'Historia',
2966	3008	'mobile-frontend-search-text' => 'Szukaj',
2967	3009	'mobile-frontend-contact-us' => 'Jeśli masz jakieś pytania lub uwagi, prosimy o kontakt na adres mobile@wikipedia.org',
2968		~~- 'mobile-frontend-author-link' => 'Sprawdź plik w samej Wikipedii, aby uzyskać informacje o autorach, licencji i dodatkowy opis.',~~
	3010	+ 'mobile-frontend-author-link' => 'Sprawdź plik w samej {{GRAMMAR:MS.lp\|{{SITENAME}}}}, aby uzyskać informację o autorach, licencji i dodatkowy opis.',
2969	3011	'mobile-frontend-download-full-version' => 'Pobierz pełną wersję',
2970	3012	'mobile-frontend-file-namespace' => 'Plik',
2971		~~- 'mobile-frontend-view' => 'Przeglądaj w komórce',~~
	3013	+ 'mobile-frontend-wml-continue' => 'Dalej ...',
	3014	+ 'mobile-frontend-wml-back' => 'Wstecz ...',
	3015	+ 'mobile-frontend-view' => 'Przeglądaj komórką',
2972	3016	);
2973	3017
2974	3018	/** Piedmontese (Piemontèis) */
—	—	@@ -3049,19 +3093,19 @@
3050	3094	'mobile-frontend-hide-button' => 'Esconder',
3051	3095	'mobile-frontend-disable-button' => 'Desactivar',
3052	3096	'mobile-frontend-back-button' => 'Voltar',
3053		~~- 'mobile-frontend-regular-site' => 'Ver esta página na Wikipédia normal',~~
	3097	+ 'mobile-frontend-regular-site' => 'Ver esta página na {{SITENAME}} normal',
3054	3098	'mobile-frontend-perm-stop-redirect' => 'Desactivar permanentemente o site móvel',
3055	3099	'mobile-frontend-error-page-title' => 'Temos um problema!',
3056		- 'mobile-frontend-error-page-text' => 'A Wikipédia móvel ainda está em desenvolvimento e estamos corrigindo os erros internos. Fomos notificados deste erro e ele será corrigido brevemente. Verifique dentro de algum tempo se a correcção já está disponivel, por favor!',
	3100	+ 'mobile-frontend-error-page-text' => 'A {{SITENAME}} móvel ainda está em desenvolvimento e estamos corrigindo os erros internos. Fomos notificados deste erro e ele será corrigido brevemente. Verifique dentro de algum tempo se a correcção já está disponivel, por favor!',
3057	3101	'mobile-frontend-are-you-sure' => 'Tem a certeza ?',
3058		- 'mobile-frontend-explain-disable' => 'Tem a certeza de que pretende desactivar a versão para telemóvel da Wikipédia? Se escolher <b>Desactivar</b>, a partir de agora ao visitar a Wikipédia deixará de ser reencaminhado para esta versão móvel.',
	3102	+ 'mobile-frontend-explain-disable' => 'Tem a certeza de que pretende desactivar a versão para telemóvel da {{SITENAME}}? Se escolher <b>Desactivar</b>, a partir de agora ao visitar a {{SITENAME}} deixará de ser reencaminhado para esta versão móvel.',
3059	3103	'mobile-frontend-nav-end' => 'Fim',
3060	3104	'mobile-frontend-nav-top' => 'Topo',
3061	3105	'mobile-frontend-nav-edit' => 'Editar',
3062	3106	'mobile-frontend-nav-history' => 'Navegação',
3063	3107	'mobile-frontend-search-text' => 'Pesquisar',
3064	3108	'mobile-frontend-contact-us' => 'Para perguntas ou comentários, pode contactar-nos por correio electrónico em mobile@wikipedia.org',
3065		~~- 'mobile-frontend-author-link' => 'Visione este ficheiro na Wikipédia normal para ver informação sobre a autoria, licenciamento e descrições adicionais.',~~
	3109	+ 'mobile-frontend-author-link' => 'Visione este ficheiro na {{SITENAME}} normal para ver informação sobre a autoria, licenciamento e descrições adicionais.',
3066	3110	'mobile-frontend-download-full-version' => 'Download da versão completa',
3067	3111	'mobile-frontend-file-namespace' => 'Ficheiro',
3068	3112	'mobile-frontend-wml-continue' => 'Continuar ...',
—	—	@@ -3152,9 +3196,9 @@
3153	3197	'mobile-frontend-regular-site' => 'Vezi această pagină pe {{SITENAME}}',
3154	3198	'mobile-frontend-perm-stop-redirect' => 'Dezactivează permanent situl pentru mobil',
3155	3199	'mobile-frontend-error-page-title' => 'Avem o problemă!',
3156		- 'mobile-frontend-error-page-text' => '{{SITENAME}} mobilă este încă în curs de dezvoltare și lucrăm din greu pentru a repara orice eroare internă. Am fost anunțați despre această eroare și va fi în curând îndreptată. Vă rugăm să verificați din nou!',
	3200	+ 'mobile-frontend-error-page-text' => '{{SITENAME}} în versiunea mobilă este încă în curs de dezvoltare și lucrăm din greu pentru a repara orice eroare internă. Am fost anunțați despre această eroare și va fi în curând remediată. Vă rugăm să verificați din nou!',
3157	3201	'mobile-frontend-are-you-sure' => 'Sunteți sigur?',
3158		- 'mobile-frontend-explain-disable' => 'Sunteți sigur că doriți să dezactivați versiunea mobilă a Wikipediei? Dacă alegeți <b>Dezactivează</b>, de acum, atunci când veți vizita {{SITENAME}}, nu veți mai fi redirecționat către acest sit dedicat dispozitivelor mobile.',
	3202	+ 'mobile-frontend-explain-disable' => 'Sunteți sigur că doriți să dezactivați versiunea mobilă a proiectului {{SITENAME}}? Dacă alegeți <b>Dezactivează</b>, de acum, atunci când veți vizita {{SITENAME}}, nu veți mai fi redirecționat către acest sit dedicat dispozitivelor mobile.',
3159	3203	'mobile-frontend-nav-end' => 'Jos',
3160	3204	'mobile-frontend-nav-top' => 'Sus',
3161	3205	'mobile-frontend-nav-edit' => 'Modificare',
—	—	@@ -3164,6 +3208,9 @@
3165	3209	'mobile-frontend-author-link' => 'Vizualizați acest fișier media pe {{SITENAME}} pentru acces la informații despre autor, licențiere și descrieri suplimentare.',
3166	3210	'mobile-frontend-download-full-version' => 'Descarcă versiunea completă',
3167	3211	'mobile-frontend-file-namespace' => 'Fișier',
	3212	+ 'mobile-frontend-wml-continue' => 'Continuare...',
	3213	+ 'mobile-frontend-wml-back' => 'Înapoi...',
	3214	+ 'mobile-frontend-view' => 'Versiune mobilă',
3168	3215	);
3169	3216
3170	3217	/** Russian (Русский)
—	—	@@ -3405,19 +3452,19 @@
3406	3453	'mobile-frontend-hide-button' => 'skrij',
3407	3454	'mobile-frontend-disable-button' => 'Onemogoči',
3408	3455	'mobile-frontend-back-button' => 'Nazaj',
3409		~~- 'mobile-frontend-regular-site' => 'Oglejte si to stran v navadnem načinu',~~
	3456	+ 'mobile-frontend-regular-site' => 'Oglejte si to stran na redni strani {{GRAMMAR:rodilnik\|{{SITENAME}}}}',
3410	3457	'mobile-frontend-perm-stop-redirect' => 'Trajno onemogoči mobilno spletno stran',
3411	3458	'mobile-frontend-error-page-title' => 'Imamo problem!',
3412		- 'mobile-frontend-error-page-text' => 'Mobilna Wikipedija je še vedno v aktivnem razvoju in trudimo pri odpravljanju vseh naših notranjih napak. O tej napaki smo bili obveščeni in jo bomo kmalu odpravili. Prosimo, obiščite nas kmalu!',
	3459	+ 'mobile-frontend-error-page-text' => 'Mobilna stran {{SITENAME}} je še vedno v aktivnem razvoju in trudimo se pri odpravljanju vseh naših notranjih napak. O tej napaki smo bili obveščeni in jo bomo kmalu odpravili. Prosimo, obiščite nas kmalu!',
3413	3460	'mobile-frontend-are-you-sure' => 'Ali ste prepričani?',
3414		- 'mobile-frontend-explain-disable' => 'Ste prepričani, da želite onemogočiti mobilno različico Wikipedije? Če izberete <b>Onemogoči</b>, od zdaj naprej, ko boste obiskali Wikipedijo, ne boste preusmerjeni na ta mobilni pogled Wikipedije.',
	3461	+ 'mobile-frontend-explain-disable' => 'Ste prepričani, da želite onemogočiti mobilno različico {{GRAMMAR:rodilnik\|{{SITENAME}}}}? Če izberete <b>Onemogoči</b>, od zdaj naprej, ko boste obiskali stran {{SITENAME}}, ne boste preusmerjeni na ta mobilni pogled {{GRAMMAR:rodilnik\|{{SITENAME}}}}.',
3415	3462	'mobile-frontend-nav-end' => 'Dno',
3416	3463	'mobile-frontend-nav-top' => 'Vrh',
3417	3464	'mobile-frontend-nav-edit' => 'Uredi',
3418	3465	'mobile-frontend-nav-history' => 'Zgodovina',
3419	3466	'mobile-frontend-search-text' => 'Iskanje',
3420	3467	'mobile-frontend-contact-us' => 'Če imate kakršna koli vprašanja ali pripombe, nam prosimo pišite na mobile@wikipedia.org',
3421		~~- 'mobile-frontend-author-link' => 'Oglejte si to predstavnostno datoteko na redni Wikipediji za vpogled v informacije o avtorstvu, licenciranju in dodatnih opisih.',~~
	3468	+ 'mobile-frontend-author-link' => 'Oglejte si to predstavnostno datoteko na redni strani {{SITENAME}} za vpogled v informacije o avtorstvu, licenciranju in dodatnih opisih.',
3422	3469	'mobile-frontend-download-full-version' => 'Prenos polne različice',
3423	3470	'mobile-frontend-file-namespace' => 'Datoteka',
3424	3471	'mobile-frontend-wml-continue' => 'Nadaljuj ...',
—	—	@@ -3546,8 +3593,11 @@
3547	3594	'mobile-frontend-contact-us' => 'Lamun aya nu rék ditanyakeun atawa rék mairan, mangga kirim surélék ka mobile@wikipedia.org',
3548	3595	);
3549	3596
3550		~~-/** Swedish (Svenska) */~~
	3597	+/** Swedish (Svenska)
	3598	+ * @author WikiPhoenix
	3599	+ */
3551	3600	$messages['sv'] = array(
	3601	+ 'mobile-frontend-desc' => 'Mobilt gränssnitt',
3552	3602	'mobile-frontend-search-submit' => 'Gå till',
3553	3603	'mobile-frontend-search-results' => 'Sökresultat',
3554	3604	'mobile-frontend-no-article-found' => 'Ingen artikel funnen',
—	—	@@ -3563,7 +3613,7 @@
3564	3614	'mobile-frontend-regular-site' => 'Visa denna sida på vanliga {{SITENAME}}',
3565	3615	'mobile-frontend-perm-stop-redirect' => 'Deaktivera mobilsidan permanent',
3566	3616	'mobile-frontend-error-page-title' => 'Vi har ett problem!',
3567		- 'mobile-frontend-error-page-text' => '{{SITENAME}} mobil är fortfarande under aktiv utveckling och vi jobbar hårt for att fixa alla interna fel. Vi har blivit meddelade om detta fel och kommer att fixa det snart. Kom gärna tillbaka lite senare!',
	3617	+ 'mobile-frontend-error-page-text' => 'Mobilversionen av {{SITENAME}} är fortfarande under aktiv utveckling och vi jobbar hårt for att fixa alla interna fel. Vi har blivit meddelade om detta fel och kommer att fixa det snart. Kom gärna tillbaka lite senare!',
3568	3618	'mobile-frontend-are-you-sure' => 'Är du säker?',
3569	3619	'mobile-frontend-explain-disable' => 'Är du säker på att du vill inaktivera den mobila versionen av {{SITENAME}}? Om du väljer <b>Inaktivera</b>, kommer du från och med nu, varje gång du besöker {{SITENAME}}, inte bli omdirigerad till denna mobila version av {{SITENAME}}.',
3570	3620	'mobile-frontend-nav-end' => 'Slutet',
—	—	@@ -3572,9 +3622,12 @@
3573	3623	'mobile-frontend-nav-history' => 'Historik',
3574	3624	'mobile-frontend-search-text' => 'Sök',
3575	3625	'mobile-frontend-contact-us' => 'Om du har några frågor eller kommentarer får du gärna skicka ett e-post till mobile@wikipedia.org',
3576		~~- 'mobile-frontend-author-link' => 'Visa den här mediefilen på {{SITENAME}} för att se information om dess upphovsman, licensiering och ytterligare beskrivningar.',~~
	3626	+ 'mobile-frontend-author-link' => 'Visa den här mediafilen på vanliga {{SITENAME}} för att se information om dess upphovsman, licensiering och ytterligare beskrivningar.',
3577	3627	'mobile-frontend-download-full-version' => 'Ladda ner Full Version',
3578	3628	'mobile-frontend-file-namespace' => 'Fil',
	3629	+ 'mobile-frontend-wml-continue' => 'Fortsätt ...',
	3630	+ 'mobile-frontend-wml-back' => 'Tillbaka ...',
	3631	+ 'mobile-frontend-view' => 'Mobil vy',
3579	3632	);
3580	3633
3581	3634	/** Swahili (Kiswahili) */
—	—	@@ -3798,7 +3851,9 @@
3799	3852	'mobile-frontend-file-namespace' => 'Fail',
3800	3853	);
3801	3854
3802		~~-/** Turkish (Türkçe) */~~
	3855	+/** Turkish (Türkçe)
	3856	+ * @author Emperyan
	3857	+ */
3803	3858	$messages['tr'] = array(
3804	3859	'mobile-frontend-search-submit' => 'Git',
3805	3860	'mobile-frontend-search-results' => 'Arama Sonuçları',
—	—	@@ -3827,6 +3882,7 @@
3828	3883	'mobile-frontend-author-link' => "Bu medya dosyasını Vikipedi'de yazarlık, lisans ve ek açıklamaları hakkında bilgi için görüntüleyin.",
3829	3884	'mobile-frontend-download-full-version' => 'Tam Sürümü İndir',
3830	3885	'mobile-frontend-file-namespace' => 'Dosya',
	3886	+ 'mobile-frontend-view' => 'Mobil Görünüm',
3831	3887	);
3832	3888
3833	3889	/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic)) */
—	—	@@ -4161,6 +4217,7 @@
4162	4218	);
4163	4219
4164	4220	/** Simplified Chinese (‪中文(简体)‬)
	4221	+ * @author PhiLiP
4165	4222	* @author Shizhao
4166	4223	*/
4167	4224	$messages['zh-hans'] = array(
—	—	@@ -4191,6 +4248,8 @@
4192	4249	'mobile-frontend-author-link' => '在维基百科主站上查看这一媒体文件的作者、许可协议和其他附加信息。',
4193	4250	'mobile-frontend-download-full-version' => '下载完整版本',
4194	4251	'mobile-frontend-file-namespace' => '文件',
	4252	+ 'mobile-frontend-wml-continue' => '继续……',
	4253	+ 'mobile-frontend-wml-back' => '后退……',
4195	4254	'mobile-frontend-view' => '移动浏览',
4196	4255	);
4197	4256
Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
—	—	@@ -49,7 +49,7 @@
50	50	$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend, 'addMobileFooter' );
51	51
52	52	class ExtMobileFrontend {
53		~~- const VERSION = '0.5.10';~~
	53	+ const VERSION = '0.5.13';
54	54
55	55	/**
56	56	* @var DOMDocument
—	—	@@ -131,18 +131,28 @@
132	132	$copyright = $skin->getCopyright();
133	133	// Need to stash the results of the "wfMsg" call before the Output Buffering handler
134	134	// because at this point the database connection is shut down, etc.
135		~~- self::$messages['mobile-frontend-show'] = wfMsg( 'mobile-frontend-show-button' );~~
136		~~- self::$messages['mobile-frontend-hide'] = wfMsg( 'mobile-frontend-hide-button' );~~
137		~~- self::$messages['mobile-frontend-back-to-top'] = wfMsg( 'mobile-frontend-back-to-top-of-section' );~~
138		~~- self::$messages['mobile-frontend-regular-site'] = wfMsg( 'mobile-frontend-regular-site' );~~
139		~~- self::$messages['mobile-frontend-perm-stop-redirect'] = wfMsg( 'mobile-frontend-perm-stop-redirect' );~~
140		~~- self::$messages['mobile-frontend-copyright'] = $copyright;~~
141		~~- self::$messages['mobile-frontend-home-button'] = wfMsg( 'mobile-frontend-home-button' );~~
142		~~- self::$messages['mobile-frontend-random-button'] = wfMsg( 'mobile-frontend-random-button' );~~
143		~~- self::$messages['mobile-frontend-are-you-sure'] = wfMsg( 'mobile-frontend-are-you-sure' );~~
144		~~- self::$messages['mobile-frontend-explain-disable'] = wfMsg( 'mobile-frontend-explain-disable' );~~
145		~~- self::$messages['mobile-frontend-disable-button'] = wfMsg( 'mobile-frontend-disable-button' );~~
146		~~- self::$messages['mobile-frontend-back-button'] = wfMsg( 'mobile-frontend-back-button' );~~
	135	+ self::$messages['mobile-frontend-show'] = wfMsg( 'mobile-frontend-show-button' );
	136	+ self::$messages['mobile-frontend-hide'] = wfMsg( 'mobile-frontend-hide-button' );
	137	+ self::$messages['mobile-frontend-back-to-top'] = wfMsg( 'mobile-frontend-back-to-top-of-section' );
	138	+ self::$messages['mobile-frontend-regular-site'] = wfMsg( 'mobile-frontend-regular-site' );
	139	+ self::$messages['mobile-frontend-perm-stop-redirect'] = wfMsg( 'mobile-frontend-perm-stop-redirect' );
	140	+ self::$messages['mobile-frontend-copyright'] = $copyright;
	141	+ self::$messages['mobile-frontend-home-button'] = wfMsg( 'mobile-frontend-home-button' );
	142	+ self::$messages['mobile-frontend-random-button'] = wfMsg( 'mobile-frontend-random-button' );
	143	+ self::$messages['mobile-frontend-are-you-sure'] = wfMsg( 'mobile-frontend-are-you-sure' );
	144	+ self::$messages['mobile-frontend-explain-disable'] = wfMsg( 'mobile-frontend-explain-disable' );
	145	+ self::$messages['mobile-frontend-disable-button'] = wfMsg( 'mobile-frontend-disable-button' );
	146	+ self::$messages['mobile-frontend-back-button'] = wfMsg( 'mobile-frontend-back-button' );
	147	+ self::$messages['mobile-frontend-opt-in-message'] = wfMsg( 'mobile-frontend-opt-in-message' );
	148	+ self::$messages['mobile-frontend-opt-in-yes-button'] = wfMsg( 'mobile-frontend-opt-in-yes-button' );
	149	+ self::$messages['mobile-frontend-opt-in-no-button'] = wfMsg( 'mobile-frontend-opt-in-no-button' );
	150	+ self::$messages['mobile-frontend-opt-in-title'] = wfMsg( 'mobile-frontend-opt-in-title' );
	151	+ self::$messages['mobile-frontend-opt-out-message'] = wfMsg( 'mobile-frontend-opt-out-message' );
	152	+ self::$messages['mobile-frontend-opt-out-yes-button'] = wfMsg( 'mobile-frontend-opt-out-yes-button' );
	153	+ self::$messages['mobile-frontend-opt-out-no-button'] = wfMsg( 'mobile-frontend-opt-out-no-button' );
	154	+ self::$messages['mobile-frontend-opt-out-title'] = wfMsg( 'mobile-frontend-opt-out-title' );
	155	+ self::$messages['mobile-frontend-opt-in-explain'] = wfMsg( 'mobile-frontend-opt-in-explain' );
	156	+ self::$messages['mobile-frontend-opt-out-explain'] = wfMsg( 'mobile-frontend-opt-out-explain' );
147	157
148	158	self::$dir = $wgContLang->getDir();
149	159	self::$code = $wgContLang->getCode();
—	—	@@ -251,6 +261,28 @@
252	262	exit();
253	263	}
254	264	}
	265	+
	266	+ if ( $mAction == 'opt_in_mobile_site' ) {
	267	+ if ( $this->contentFormat == 'XHTML' ) {
	268	+ echo $this->renderOptInMobileSiteXHTML();
	269	+ exit();
	270	+ }
	271	+ }
	272	+
	273	+ if ( $mAction == 'opt_out_mobile_site' ) {
	274	+ if ( $this->contentFormat == 'XHTML' ) {
	275	+ echo $this->renderOptOutMobileSiteXHTML();
	276	+ exit();
	277	+ }
	278	+ }
	279	+
	280	+ if ( $mAction == 'opt_in_cookie' ) {
	281	+ $wgRequest->response()->setcookie( 'optin', '1' );
	282	+ }
	283	+
	284	+ if ( $mAction == 'opt_out_cookie' ) {
	285	+ $wgRequest->response()->setcookie( 'optin', '' );
	286	+ }
255	287
256	288	// Note: Temporarily disabling this section for trial deployment
257	289	// if ( is_array($props) &&
—	—	@@ -287,9 +319,12 @@
288	320	// html_preferred_dtd
289	321
290	322	// Determine
	323	+
	324	+ $xDevice = $_SERVER['HTTP_X_DEVICE'];
291	325
292	326	if (self::$useFormat === 'mobile' \|\|
293		~~- self::$useFormat === 'mobile-wap' ) {~~
	327	+ self::$useFormat === 'mobile-wap' \|\|
	328	+ isset( $xDevice) ) {
294	329	$this->getMsg();
295	330	$this->disableCaching();
296	331	ob_start( array( $this, 'DOMParse' ) );
—	—	@@ -306,9 +341,62 @@
307	342	header( 'Pragma: no-cache' );
308	343	}
309	344	}
	345	+
	346	+ private function renderOptInMobileSiteXHTML() {
	347	+ if ( $this->contentFormat == 'XHTML' ) {
	348	+ $this->getMsg();
	349	+ $dir = self::$dir;
	350	+ $code = self::$code;
	351	+ $regularSite = self::$messages['mobile-frontend-regular-site'];
	352	+ $permStopRedirect = self::$messages['mobile-frontend-perm-stop-redirect'];
	353	+ $copyright = self::$messages['mobile-frontend-copyright'];
	354	+ $homeButton = self::$messages['mobile-frontend-home-button'];
	355	+ $randomButton = self::$messages['mobile-frontend-random-button'];
	356	+ $yesButton = self::$messages['mobile-frontend-opt-in-yes-button'];
	357	+ $noButton = self::$messages['mobile-frontend-opt-in-no-button'];
	358	+ $htmlTitle = self::$messages['mobile-frontend-opt-in-title'];
	359	+ $explainOptIn = self::$messages['mobile-frontend-opt-in-explain'];
	360	+ $optInMessage = self::$messages['mobile-frontend-opt-in-message'];
	361	+ $cssFileName = ( isset( self::$device['css_file_name'] ) ) ? self::$device['css_file_name'] : 'default';
	362	+ require( 'views/layout/_search_webkit.html.php' );
	363	+ require( 'views/layout/_footmenu_default.html.php' );
	364	+ require( 'views/information/optin.html.php' );
	365	+ $contentHtml = $optInHtml;
	366	+ require( 'views/layout/application.html.php' );
	367	+ return $applicationHtml;
	368	+ }
	369	+ return '';
	370	+ }
	371	+
	372	+ private function renderOptOutMobileSiteXHTML() {
	373	+ if ( $this->contentFormat == 'XHTML' ) {
	374	+ $this->getMsg();
	375	+ $dir = self::$dir;
	376	+ $code = self::$code;
	377	+ $regularSite = self::$messages['mobile-frontend-regular-site'];
	378	+ $permStopRedirect = self::$messages['mobile-frontend-perm-stop-redirect'];
	379	+ $copyright = self::$messages['mobile-frontend-copyright'];
	380	+ $homeButton = self::$messages['mobile-frontend-home-button'];
	381	+ $randomButton = self::$messages['mobile-frontend-random-button'];
	382	+ $yesButton = self::$messages['mobile-frontend-opt-out-yes-button'];
	383	+ $noButton = self::$messages['mobile-frontend-opt-out-no-button'];
	384	+ $htmlTitle = self::$messages['mobile-frontend-opt-out-title'];
	385	+ $explainOptOut = self::$messages['mobile-frontend-opt-out-explain'];
	386	+ $optOutMessage = self::$messages['mobile-frontend-opt-out-message'];
	387	+ $cssFileName = ( isset( self::$device['css_file_name'] ) ) ? self::$device['css_file_name'] : 'default';
	388	+ require( 'views/layout/_search_webkit.html.php' );
	389	+ require( 'views/layout/_footmenu_default.html.php' );
	390	+ require( 'views/information/optout.html.php' );
	391	+ $contentHtml = $optOutHtml;
	392	+ require( 'views/layout/application.html.php' );
	393	+ return $applicationHtml;
	394	+ }
	395	+ return '';
	396	+ }
310	397
311	398	private function renderDisableMobileSiteXHTML() {
312	399	if ( $this->contentFormat == 'XHTML' ) {
	400	+ $this->getMsg();
313	401	$dir = self::$dir;
314	402	$code = self::$code;
315	403	$regularSite = self::$messages['mobile-frontend-regular-site'];
—	—	@@ -323,7 +411,6 @@
324	412	$htmlTitle = $areYouSure;
325	413	$title = $areYouSure;
326	414	$cssFileName = ( isset( self::$device['css_file_name'] ) ) ? self::$device['css_file_name'] : 'default';
327		~~- require( 'views/notices/_donate.html.php' );~~
328	415	require( 'views/layout/_search_webkit.html.php' );
329	416	require( 'views/layout/_footmenu_default.html.php' );
330	417	require( 'views/information/disable.html.php' );
Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optin.html.php
—	—	@@ -0,0 +1,18 @@
	2	+<?php
	3	+$optInHtml = <<<EOT
	4	+ <h1>
	5	+ {$optInMessage}
	6	+ </h1>
	7	+ <p>
	8	+ {$explainOptIn}
	9	+ </p>
	10	+ <div id='disableButtons'>
	11	+ <form action='/' method='get'>
	12	+ <input name='mAction' type='hidden' value='opt_in_cookie' />
	13	+ <button id='disableButton' type='submit'>{$yesButton}</button>
	14	+ </form>
	15	+ <form action='/' method='get'>
	16	+ <button id='backButton' type='submit'>{$noButton}</button>
	17	+ </form>
	18	+ </div>
	19	+EOT;
Property changes on: branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optin.html.php
___________________________________________________________________
Added: svn:eol-style
1	20	+ native
Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optout.html.php
—	—	@@ -0,0 +1,18 @@
	2	+<?php
	3	+$optOutHtml = <<<EOT
	4	+ <h1>
	5	+ {$optOutMessage}
	6	+ </h1>
	7	+ <p>
	8	+ {$explainOptOut}
	9	+ </p>
	10	+ <div id='disableButtons'>
	11	+ <form action='/' method='get'>
	12	+ <input name='mAction' type='hidden' value='opt_out_cookie' />
	13	+ <button id='disableButton' type='submit'>{$yesButton}</button>
	14	+ </form>
	15	+ <form action='/' method='get'>
	16	+ <button id='backButton' type='submit'>{$noButton}</button>
	17	+ </form>
	18	+ </div>
	19	+EOT;
Property changes on: branches/wmf/1.17wmf1/extensions/MobileFrontend/views/information/optout.html.php
___________________________________________________________________
Added: svn:eol-style
1	20	+ native

Status & tagging log

22:41, 15 August 2011 Reedy (talk | contribs) changed the status of r94184 [removed: new added: ok]