| Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -148,11 +148,11 @@ |
| 149 | 149 | $countries = GatewayForm::getCountries(); |
| 150 | 150 | |
| 151 | 151 | $rows = array( |
| 152 | | - 'title' => array( wfMsg( 'payflowpro_gateway-post-transaction' ) ), |
| 153 | | - 'amount' => array( wfMsg( 'payflowpro_gateway-donor-amount' ), $data['amount'] ), |
| 154 | | - 'email' => array( wfMsg( 'payflowpro_gateway-donor-email' ), $data['email'] ), |
| 155 | | - 'name' => array( wfMsg( 'payflowpro_gateway-donor-name' ), $data['fname'], $data['mname'], $data['lname'] ), |
| 156 | | - 'address' => array( wfMsg( 'payflowpro_gateway-donor-address' ), $data['street'], $data['city'], $data['state'], $data['zip'], $countries[$data['country']] ), |
| | 152 | + 'title' => array( wfMsg( 'donate_interface-post-transaction' ) ), |
| | 153 | + 'amount' => array( wfMsg( 'donate_interface-donor-amount' ), $data['amount'] ), |
| | 154 | + 'email' => array( wfMsg( 'donate_interface-donor-email' ), $data['email'] ), |
| | 155 | + 'name' => array( wfMsg( 'donate_interface-donor-name' ), $data['fname'], $data['mname'], $data['lname'] ), |
| | 156 | + 'address' => array( wfMsg( 'donate_interface-donor-address' ), $data['street'], $data['city'], $data['state'], $data['zip'], $countries[$data['country']] ), |
| 157 | 157 | ); |
| 158 | 158 | |
| 159 | 159 | // if we want to show the response |
| — | — | @@ -194,7 +194,7 @@ |
| 195 | 195 | function fnPayflowDisplayPending( $responseMsg ) { |
| 196 | 196 | global $wgOut; |
| 197 | 197 | |
| 198 | | - $thankyou = wfMsg( 'payflowpro_gateway-thankyou' ); |
| | 198 | + $thankyou = wfMsg( 'donate_interface-thankyou' ); |
| 199 | 199 | |
| 200 | 200 | // display response message |
| 201 | 201 | $wgOut->addHTML( '<h2 class="response_message">' . $thankyou . '</h2>' ); |
| Index: trunk/extensions/DonationInterface/gateway_forms/Form.php |
| — | — | @@ -126,9 +126,9 @@ |
| 127 | 127 | $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) ); |
| 128 | 128 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos |
| 129 | 129 | $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) ); |
| 130 | | - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) ); |
| 131 | | - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) ); |
| 132 | | - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) ); |
| | 130 | + $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) ); |
| | 131 | + $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) ); |
| | 132 | + $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) ); |
| 133 | 133 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text |
| 134 | 134 | $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info |
| 135 | 135 | return $form; |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | |
| 148 | 148 | // create a new array of countries with potentially translated country names for alphabetizing later |
| 149 | 149 | foreach ( GatewayForm::getCountries() as $iso_value => $full_name ) { |
| 150 | | - $countries[$iso_value] = wfMsg( 'payflowpro_gateway-country-dropdown-' . $iso_value ); |
| | 150 | + $countries[$iso_value] = wfMsg( 'donate_interface-country-dropdown-' . $iso_value ); |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | // alphabetically sort the country names |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | 'name' => 'country', |
| 171 | 171 | 'id' => 'country' |
| 172 | 172 | ) ); |
| 173 | | - $country_menu .= Xml::option( wfMsg( 'payflowpro_gateway-select-country' ), '', false ); |
| | 173 | + $country_menu .= Xml::option( wfMsg( 'donate_interface-select-country' ), '', false ); |
| 174 | 174 | $country_menu .= $country_options; |
| 175 | 175 | $country_menu .= Xml::closeElement( 'select' ); |
| 176 | 176 | |
| — | — | @@ -227,7 +227,7 @@ |
| 228 | 228 | for ( $i = 1; $i < 13; $i++ ) { |
| 229 | 229 | $selected = ( $i == $month && $this->test ) ? true : false; |
| 230 | 230 | $expiry_months .= Xml::option( |
| 231 | | - wfMsg( 'payflowpro_gateway-month', $i, $wgLang->getMonthName( $i ) ), |
| | 231 | + wfMsg( 'donate_interface-month', $i, $wgLang->getMonthName( $i ) ), |
| 232 | 232 | str_pad( $i, 2, '0', STR_PAD_LEFT ), |
| 233 | 233 | $selected ); |
| 234 | 234 | } |
| — | — | @@ -286,7 +286,7 @@ |
| 287 | 287 | // generate dropdown of state opts |
| 288 | 288 | foreach ( $states as $value => $state_name ) { |
| 289 | 289 | $selected = ( $this->form_data['state'] == $value ) ? true : false; |
| 290 | | - $state_opts .= Xml::option( wfMsg( 'payflowpro_gateway-state-dropdown-' . $value ), $value, $selected ); |
| | 290 | + $state_opts .= Xml::option( wfMsg( 'donate_interface-state-dropdown-' . $value ), $value, $selected ); |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | $state_menu = Xml::openElement( |
| — | — | @@ -444,7 +444,7 @@ |
| 445 | 445 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>'; |
| 446 | 446 | $form .= '</tr>'; |
| 447 | 447 | $form .= '<tr>'; |
| 448 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-email' ), 'emailAdd' ) . '</td>'; |
| | 448 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-email' ), 'emailAdd' ) . '</td>'; |
| 449 | 449 | $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) . |
| 450 | 450 | '</td>'; |
| 451 | 451 | $form .= '</tr>'; |
| — | — | @@ -462,7 +462,7 @@ |
| 463 | 463 | $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>'; |
| 464 | 464 | $form .= '</tr>'; |
| 465 | 465 | $form .= '<tr>'; |
| 466 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>'; |
| | 466 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>'; |
| 467 | 467 | $form .= '<td>' . Xml::radio( 'amount', 100, $this->form_data['amount'] == 100 ) . '100 ' . |
| 468 | 468 | Xml::radio( 'amount', 50, $this->form_data['amount'] == 50 ) . '50 ' . |
| 469 | 469 | Xml::radio( 'amount', 35, $this->form_data['amount'] == 35 ) . '35 ' . |
| — | — | @@ -471,7 +471,7 @@ |
| 472 | 472 | $form .= '</tr>'; |
| 473 | 473 | $form .= '<tr>'; |
| 474 | 474 | $form .= '<td class="label"></td>'; |
| 475 | | - $form .= '<td>' . Xml::radio( 'amount', $amount, $otherChecked, array( 'id' => 'otherRadio' ) ) . Xml::input( 'amountOther', '7', $this->form_data['amountOther'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'payflowpro_gateway-other' ) . '\' )', 'onblur' => 'document.getElementById("otherRadio").value = this.value;if (this.value > 0) document.getElementById("otherRadio").checked=true;', 'maxlength' => '10', 'id' => 'amountOther' ) ) . |
| | 475 | + $form .= '<td>' . Xml::radio( 'amount', $amount, $otherChecked, array( 'id' => 'otherRadio' ) ) . Xml::input( 'amountOther', '7', $this->form_data['amountOther'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'donate_interface-other' ) . '\' )', 'onblur' => 'document.getElementById("otherRadio").value = this.value;if (this.value > 0) document.getElementById("otherRadio").checked=true;', 'maxlength' => '10', 'id' => 'amountOther' ) ) . |
| 476 | 476 | ' ' . $this->generateCurrencyDropdown() . '</td>'; |
| 477 | 477 | $form .= '</tr>'; |
| 478 | 478 | return $form; |
| — | — | @@ -491,7 +491,7 @@ |
| 492 | 492 | $form .= '</tr>'; |
| 493 | 493 | } |
| 494 | 494 | $form .= '<tr>'; |
| 495 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card-num' ), 'card_num' ) . '</td>'; |
| | 495 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-card-num' ), 'card_num' ) . '</td>'; |
| 496 | 496 | $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'type' => 'text', 'maxlength' => '100', 'id' => 'card_num', 'class' => 'fullwidth', 'autocomplete' => 'off' ) ) . |
| 497 | 497 | '</td>'; |
| 498 | 498 | $form .= '</tr>'; |
| — | — | @@ -504,9 +504,9 @@ |
| 505 | 505 | $form = '<tr>'; |
| 506 | 506 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['cvv'] . '</span></td>'; |
| 507 | 507 | $form .= '<tr>'; |
| 508 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-security' ), 'cvv' ) . '</td>'; |
| | 508 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-security' ), 'cvv' ) . '</td>'; |
| 509 | 509 | $form .= '<td>' . Xml::input( 'cvv', '5', $cvv, array( 'type' => 'text', 'maxlength' => '10', 'id' => 'cvv', 'autocomplete' => 'off' ) ) . |
| 510 | | - ' ' . '<a href="javascript:PopupCVV();">' . wfMsg( 'payflowpro_gateway-cvv-link' ) . '</a>' . |
| | 510 | + ' ' . '<a href="javascript:PopupCVV();">' . wfMsg( 'donate_interface-cvv-link' ) . '</a>' . |
| 511 | 511 | '</td>'; |
| 512 | 512 | $form .= '</tr>'; |
| 513 | 513 | return $form; |
| — | — | @@ -517,7 +517,7 @@ |
| 518 | 518 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['street'] . '</span></td>'; |
| 519 | 519 | $form .= '</tr>'; |
| 520 | 520 | $form .= '<tr>'; |
| 521 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-street' ), 'street' ) . '</td>'; |
| | 521 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-street' ), 'street' ) . '</td>'; |
| 522 | 522 | $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) . |
| 523 | 523 | '</td>'; |
| 524 | 524 | $form .= '</tr>'; |
| — | — | @@ -529,7 +529,7 @@ |
| 530 | 530 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['city'] . '</span></td>'; |
| 531 | 531 | $form .= '</tr>'; |
| 532 | 532 | $form .= '<tr>'; |
| 533 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-city' ), 'city' ) . '</td>'; |
| | 533 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-city' ), 'city' ) . '</td>'; |
| 534 | 534 | $form .= '<td>' . Xml::input( 'city', '30', $this->form_data['city'], array( 'type' => 'text', 'maxlength' => '40', 'id' => 'city', 'class' => 'fullwidth' ) ) . |
| 535 | 535 | '</td>'; |
| 536 | 536 | $form .= '</tr>'; |
| — | — | @@ -541,7 +541,7 @@ |
| 542 | 542 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['zip'] . '</span></td>'; |
| 543 | 543 | $form .= '</tr>'; |
| 544 | 544 | $form .= '<tr>'; |
| 545 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>'; |
| | 545 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-postal' ), 'zip' ) . '</td>'; |
| 546 | 546 | $form .= '<td>' . Xml::input( 'zip', '30', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '9', 'id' => 'zip', 'class' => 'fullwidth' ) ) . |
| 547 | 547 | '</td>'; |
| 548 | 548 | $form .= '</tr>'; |
| — | — | @@ -556,9 +556,9 @@ |
| 557 | 557 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>'; |
| 558 | 558 | $form .= '</tr>'; |
| 559 | 559 | $form .= '<tr>'; |
| 560 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-name' ), 'fname' ) . '</td>'; |
| 561 | | - $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'payflowpro_gateway-donor-fname' ) . '\' )', 'maxlength' => '25', 'class' => 'required', 'id' => 'fname' ) ) . |
| 562 | | - Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'payflowpro_gateway-donor-lname' ) . '\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>'; |
| | 560 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-name' ), 'fname' ) . '</td>'; |
| | 561 | + $form .= '<td>' . Xml::input( 'fname', '30', $this->form_data['fname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'donate_interface-donor-fname' ) . '\' )', 'maxlength' => '25', 'class' => 'required', 'id' => 'fname' ) ) . |
| | 562 | + Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \'' . wfMsg( 'donate_interface-donor-lname' ) . '\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>'; |
| 563 | 563 | $form .= "</tr>"; |
| 564 | 564 | return $form; |
| 565 | 565 | } |
| — | — | @@ -574,7 +574,7 @@ |
| 575 | 575 | |
| 576 | 576 | protected function getCommentField() { |
| 577 | 577 | $form = '<tr>'; |
| 578 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-comment' ), 'comment' ) . '</td>'; |
| | 578 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-comment' ), 'comment' ) . '</td>'; |
| 579 | 579 | $form .= '<td>' . Xml::input( 'comment', '30', $this->form_data['comment'], array( 'type' => 'text', 'maxlength' => '200', 'class' => 'fullwidth' ) ) . '</td>'; |
| 580 | 580 | $form .= '</tr>'; |
| 581 | 581 | return $form; |
| — | — | @@ -624,7 +624,7 @@ |
| 625 | 625 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['state'] . '</span></td>'; |
| 626 | 626 | $form .= '</tr>'; |
| 627 | 627 | $form .= '<tr>'; |
| 628 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-state' ), 'state' ) . '</td>'; |
| | 628 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-state' ), 'state' ) . '</td>'; |
| 629 | 629 | $form .= '<td>' . $this->generateStateDropdown() . '</td>'; |
| 630 | 630 | $form .= '</tr>'; |
| 631 | 631 | return $form; |
| — | — | @@ -635,7 +635,7 @@ |
| 636 | 636 | $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country'] . '</span></td>'; |
| 637 | 637 | $form .= '</tr>'; |
| 638 | 638 | $form .= '<tr>'; |
| 639 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country' ) . '</td>'; |
| | 639 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-country' ), 'country' ) . '</td>'; |
| 640 | 640 | $form .= '<td>' . $this->generateCountryDropdown( $defaultCountry ) . '</td>'; |
| 641 | 641 | $form .= '</tr>'; |
| 642 | 642 | return $form; |
| — | — | @@ -643,7 +643,7 @@ |
| 644 | 644 | |
| 645 | 645 | protected function getCreditCardTypeField() { |
| 646 | 646 | $form = '<tr>'; |
| 647 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card' ), 'card_type' ) . '</td>'; |
| | 647 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-card' ), 'card_type' ) . '</td>'; |
| 648 | 648 | $form .= '<td>' . $this->generateCardDropdown() . '</td>'; |
| 649 | 649 | $form .= '</tr>'; |
| 650 | 650 | return $form; |
| — | — | @@ -651,7 +651,7 @@ |
| 652 | 652 | |
| 653 | 653 | protected function getExpiryField() { |
| 654 | 654 | $form = '<tr>'; |
| 655 | | - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>'; |
| | 655 | + $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-expiration' ), 'expiration' ) . '</td>'; |
| 656 | 656 | $form .= '<td>' . $this->generateExpiryMonthDropdown() . $this->generateExpiryYearDropdown() . '</td>'; |
| 657 | 657 | $form .= '</tr>'; |
| 658 | 658 | return $form; |
| — | — | @@ -690,9 +690,9 @@ |
| 691 | 691 | |
| 692 | 692 | $form = '<noscript>'; |
| 693 | 693 | $form .= '<div id="noscript">'; |
| 694 | | - $form .= '<p id="noscript-msg">' . wfMsg( 'payflowpro_gateway-noscript-msg' ) . '</p>'; |
| | 694 | + $form .= '<p id="noscript-msg">' . wfMsg( 'donate_interface-noscript-msg' ) . '</p>'; |
| 695 | 695 | if ( $noScriptRedirect ) { |
| 696 | | - $form .= '<p id="noscript-redirect-msg">' . wfMsg( 'payflowpro_gateway-noscript-redirect-msg' ) . '</p>'; |
| | 696 | + $form .= '<p id="noscript-redirect-msg">' . wfMsg( 'donate_interface-noscript-redirect-msg' ) . '</p>'; |
| 697 | 697 | $form .= '<p id="noscript-redirect-link"><a href="' . $noScriptRedirect . '">' . $noScriptRedirect . '</a></p>'; |
| 698 | 698 | } |
| 699 | 699 | $form .= '</div>'; |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_resultswitcher.body.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | } else { |
| 95 | 95 | if ( !$this->adapter->isCache() ) { |
| 96 | 96 | // if we're not caching, there's a token mismatch |
| 97 | | - $this->errors['general']['token-mismatch'] = wfMsg( 'payflowpro_gateway-token-mismatch' ); |
| | 97 | + $this->errors['general']['token-mismatch'] = wfMsg( 'donate_interface-token-mismatch' ); |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | } |