r77442 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77441‎ | r77442 | r77443 >
Date:22:31, 29 November 2010
Author:tomasz
Status:ok
Tags:
Comment:
Merging in r77267 - 77399
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking.i18n.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking_body.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking_body.php
@@ -122,9 +122,11 @@
123123 $output .= '<input type="hidden" name="' . htmlspecialchars($key) . '" value="' . htmlspecialchars($value) . '" />';
124124 }
125125
 126+ $output .= $this->msgWiki( 'contrib-tracking-redirect' );
 127+
126128 // Offer a button to post the form if the user has no Javascript support
127 - $output .= $this->msgWiki( 'contrib-tracking-continue' );
128 - $output .= '<input type="submit" value="' . $this->msg( 'contrib-tracking-button' ) . '" />';
 129+ //$output .= $this->msgWiki( 'contrib-tracking-continue' );
 130+ //$output .= '<input type="submit" value="' . $this->msg( 'contrib-tracking-button' ) . '" />';
129131
130132 $output .= '</form>';
131133
Index: branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking.i18n.php
@@ -20,6 +20,7 @@
2121
2222 'contrib-tracking-submitting' => 'Submitting to payment processor...',
2323 'contrib-tracking-continue' => 'If you are not automatically redirected, click the button to complete your donation at PayPal.',
 24+ 'contrib-tracking-redirect' => 'You will be automatically redirected to complete your donation at PayPal.',
2425
2526 'contrib-tracking-button' => 'Continue',
2627
@@ -97,6 +98,7 @@
9899 * @author EugeneZelenko
99100 * @author Jim-by
100101 * @author Red Winged Duck
 102+ * @author Wizardist
101103 */
102104 $messages['be-tarask'] = array(
103105 'contributiontracking-desc' => 'Сачэньне за зборам ахвяраваньняў на карысьць фундацыі «Вікімэдыя»',
@@ -105,6 +107,7 @@
106108 'contrib-tracking-error-text' => 'Няслушная перадача зьвестак з формы',
107109 'contrib-tracking-submitting' => 'Адпраўка апрацоўшчыку плацяжоў...',
108110 'contrib-tracking-continue' => 'Калі Вы не былі аўтаматычна перанакіраваны, націсьніце кнопку, каб завяршыць Ваша ахвяраваньне праз сыстэму PayPal.',
 111+ 'contrib-tracking-redirect' => 'Вы будзеце аўтаматычна перанакіраваныя ў PayPal для сканчэньня працэдуры.',
109112 'contrib-tracking-button' => 'Працягваць',
110113 );
111114
@@ -141,6 +144,7 @@
142145 'contrib-tracking-error-text' => 'Furmskrid kaset direizh',
143146 'contrib-tracking-submitting' => "O kas d'ar reizhiad tretiñ ar paeamantoù...",
144147 'contrib-tracking-continue' => 'Ma ne vezit ket adkaset ent emgefre, klikit war ar bouton-mañ evit kas da benn ho paeamant gant Paypal.',
 148+ 'contrib-tracking-redirect' => 'Adkaset e viot ent emgefre war-zu PayPal evit seveniñ an donezon.',
145149 'contrib-tracking-button' => "Kenderc'hel",
146150 );
147151
@@ -182,11 +186,13 @@
183187 'contrib-tracking-error-text' => 'Odeslaný formulář nebyl správně vyplněn',
184188 'contrib-tracking-submitting' => 'Platba se odesílá ke zpracování…',
185189 'contrib-tracking-continue' => 'Pokud nebudete automaticky přesměrován(a), klikněte na tlačítko, abyste mohl(a) dokončit svůj příspěvek pomocí služby PayPal.',
 190+ 'contrib-tracking-redirect' => 'Pro dokončení příspěvku budete automaticky přesměrování na PayPal.',
186191 'contrib-tracking-button' => 'Pokračovat',
187192 );
188193
189194 /** German (Deutsch)
190195 * @author Imre
 196+ * @author The Evil IP address
191197 */
192198 $messages['de'] = array(
193199 'contributiontracking-desc' => 'Spendenverfolgung für die Wikimedia Spendenkampagne',
@@ -195,6 +201,7 @@
196202 'contrib-tracking-error-text' => 'Ungültiges Übertragungsformular',
197203 'contrib-tracking-submitting' => 'Übertragung an den Zahlungsprovider …',
198204 'contrib-tracking-continue' => 'Wenn du nicht automatisch weitergeleitet wirst, klicke bitte auf „Weiter“, um deine Spende über PayPal abzuschließen.',
 205+ 'contrib-tracking-redirect' => 'Du wirst automatisch zu PayPal weitergeleitet, um deine Spende zu vervollständigen.',
199206 'contrib-tracking-button' => 'Weiter',
200207 );
201208
@@ -328,6 +335,7 @@
329336
330337 /** French (Français)
331338 * @author Korrigan
 339+ * @author Peter17
332340 * @author PieRRoMaN
333341 * @author Verdy p
334342 */
@@ -338,6 +346,7 @@
339347 'contrib-tracking-error-text' => 'Soumission du formulaire invalide',
340348 'contrib-tracking-submitting' => 'Envoi au système de traitement des paiements...',
341349 'contrib-tracking-continue' => 'Si vous n’êtes pas redirigé automatiquement, cliquez ce bouton pour compléter votre don avec Paypal.',
 350+ 'contrib-tracking-redirect' => 'Vous allez être redirigé automatiquement vers PayPal pour terminer votre don.',
342351 'contrib-tracking-button' => 'Continuer',
343352 );
344353
@@ -364,6 +373,7 @@
365374 'contrib-tracking-error-text' => 'Formulario de proposta inválido',
366375 'contrib-tracking-submitting' => 'Enviando ao procesador de pagamentos...',
367376 'contrib-tracking-continue' => 'Se non é redirixido automaticamente, faga clic no botón para completar a súa doazón por PayPal.',
 377+ 'contrib-tracking-redirect' => 'Serás redirixido automaticamente ao PayPal para completar a túa doazón.',
368378 'contrib-tracking-button' => 'Continuar',
369379 );
370380
@@ -386,6 +396,7 @@
387397 'contrib-tracking-error-text' => 'Nit giltig Ibertragigsformular',
388398 'contrib-tracking-submitting' => 'Ibertragig an dr Zahligsprovider ...',
389399 'contrib-tracking-continue' => 'Wänn Si nit automatisch wytergleitet wäre, no drucke Si bitte uf „Wyter“ go Ihri Spände iber PayPal abzschließe.',
 400+ 'contrib-tracking-redirect' => 'Du wirsch automatisch zue PayPal wytergleitet go Dyy Spände vervollständige.',
390401 'contrib-tracking-button' => 'Wyter',
391402 );
392403
@@ -432,6 +443,7 @@
433444 'contrib-tracking-error-text' => 'Njepłaćiwe formularne přenjesenje',
434445 'contrib-tracking-submitting' => 'Přenjesenje k płaćenskemu sposrědkowarjej',
435446 'contrib-tracking-continue' => 'Jeli njeposrědkuješ so awtomatisce dale, klikń na tłóčatko, zo by swój dar přez PayPal přewjedł.',
 447+ 'contrib-tracking-redirect' => 'Sposrědkuješ so awtomatisce dale do PayPal, zo by darjenje wotzamknył.',
436448 'contrib-tracking-button' => 'Dale',
437449 );
438450
@@ -459,11 +471,13 @@
460472 'contrib-tracking-error-text' => 'Submission de formulario invalide',
461473 'contrib-tracking-submitting' => 'In submission al processator de pagamentos...',
462474 'contrib-tracking-continue' => 'Si tu non es automaticamente redirigite, clicca super le button pro completar tu donation con PayPal.',
 475+ 'contrib-tracking-redirect' => 'Tu essera redirigite automaticamente verso PayPal pro completar tu donation.',
