r77426 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77425‎ | r77426 | r77427 >
Date:18:47, 29 November 2010
Author:awjrichards
Status:deferred
Tags:
Comment:
Merging from r77254 through r77425 of trunk
Modified paths:
  • /branches/fundraising/deployment/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/RapidHtml.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/html/demo.html (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php
@@ -214,7 +214,7 @@
215215 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
216216 $form .= '</tr>';
217217 $form .= '<tr>';
218 - $form .= '<td class="label" style="position:relative;top:4px;">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 218+ $form .= '<td class="label"><div style="padding-top:4px;">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</div></td>';
219219 $form .= '<td>' .
220220 '<table cellspacing="3" cellpadding="0" border="0" style="margin-bottom:0.2em;"><tr>' .
221221 '<td>'.Xml::radio( 'amount', 20, $this->form_data['amount'] == 20, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '$20 '.'</td>'.
@@ -244,8 +244,9 @@
245245 $form .= '</tr>';
246246 */
247247
 248+ // Payment type
248249 $form .= '<tr>';
249 - $form .= '<td class="label" style="position:relative;top:8px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
 250+ $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
250251 $form .= '<td>' .
251252 '<p style="border: 1px solid rgb(187, 187, 187); float: left; -moz-border-radius: 5px 5px 5px 5px; margin: 0 8px 0 0; padding: 5px 5px 5px 3px;">'.
252253 Xml::radio( 'card', 'cc1', $this->form_data['card'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/card-visa.png" ) ). '</label>' .
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter7.php
___________________________________________________________________
Added: svn:eol-style
253254 + native
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css
@@ -98,7 +98,7 @@
9999 background-color:#cce7cd;
100100 border:1px solid #5EAC58;
101101 padding:16px 24px 24px;
102 - width:430px;
 102+ width:440px;
103103 }
104104 #donate-head {
105105 border:none;
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/css/TwoColumnLetter7.css
___________________________________________________________________
Added: svn:eol-style
106106 + native
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/html/demo.html
___________________________________________________________________
Added: svn:eol-style
107107 + native
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/RapidHtml.php
___________________________________________________________________
Added: svn:eol-style
108108 + native
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
@@ -271,7 +271,7 @@
272272 'payflowpro_gateway-error-msg-street' => '{{Identical|Street}}',
273273 'payflowpro_gateway-error-msg-city' => '{{Identical|City}}',
274274 'payflowpro_gateway-error-msg-state' => '{{Identical|State}}',
275 - 'payflowpro_gateway-response-126-2' => "Here is a description of '[http://www.earlytorise.com/2009/06/12/it%E2%80%99s-good-to-know-your-credit-card-%E2%80%9Cprofile%E2%80%9D.html credit card profile]'.",
 275+ 'payflowpro_gateway-response-126-2' => '',
276276 'payflowpro_gateway-submit-button' => '{{Identical|Donate}}',
277277 'payflowpro_gateway-cc-form-header-personal' => '{{Identical|Personal information}}',
278278 'payflowpro_gateway-comment' => '{{Identical|Comment}}',
@@ -2461,7 +2461,7 @@
24622462 'payflowpro_gateway-select-amount' => 'Betrag auswählen',
24632463 'payflowpro_gateway-amount' => 'Betrag',
24642464 'payflowpro_gateway-make-a-donation' => 'Spende',
2465 - 'payflowpro_gateway-enter-your-amount' => 'Oder gebe den Betrag im obigen Feld ein',
 2465+ 'payflowpro_gateway-enter-your-amount' => 'Oder gib den Betrag im obigen Feld ein',
24662466 'payflowpro_gateway-will-support-with-gift' => 'Ich werde mit einer Spende in folgender Höhe unterstützen:',
24672467 'payflowpro_gateway-will-make-tax-deductible-gift' => 'Ich werde eine steuerlich absetzbare Spende in folgender Höhe machen:',
24682468 'payflowpro_gateway-select-dollar-amount' => 'Betrag in USD auswählen',
@@ -3745,7 +3745,7 @@
37463746 * @author ChrisPtDe
37473747 */
37483748 $messages['frp'] = array(
3749 - 'payflowprogateway' => 'Sotegnéd Wikimedia',
 3749+ 'payflowprogateway' => 'Balyéd orendrêt',
37503750 'payflowpro_gateway-desc' => 'Trètament per cârta de crèdit PayPal Payflow Pro.',
37513751 'payflowpro_gateway-accessible' => 'Ceta pâge est accèssibla ren que dês la pâge de donacion.',
37523752 'payflowpro_gateway-form-message' => 'Utilisâd lo formulèro ce-desot por balyér avouéc una cârta de crèdit, ou ben',
@@ -7487,7 +7487,7 @@
74887488 * @author Xqt
74897489 */
74907490 $messages['pdc'] = array(
7491 - 'payflowpro_gateway-cvv-link' => 'Beischpiel',
 7491+ 'payflowpro_gateway-cvv-link' => 'Wu iss daer?',
74927492 'payflowpro_gateway-donor-name' => 'Naame:',
74937493 'payflowpro_gateway-donor-lname' => 'Familie-Naame:',
74947494 'payflowpro_gateway-donor-street' => 'Schtrooss:',
@@ -7496,6 +7496,7 @@
74977497 'payflowpro_gateway-donor-country' => 'Land/Gegend:',
74987498 'payflowpro_gateway-donor-address' => 'Adress:',
74997499 'payflowpro_gateway-error-msg-lname' => 'Familie-Naame',
 7500+ 'payflowpro_gateway-next' => 'Neegschte',
75007501 );
75017502
75027503 /** Polish (Polski)
@@ -9597,6 +9598,8 @@
95989599 */
95999600 $messages['sw'] = array(
96009601 'payflowprogateway' => 'Changia sasa',
 9602+ 'payflowpro_gateway-accessible' => 'Ukarasa huu inapatikana tu kuanzia ukurasa wa mchango.',
 9603+ 'payflowpro_gateway-form-message' => 'Tumia fomu ya chini ili kuchangia na kadi ya mkopo, au',
96019604 'payflowpro_gateway-paypal-button' => 'Changia kwa kupitia Paypal',
96029605 'payflowpro_gateway-cc-button' => 'Changia kwa kupitia kadi ya mkopo',
96039606 'payflowpro_gateway-form-message-2' => 'Ukitaka kubadilisha kiasi au aina ya fedha, rudi katika <a href="https://www.mediawiki.org/index.php?title=Donate">ukurasa wa kuchangia</a>',
@@ -9643,14 +9646,19 @@
96449647 'payflowpro_gateway-error-msg-card_num' => 'namba ya kadi ya mkopo',
96459648 'payflowpro_gateway-error-msg-expiration' => 'tarehe itakayokwisha kadi',
96469649 'payflowpro_gateway-error-msg-cvv' => 'CVV (kodi ya usalama) iliopo nyuma ya kadi yako',
 9650+ 'payflowpro_gateway-error-msg-captcha' => 'Neno au namba ya Captcha uliyoingiza si sahihi. Tafadhali jaribu tena.',
 9651+ 'payflowpro_gateway-error-msg-captcha-please' => 'Ili kusaidia kulinda usalama wa kadi yako ya mkopo, tafadhali andika herufi unazoziona juu.',
96479652 'payflowpro_gateway-response-0' => 'Malipo yako yamepitishwa.
96489653 Ahsante kwa mchango wako!',
 9654+ 'payflowpro_gateway-response-126' => 'Manunuzi yako inasubiri idhini.',
 9655+ 'payflowpro_gateway-response-126-2' => 'Baadhi ya taarifa ulizozitoa hazikuwa sawa na taarifa kamili za kadi yako ya mkopo, ama ulitoa mchango mkubwa sana. Kwa ajili ya usalama wako, mchango wako inachunguliwa. Tutakuarifu, katika barua pepe tutakayotuma kwa anwani uliotaja, kama tutashindwa kukamilisha mchango wako. Tafadhali tuma barua pepe kwa <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a> kama una maswali. Asante!',
96499656 'payflowpro_gateway-response-12' => 'Tafadhali uwasiliane na kampuni ya kadi yako ya mkopo ili kupata maelezo mengine.',
96509657 'payflowpro_gateway-response-114' => 'Tafadhali wasiliana na kampuni ya kadi yako ya mkopo ili kupata maelezo zaidi.',
96519658 'payflowpro_gateway-response-23' => 'Ama namba ya kadi ya mkopo au tarehe yake ya kuishia haipo sahihi.',
96529659 'payflowpro_gateway-response-4' => 'Kiasi batili.',
96539660 'payflowpro_gateway-response-24' => 'Ama namba ya kadi ya mkopo au tarehe yake ya kuishia haipo sahihi.',
96549661 'payflowpro_gateway-response-112' => 'Ama anwani au namba yako ya CVV (kodi ya usalama) hayapo sahihi.',
 9662+ 'payflowpro_gateway-response-125-2' => 'Kadi yako ya mkopo haikuweza kuidhinishwa. Tafadhali uhakikishe kwamba taarifa zote zilizotolewa zipo sawa na kadi, au jaribu kadi nyingine. Pia unaweza kuchangia kwa <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia nyingine</a> au unaweza kuwasiliana nasi hapo <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>. Asante kwa mchango wako.',
96559663 'payflowpro_gateway-response-default' => 'Ilitokea hitilafu wakati wa kufanyika malipo.
96569664 Tafadhali jaribu baadaye tena.',
96579665 'php-response-declined' => 'Malipo yako hayakubaliwa.',
@@ -9671,6 +9679,7 @@
96729680 'payflowpro_gateway-otherways-alt' => 'Kuna <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">njia zingine za kuchangia, kwa mfano kwa hundi</a>.',
96739681 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Njia zingine za kuchangia</a>.',
96749682 'payflowpro_gateway-credit-storage-processing' => 'Hatuhifadhi taarifa ya kadi yako ya mkopo, na taarifa juu yako binafsi iko chini ya <a href="http://wikimediafoundation.org/wiki/Donor_Privacy_Policy">sera ya faragha</a> yetu.',
 9683+ 'payflowpro_gateway-cc-form-header-payment' => 'Taarifa za kulipa',
96759684 'payflowpro_gateway-make-your-donation' => 'Changia sasa',
96769685 'payflowpro_gateway-state-in-us' => 'kama ndani ya Marekani',
96779686 'payflowpro_gateway-comment' => 'Maoni',
@@ -9738,6 +9747,7 @@
97399748 'payflowpro_gateway-make-a-donation' => 'Changia',
97409749 'payflowpro_gateway-enter-your-amount' => 'Au ingiza kiasi cha mchango katika sanduku la juu',
97419750 'payflowpro_gateway-will-support-with-gift' => 'Nitatoa mchango wa:',
 9751+ 'payflowpro_gateway-will-make-tax-deductible-gift' => 'Nitatoa mchango unaoweza kupunguza kodi wa:',
97429752 'payflowpro_gateway-select-dollar-amount' => 'Kuchagua kiasi cha dola',
97439753 'payflowpro_gateway-submit-my-secure-donation' => 'Wasilisha mchango wangu salama',
97449754 'payflowpro_gateway-next' => 'Ijayo',
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
97459755 Merged /trunk/extensions/DonationInterface:r77254-77425

Follow-up revisions

RevisionCommit summaryAuthorDate
r77441Merging from r77426 through r77440 of trunkawjrichards22:24, 29 November 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77254Merging from r77245 thru r77253 of trunkawjrichards21:54, 24 November 2010
r77425fixes for IE7kaldari18:41, 29 November 2010

Status & tagging log