463476 'contrib-tracking-button' => 'Continuar',
464477 );
465478
466479 /** Indonesian (Bahasa Indonesia)
467480 * @author Bennylin
 481+ * @author IvanLanin
468482 */
469483 $messages['id'] = array(
470484 'contributiontracking-desc' => 'Pelacak kontribusi untuk penggalangan dana Wikimedia',
@@ -472,6 +486,7 @@
473487 'contrib-tracking-error-text' => 'Pengiriman formulir tidak sah',
474488 'contrib-tracking-submitting' => 'Mengirimkan ke pemroses pembayaran...',
475489 'contrib-tracking-continue' => 'Jika halaman ini tidak otomatis dialihkan, klik tombol ini untuk menyelesaikan sumbangan Anda lewat PayPal.',
 490+ 'contrib-tracking-redirect' => 'Anda akan otomatis diarahkan ke PayPal untuk menyelesaikan sumbangan Anda.',
476491 'contrib-tracking-button' => 'Lanjutkan',
477492 );
478493
@@ -504,6 +519,7 @@
505520 /** Japanese (日本語)
506521 * @author Fryed-peach
507522 * @author Mizusumashi
 523+ * @author 青子守歌
508524 */
509525 $messages['ja'] = array(
510526 'contributiontracking-desc' => 'ウィキメディア資金調達者向け寄付追跡',
@@ -512,7 +528,8 @@
513529 'contrib-tracking-error-text' => '無効なフォームの提出',
514530 'contrib-tracking-submitting' => '納付処理係に提出中...',
515531 'contrib-tracking-continue' => '自動的に転送されない場合は、ボタンを押して PayPal での寄付を終えてください。',
516 - 'contrib-tracking-button' => '継続する',
 532+ 'contrib-tracking-redirect' => '寄付を完了するため、PayPalに自動的に転送されます。',
 533+ 'contrib-tracking-button' => '続行',
517534 );
518535
519536 /** Javanese (Basa Jawa)
@@ -639,6 +656,7 @@
640657 'contrib-tracking-error-text' => 'Неважечко поднесување на образецот',
641658 'contrib-tracking-submitting' => 'Поднесувам на обработувачот на плаќања...',
642659 'contrib-tracking-continue' => 'Ако се случи да не бидете пренасочени автоматски, кликнете на копчето за да ја довршите донацијата на PayPal.',
 660+ 'contrib-tracking-redirect' => 'Системот автоматски ќе ве префрли на PayPal за да ја довршите донацијата.',
643661 'contrib-tracking-button' => 'Продолжи',
644662 );
645663
@@ -652,6 +670,7 @@
653671 'contrib-tracking-error-text' => 'ഫോം സമർപ്പണം അസാധുവായ വിധത്തിലാണ്',
654672 'contrib-tracking-submitting' => 'പണമടയ്ക്കാനായി സമർപ്പിക്കുന്നു...',
655673 'contrib-tracking-continue' => 'താങ്കൾ സ്വതേ തിരിച്ചുവിടപ്പെട്ടില്ലങ്കിൽ, പേയ്‌‌പാൽ വഴിയുള്ള താങ്കളുടെ സംഭാവന പൂർത്തിയാക്കാനായി ബട്ടൺ ഞെക്കുക.',
 674+ 'contrib-tracking-redirect' => 'താങ്കളുടെ സംഭാവന പ്രക്രിയ പൂർത്തിയാക്കാൻ സ്വയം പേപാലിലോട്ട് തിരിച്ചുവിടുന്നതാണ്.',
656675 'contrib-tracking-button' => 'തുടരുക',
657676 );
658677
@@ -761,6 +780,7 @@
762781 'contrib-tracking-error-text' => 'Niewłaściwy format danych wejściowych',
763782 'contrib-tracking-submitting' => 'Przesyłanie danych do systemu płatności...',
764783 'contrib-tracking-continue' => 'Jeśli nie {{GENDER:|zostałeś przeniesiony|zostałaś przeniesiona|przeniesiono Cię}} automatycznie, kliknij przycisk aby dokończyć wpłacanie darowizny za pomocą systemu PayPal.',
 784+ 'contrib-tracking-redirect' => 'Zostaniesz automatycznie przeniesiony do PayPal aby wykonać wpłatę.',
765785 'contrib-tracking-button' => 'Kontynuuj',
766786 );
767787
@@ -774,6 +794,7 @@
775795 'contrib-tracking-error-text' => 'Spedission ëd forma nen bon-a',
776796 'contrib-tracking-submitting' => 'Spedission al motor ëd pagament ...',
777797 'contrib-tracking-continue' => "S'it ses pa rediressionà automaticament, sgnaca ël boton për completé toa donassion a PayPal.",
 798+ 'contrib-tracking-redirect' => 'It saras rediressionà automaticament su PayPal për completé toa donassion.',
778799 'contrib-tracking-button' => 'Continua',
779800 );
780801
@@ -796,6 +817,7 @@
797818 'contrib-tracking-error-text' => 'Envio de formulário inválido',
798819 'contrib-tracking-submitting' => 'A enviar ao processador de pagamentos...',
799820 'contrib-tracking-continue' => 'Se não for redireccionado automaticamente, clique no botão para completar o seu donativo no PayPal.',
 821+ 'contrib-tracking-redirect' => 'Será reencaminhado automaticamente para o Paypal para terminar o donativo.',
800822 'contrib-tracking-button' => 'Continuar',
801823 );
802824
@@ -840,6 +862,7 @@
841863 'contrib-tracking-error-text' => 'Неправильное подчинение формы',
842864 'contrib-tracking-submitting' => 'Отправка обработчику платежей…',
843865 'contrib-tracking-continue' => 'Если вы не были автоматически перенаправлены, нажмите на кнопку, чтобы завершить ваше пожертвование на сайте PayPal.',
 866+ 'contrib-tracking-redirect' => 'Вы будете автоматически перенаправлены на PayPal для завершения вашего пожертвования.',
844867 'contrib-tracking-button' => 'Продолжить',
845868 );
846869
@@ -886,6 +909,7 @@
887910 'contrib-tracking-error-text' => 'Neveljavni oddan obrazec',
888911 'contrib-tracking-submitting' => 'Pošiljanje predelovalcu plačil ...',
889912 'contrib-tracking-continue' => 'Če niste samodejno preusmerjeni, kliknite gumb, da dokončate svoj prispevek pri PayPal.',
 913+ 'contrib-tracking-redirect' => 'Samodejno boste preusmerjeni na PayPal za dokončanje vašega prispevka.',
890914 'contrib-tracking-button' => 'Nadaljuj',
891915 );
892916
@@ -972,6 +996,7 @@
973997
974998 /** Tagalog (Tagalog)
975999 * @author AnakngAraw
 1000+ * @author Sky Harbor
9761001 */
9771002 $messages['tl'] = array(
9781003 'contributiontracking-desc' => 'Pagsunod sa bakas (pagtugaygay) para sa pangangalap ng salaping panustos (pondo) ng Wikimedia',
@@ -980,6 +1005,7 @@
9811006 'contrib-tracking-error-text' => 'Hindi tanggap na anyo/pormularyo ng pagpasa',
9821007 'contrib-tracking-submitting' => 'Ipinapasa/ipinapadala sa tagapagsagawa (tagaproseso) ng bayad...',
9831008 'contrib-tracking-continue' => 'Kapag hindi ka kusang naituro/awtomatikong naihatid, pindutin ang pindutan upang mabuo ang iyong ambag/abuloy doon sa PayPal.',
 1009+ 'contrib-tracking-redirect' => 'Automatiko kang ikakarga sa PayPal upang makumpleto ang iyong pagkakaloob.',
9841010 'contrib-tracking-button' => 'Magpatuloy',
9851011 );
9861012
@@ -1036,6 +1062,7 @@
10371063 );
10381064
10391065 /** Vietnamese (Tiếng Việt)
 1066+ * @author Minh Nguyen
10401067 * @author Vinhtantran
10411068 */
10421069 $messages['vi'] = array(
@@ -1045,6 +1072,7 @@
10461073 'contrib-tracking-error-text' => 'Đăng mẫu sau quy cách',
10471074 'contrib-tracking-submitting' => 'Đang đăng bộ xử lý tính tiền...',
10481075 'contrib-tracking-continue' => 'Nếu không được tự động đổi hướng, nhấn vào nút để hoàn thành quyên góp của bạn tại PayPal.',
 1076+ 'contrib-tracking-redirect' => 'Bạn sẽ được tự động chuyển hướng đến PayPal để hoàn thành đóng góp của bạn.',
10491077 'contrib-tracking-button' => 'Tiếp tục',
10501078 );
10511079
Property changes on: branches/wmf/1.16wmf4/extensions/ContributionTracking
___________________________________________________________________
Modified: svn:mergeinfo
10521080 Merged /trunk/extensions/ContributionTracking:r77267-77399

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77267removing continue buttonkaldari00:04, 25 November 2010

Status & tagging log