r100745 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r100744‎ | r100745 | r100746 >
Date:21:24, 25 October 2011
Author:kaldari
Status:ok
Tags:fundraising 
Comment:
fixing the gateway forms for new message keys
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepAmount.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter2.php
——@@ -41,7 +41,7 @@
4242 // add noscript tags for javascript disabled browsers
4343 $form .= $this->getNoScript();
4444
45 - // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 45+ // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
4646
4747 // provide a place at the top of the form for displaying general messages
4848 if ( $this->form_errors['general'] ) {
——@@ -90,8 +90,8 @@
9191 if ( !$this->paypal ) {
9292 // PayPal button
9393 $form .= '<tr>';
94 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
95 - '— ' . wfMsg( 'payflowpro_gateway-or' ) . ' —<br/><big><b>' . wfMsg( 'payflowpro_gateway-donate-wikipedia' ) . '</b></big></td>';
 94+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
 95+ '— ' . wfMsg( 'donate_interface-or' ) . ' —<br/><big><b>' . wfMsg( 'donate_interface-donate-wikipedia' ) . '</b></big></td>';
9696 $form .= '</tr>';
9797 }
9898
——@@ -148,7 +148,7 @@
149149 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
150150 $form .= '<tr>';
151151 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
152 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 152+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
153153 $form .= '</tr>';
154154
155155 // email agreement
——@@ -163,12 +163,12 @@
164164 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
165165 if ( $this->paypal ) {
166166 $form .= Html::hidden( 'PaypalRedirect', 0 );
167 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
 167+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
168168 } else {
169 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) );
 169+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'type' => 'submit' ) );
170170 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
171171 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
172 - wfMsg( 'payflowpro_gateway-donate-click' );
 172+ wfMsg( 'donate_interface-donate-click' );
173173 }
174174 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
175175 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
——@@ -207,9 +207,9 @@
208208 $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
212 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
213 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 211+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) );
 212+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 213+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
214214 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
215215 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
216216 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepAmount.php
——@@ -48,8 +48,8 @@
4949 public function loadPlaceholders() {
5050 global $wgOut;
5151 // form placeholder values
52 - $first = wfMsg( 'payflowpro_gateway-donor-fname' );
53 - $last = wfMsg( 'payflowpro_gateway-donor-lname' );
 52+ $first = wfMsg( 'donate_interface-donor-fname' );
 53+ $last = wfMsg( 'donate_interface-donor-lname' );
5454 $js = <<<EOT
5555 <script type="text/javascript">
5656 function loadPlaceholders() {
——@@ -170,11 +170,11 @@
171171 // submit button
172172 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
173173 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
174 - // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' ));
175 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'type' => 'submit' ) );
 174+ // $form .= Xml::submitButton( wfMsg( 'donate_interface-submit-button' ));
 175+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-cc-button' ), 'type' => 'submit' ) );
176176 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
177177 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
178 - wfMsg( 'payflowpro_gateway-donate-click' );
 178+ wfMsg( 'donate_interface-donate-click' );
179179 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
180180 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
181181 return $form;
——@@ -201,7 +201,7 @@
202202 protected function generatePersonalContainer() {
203203 $form = '';
204204 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) ); ;
205 - //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) );
 205+ //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'donate_interface-cc-form-header-personal' ) );
206206 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
207207
208208 $form .= $this->generatePersonalFields();
——@@ -242,7 +242,7 @@
243243 $form = '';
244244 // credit card info
245245 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-payment-info' ) );
246 - //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-payment' ), wfMsg( 'payflowpro_gateway-cc-form-header-payment' ) );
 246+ //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-payment' ), wfMsg( 'donate_interface-cc-form-header-payment' ) );
247247 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
248248
249249 $form .= $this->generatePaymentFields();
——@@ -259,7 +259,7 @@
260260 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
261261 $form .= '</tr>';
262262 $form .= '<tr>';
263 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 263+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
264264 $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
265265 ' ' . $this->generateCurrencyDropdown() . '</td>';
266266 $form .= '</tr>';
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter3.php
——@@ -41,7 +41,7 @@
4242 // add noscript tags for javascript disabled browsers
4343 $form .= $this->getNoScript();
4444
45 - // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 45+ // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
4646
4747 // provide a place at the top of the form for displaying general messages
4848 if ( $this->form_errors['general'] ) {
——@@ -90,8 +90,8 @@
9191 if ( !$this->paypal ) {
9292 // PayPal button
9393 $form .= '<tr>';
94 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
95 - '— ' . wfMsg( 'payflowpro_gateway-or' ) . ' —<br/><big><b>' . wfMsg( 'payflowpro_gateway-donate-wikipedia' ) . '</b></big></td>';
 94+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
 95+ '— ' . wfMsg( 'donate_interface-or' ) . ' —<br/><big><b>' . wfMsg( 'donate_interface-donate-wikipedia' ) . '</b></big></td>';
9696 $form .= '</tr>';
9797 }
9898
——@@ -148,7 +148,7 @@
149149 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
150150 $form .= '<tr>';
151151 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
152 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 152+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
153153 $form .= '</tr>';
154154
155155 // email agreement
——@@ -163,12 +163,12 @@
164164 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
165165 if ( $this->paypal ) {
166166 $form .= Html::hidden( 'PaypalRedirect', 0 );
167 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
 167+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
168168 } else {
169 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) );
 169+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'type' => 'submit' ) );
170170 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
171171 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
172 - wfMsg( 'payflowpro_gateway-donate-click' );
 172+ wfMsg( 'donate_interface-donate-click' );
173173 }
174174 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
175175 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
——@@ -207,9 +207,9 @@
208208 $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
212 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
213 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 211+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) );
 212+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 213+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
214214 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
215215 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
216216 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter4.php
——@@ -41,7 +41,7 @@
4242 // add noscript tags for javascript disabled browsers
4343 $form .= $this->getNoScript();
4444
45 - // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 45+ // $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
4646
4747 // provide a place at the top of the form for displaying general messages
4848 if ( $this->form_errors['general'] ) {
——@@ -90,8 +90,8 @@
9191 if ( !$this->paypal ) {
9292 // PayPal button
9393 $form .= '<tr>';
94 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
95 - '— ' . wfMsg( 'payflowpro_gateway-or' ) . ' —<br/><big><b>' . wfMsg( 'payflowpro_gateway-donate-wikipedia' ) . '</b></big></td>';
 94+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a><br/>' .
 95+ '— ' . wfMsg( 'donate_interface-or' ) . ' —<br/><big><b>' . wfMsg( 'donate_interface-donate-wikipedia' ) . '</b></big></td>';
9696 $form .= '</tr>';
9797 }
9898
——@@ -148,7 +148,7 @@
149149 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
150150 $form .= '<tr>';
151151 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
152 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 152+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
153153 $form .= '</tr>';
154154
155155 // email agreement
——@@ -163,12 +163,12 @@
164164 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
165165 if ( $this->paypal ) {
166166 $form .= Html::hidden( 'PaypalRedirect', 0 );
167 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
 167+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
168168 } else {
169 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'type' => 'submit' ) );
 169+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'type' => 'submit' ) );
170170 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
171171 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
172 - wfMsg( 'payflowpro_gateway-donate-click' );
 172+ wfMsg( 'donate_interface-donate-click' );
173173 }
174174 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
175175 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
——@@ -207,9 +207,9 @@
208208 $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate.gif" ) ) );
209209 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
210210 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
211 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
212 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
213 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 211+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) );
 212+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 213+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
214214 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
215215 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
216216 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter5.php
——@@ -38,7 +38,7 @@
3939 // add noscript tags for javascript disabled browsers
4040 $form .= $this->getNoScript();
4141
42 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 42+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
4343
4444 // provide a place at the top of the form for displaying general messages
4545 if ( $this->form_errors['general'] ) {
——@@ -86,7 +86,7 @@
8787
8888 /*
8989 $form .= '<tr>';
90 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
 90+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
9191 $form .= '</tr>';
9292 */
9393
——@@ -101,7 +101,7 @@
102102 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
103103 $form .= '</tr>';
104104 $form .= '<tr>';
105 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 105+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
106106 $form .= '<td>' . Xml::radio( 'amount', 100, $this->form_data['amount'] == 100, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '100 ' .
107107 Xml::radio( 'amount', 50, $this->form_data['amount'] == 50, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '50 ' .
108108 Xml::radio( 'amount', 35, $this->form_data['amount'] == 35, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '35 ' .
——@@ -134,7 +134,7 @@
135135 $form .= '</tr>';
136136
137137 $form .= '<tr>';
138 - $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
 138+ $form .= '<td class="label">' . wfMsg( 'donate_interface-payment-type' ) . '</td>';
139139 $form .= '<td>' .
140140 Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
141141 Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
——@@ -171,7 +171,7 @@
172172 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['zip'] . '</span></td>';
173173 $form .= '</tr>';
174174 $form .= '<tr>';
175 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>';
 175+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-postal' ), 'zip' ) . '</td>';
176176 $form .= '<td>' . Xml::input( 'zip', '15', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '15', 'id' => 'zip' ) ) .
177177 '</td>';
178178 $form .= '</tr>';
——@@ -182,7 +182,7 @@
183183 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
184184 $form .= '<tr>';
185185 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
186 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 186+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
187187 $form .= '</tr>';
188188
189189 $form .= $this->getEmailOptField();
——@@ -195,10 +195,10 @@
196196 // cc submit button
197197 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
198198 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
199 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) );
 199+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) );
200200 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
201201 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
202 - wfMsg( 'payflowpro_gateway-donate-click' );
 202+ wfMsg( 'donate_interface-donate-click' );
203203 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
204204 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
205205
——@@ -206,7 +206,7 @@
207207 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit-paypal' ) );
208208 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
209209 $form .= Html::hidden( 'PaypalRedirect', 0 );
210 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
 210+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
211211 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
212212 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
213213
——@@ -244,9 +244,9 @@
245245 $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
246246 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
247247 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
248 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
249 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
250 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 248+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) );
 249+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 250+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
251251 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
252252 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
253253 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter6.php
——@@ -38,7 +38,7 @@
3939 // add noscript tags for javascript disabled browsers
4040 $form .= $this->getNoScript();
4141
42 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 42+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
4343
4444 // provide a place at the top of the form for displaying general messages
4545 if ( $this->form_errors['general'] ) {
——@@ -86,7 +86,7 @@
8787
8888 /*
8989 $form .= '<tr>';
90 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
 90+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
9191 $form .= '</tr>';
9292 */
9393
——@@ -101,7 +101,7 @@
102102 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
103103 $form .= '</tr>';
104104 $form .= '<tr>';
105 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 105+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
106106 $form .= '<td>' . Xml::radio( 'amount', 100, $this->form_data['amount'] == 100, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '100 ' .
107107 Xml::radio( 'amount', 50, $this->form_data['amount'] == 50, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '50 ' .
108108 Xml::radio( 'amount', 35, $this->form_data['amount'] == 35, array( 'onfocus' => 'clearField2( document.getElementById(\'amountOther\'), "Other" )' ) ) . '35 ' .
——@@ -128,7 +128,7 @@
129129 $form .= '</tr>';
130130
131131 $form .= '<tr>';
132 - $form .= '<td class="label">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</td>';
 132+ $form .= '<td class="label">' . wfMsg( 'donate_interface-payment-type' ) . '</td>';
133133 $form .= '<td>' .
134134 Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
135135 Xml::radio( 'card_type', 'cc2', $this->form_data['card_type'] == 'cc2', array( 'id' => 'cc2radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc2radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-mastercard.png" ) ). '</label>' .
——@@ -179,7 +179,7 @@
180180 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['zip'] . '</span></td>';
181181 $form .= '</tr>';
182182 $form .= '<tr>';
183 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-postal' ), 'zip' ) . '</td>';
 183+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-postal' ), 'zip' ) . '</td>';
184184 $form .= '<td>' . Xml::input( 'zip', '15', $this->form_data['zip'], array( 'type' => 'text', 'maxlength' => '15', 'id' => 'zip' ) ) .
185185 '</td>';
186186 $form .= '</tr>';
——@@ -190,7 +190,7 @@
191191 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
192192 $form .= '<tr>';
193193 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
194 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 194+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
195195 $form .= '</tr>';
196196
197197 $form .= $this->getEmailOptField();
——@@ -208,10 +208,10 @@
209209 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit', 'style' => 'display: none;' ) );
210210 }
211211 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
212 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) );
 212+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=0;return true;', 'type' => 'submit' ) );
213213 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
214214 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
215 - wfMsg( 'payflowpro_gateway-donate-click' );
 215+ wfMsg( 'donate_interface-donate-click' );
216216 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
217217 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
218218
——@@ -223,7 +223,7 @@
224224 }
225225 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
226226 $form .= Html::hidden( 'PaypalRedirect', 0 );
227 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
 227+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-donor-submit' ), 'onclick' => 'document.payment.PaypalRedirect.value=1;return true;', 'type' => 'submit' ) );
228228 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
229229 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
230230 return $form;
——@@ -260,9 +260,9 @@
261261 $form .= Xml::tags( 'p', array( 'class' => '' ), Xml::openElement( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/rapidssl_ssl_certificate-nonanimated.png" ) ) );
262262 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-secure-logos
263263 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
264 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-short' ) );
265 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
266 - $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 264+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-short' ) );
 265+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 266+ $form .= Xml::tags( 'p', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
267267 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
268268 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
269269 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter.php
——@@ -37,7 +37,7 @@
3838 // add noscript tags for javascript disabled browsers
3939 $form .= $this->getNoScript();
4040
41 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 41+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-please-complete' ) );
4242
4343 // provide a place at the top of the form for displaying general messages
4444 if ( $this->form_errors['general'] ) {
——@@ -93,7 +93,7 @@
9494 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
9595 $form .= '</tr>';
9696 $form .= '<tr>';
97 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 97+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
9898 $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
9999 ' ' . $this->generateCurrencyDropdown() . '</td>';
100100 $form .= '</tr>';
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter7.php
——@@ -16,13 +16,13 @@
1717 public function loadPlaceholders() {
1818 global $wgOut;
1919 // form placeholder values
20 - $other = wfMsg( 'payflowpro_gateway-other' );
21 - $first = wfMsg( 'payflowpro_gateway-donor-fname' );
22 - $last = wfMsg( 'payflowpro_gateway-donor-lname' );
23 - $street = wfMsg( 'payflowpro_gateway-donor-street' );
24 - $city = wfMsg( 'payflowpro_gateway-donor-city' );
25 - $zip = wfMsg( 'payflowpro_gateway-zip-code' );
26 - $email = wfMsg( 'payflowpro_gateway-donor-email' );
 20+ $other = wfMsg( 'donate_interface-other' );
 21+ $first = wfMsg( 'donate_interface-donor-fname' );
 22+ $last = wfMsg( 'donate_interface-donor-lname' );
 23+ $street = wfMsg( 'donate_interface-donor-street' );
 24+ $city = wfMsg( 'donate_interface-donor-city' );
 25+ $zip = wfMsg( 'donate_interface-zip-code' );
 26+ $email = wfMsg( 'donate_interface-donor-email' );
2727 $js = <<<EOT
2828 <script type="text/javascript">
2929 function loadPlaceholders() {
——@@ -151,7 +151,7 @@
152152 // add noscript tags for javascript disabled browsers
153153 $form .= $this->getNoScript();
154154
155 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ));
 155+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ));
156156
157157 // provide a place at the top of the form for displaying general messages
158158 if ( $this->form_errors['general'] ) {
——@@ -199,7 +199,7 @@
200200
201201 /*
202202 $form .= '<tr>';
203 - $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'payflowpro_gateway-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
 203+ $form .= '<td style="text-align:center;" colspan="2"><big><b>' . wfMsg( 'donate_interface-paypal-button' ) . '</b></big><br/><a href="#" onclick="document.payment.PaypalRedirect.value=1;document.payment.submit();"><img src="' . $scriptPath . '/paypal.png"/></a></td>';
204204 $form .= '</tr>';
205205 */
206206
——@@ -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"><div style="padding-top:4px;">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</div></td>';
 218+ $form .= '<td class="label"><div style="padding-top:4px;">' . Xml::label( wfMsg( 'donate_interface-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>'.
——@@ -246,7 +246,7 @@
247247
248248 // Payment type
249249 $form .= '<tr>';
250 - $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'payflowpro_gateway-payment-type' ) . '</div></td>';
 250+ $form .= '<td class="label""><div style="padding-top:9px;">' . wfMsg( 'donate_interface-payment-type' ) . '</div></td>';
251251 $form .= '<td>' .
252252 '<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; white-space: nowrap;">'.
253253 Xml::radio( 'card_type', 'cc1', $this->form_data['card_type'] == 'cc1', array( 'id' => 'cc1radio', 'onclick' => 'switchToCreditCard()' ) ) . '<label for="cc1radio">' . Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/card-visa.png" ) ). '</label>' .
——@@ -269,7 +269,7 @@
270270 }
271271
272272 $form .= '<tr>';
273 - $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
 273+ $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'donate_interface-cc-form-header-personal' ) .
274274 Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
275275 $form .= '</tr>';
276276
——@@ -278,7 +278,7 @@
279279
280280 // expiry
281281 $form .= '<tr>';
282 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
 282+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-expiration' ), 'expiration' ) . '</td>';
283283 $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>';
284284 $form .= '</tr>';
285285
——@@ -293,9 +293,9 @@
294294 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>';
295295 $form .= '</tr>';
296296 $form .= '<tr>';
297 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>';
298 - $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' ) ) .
299 - Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
 297+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-name-on-card' ), 'fname' ) . '</td>';
 298+ $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' ) ) .
 299+ Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
300300 $form .= "</tr>";
301301
302302 // street
——@@ -303,8 +303,8 @@
304304 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['street'] . '</span></td>';
305305 $form .= '</tr>';
306306 $form .= '<tr>';
307 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-billing-address' ), 'street' ) . '</td>';
308 - $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
 307+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-billing-address' ), 'street' ) . '</td>';
 308+ $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
309309 '</td>';
310310 $form .= '</tr>';
311311
——@@ -314,9 +314,9 @@
315315 $form .= '</tr>';
316316 $form .= '<tr>';
317317 $form .= '<td class="label"> </td>';
318 - $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
 318+ $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
319319 $this->generateStateDropdown() . ' ' .
320 - Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
 320+ Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
321321 Html::hidden( 'country', 'US' ) .
322322 '</td>';
323323 $form .= '</tr>';
——@@ -337,8 +337,8 @@
338338 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>';
339339 $form .= '</tr>';
340340 $form .= '<tr>';
341 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-email-receipt' ), 'emailAdd' ) . '</td>';
342 - $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
 341+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-email-receipt' ), 'emailAdd' ) . '</td>';
 342+ $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
343343 Html::hidden( 'email-opt', 1 ) .
344344 '</td>';
345345 $form .= '</tr>';
——@@ -347,7 +347,7 @@
348348 $comment_opt_value = ( $wgRequest->wasPosted() ) ? $this->form_data[ 'comment-option' ] : true;
349349 $form .= '<tr>';
350350 $form .= '<td class="check-option" colspan="2">' . Xml::check( 'comment-option', $comment_opt_value );
351 - $form .= ' ' . Xml::label( wfMsg( 'payflowpro_gateway-anon-message' ), 'comment-option' ) . '</td>';
 351+ $form .= ' ' . Xml::label( wfMsg( 'donate_interface-anon-message' ), 'comment-option' ) . '</td>';
352352 $form .= '</tr>';
353353
354354 $form .= $this->getEmailOptField();
——@@ -413,9 +413,9 @@
414414 $form = Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
415415 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
416416 $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' );
417 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
418 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) );
419 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 417+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 418+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-alt' ) );
 419+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
420420 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
421421 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
422422 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnPayPal.php
——@@ -46,7 +46,7 @@
4747 protected function generatePersonalContainer() {
4848 $form = '';
4949 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) ); ;
50 - $form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'payflowpro_gateway-make-your-donation' ) );
 50+ $form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'donate_interface-make-your-donation' ) );
5151 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
5252
5353 $form .= $this->generatePersonalFields();
Index: trunk/extensions/DonationInterface/gateway_forms/SingleColumn.php
——@@ -7,7 +7,7 @@
88
99 // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
1010 if ( !strlen( $this->getStylePath() ) ) {
11 - $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/SingleColumn.css' );
 11+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/gateway_forms/css/SingleColumn.css' );
1212 }
1313
1414 parent::__construct( $form_data, $form_errors, $gateway );
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetterCA.php
——@@ -37,7 +37,7 @@
3838 // add noscript tags for javascript disabled browsers
3939 $form .= $this->getNoScript();
4040
41 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 41+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-please-complete' ) );
4242
4343 // provide a place at the top of the form for displaying general messages
4444 if ( $this->form_errors['general'] ) {
——@@ -93,7 +93,7 @@
9494 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
9595 $form .= '</tr>';
9696 $form .= '<tr>';
97 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 97+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
9898 $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
9999 ' ' . $this->generateCurrencyDropdown() . '</td>';
100100 $form .= '</tr>';
——@@ -135,7 +135,7 @@
136136 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['state'] . '</span></td>';
137137 $form .= '</tr>';
138138 $form .= '<tr>';
139 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-state-province' ), 'state' ) . '</td>';
 139+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-state-province' ), 'state' ) . '</td>';
140140 $form .= '<td>' . $this->generateStateDropdown() . '</td>';
141141 $form .= '</tr>';
142142
——@@ -147,7 +147,7 @@
148148 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country'] . '</span></td>';
149149 $form .= '</tr>';
150150 $form .= '<tr>';
151 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country' ) . '</td>';
 151+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-country' ), 'country' ) . '</td>';
152152 $form .= '<td>' . $this->generateCountryDropdown( 124 ) . '</td>'; // Canada default
153153 $form .= '</tr>';
154154
Index: trunk/extensions/DonationInterface/gateway_forms/TwoColumnLetter.php
——@@ -41,7 +41,7 @@
4242 // add noscript tags for javascript disabled browsers
4343 $form .= $this->getNoScript();
4444
45 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-make-your-donation' ) );
 45+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-make-your-donation' ) );
4646
4747 // provide a place at the top of the form for displaying general messages
4848 if ( $this->form_errors['general'] ) {
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremium.php
——@@ -6,7 +6,7 @@
77
88 // set the path to css, before the parent constructor is called, checking to make sure some child class hasn't already set this
99 if ( !strlen( $this->getStylePath() ) ) {
10 - $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/payflowpro_gateway/forms/css/TwoStepTwoColumnPremium.css' );
 10+ $this->setStylePath( $wgScriptPath . '/extensions/DonationInterface/gateway_forms/css/TwoStepTwoColumnPremium.css' );
1111 }
1212
1313 parent::__construct( $form_data, $form_errors, $gateway );
——@@ -22,14 +22,14 @@
2323 $form .= Xml::openElement( 'td', array( 'id' => 'appeal', 'valign' => 'top' ) );
2424
2525 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
26 - $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), wfMsg( 'payflowpro_gateway-tshirt-confirmation' ) );
 26+ $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), wfMsg( 'donate_interface-tshirt-confirmation' ) );
2727 $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
2828 $form .= Xml::openElement( 'div', array( 'id' => 'premium-values' ) );
2929 $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' ) );
3030 $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 'size' ).'</span>';
31 - $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $sizeDisplay );
 31+ $form .= wfMsg( 'donate_interface-shirt-size-2', $sizeDisplay );
3232 $form .= Xml::closeElement( 'div' ); // close div#premium-size
33 - $form .= wfMsg( 'payflowpro_gateway-on-the-back' ) . "<br/>";
 33+ $form .= wfMsg( 'donate_interface-on-the-back' ) . "<br/>";
3434 $form .= Xml::openElement( 'div', array( 'id' => 'premium-language' ) );
3535 $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/wordmarks/".$wgRequest->getText( 'premium_language' )."-wordmark.png", 'width' => '200', 'height' => '92' ) );
3636 $form .= Xml::closeElement( 'div' ); // close div#premium-language
——@@ -43,7 +43,7 @@
4444 // add noscript tags for javascript disabled browsers
4545 $form .= $this->getNoScript();
4646
47 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 47+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-please-complete' ) );
4848
4949 // provide a place at the top of the form for displaying general messages
5050 if ( $this->form_errors['general'] ) {
——@@ -99,7 +99,7 @@
100100 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
101101 $form .= '</tr>';
102102 $form .= '<tr>';
103 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 103+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
104104 $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
105105 ' ' . $this->generateCurrencyDropdown() . '</td>';
106106 $form .= '</tr>';
——@@ -149,14 +149,14 @@
150150 $form .= '<td colspan="2"><span class="creditcard-error-msg"></span></td>';
151151 $form .= '</tr>';
152152 $form .= '<tr>';
153 - $form .= '<td colspan="2"><label for="shipping"><input id="shipping" name="shipping" type="checkbox" checked="checked"/> '.wfMsg( 'payflowpro_gateway-shipping-address-same' ).'</label></td>';
 153+ $form .= '<td colspan="2"><label for="shipping"><input id="shipping" name="shipping" type="checkbox" checked="checked"/> '.wfMsg( 'donate_interface-shipping-address-same' ).'</label></td>';
154154 $form .= '</tr>';
155155
156156 $form .= '<tr>';
157157 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['country2'] . '</span></td>';
158158 $form .= '</tr>';
159159 $form .= '<tr>';
160 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-country' ), 'country2' ) . '</td>';
 160+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-country' ), 'country2' ) . '</td>';
161161 $form .= '<td>' . $this->generateCountryDropdown() . '</td>';
162162 $form .= '</tr>';
163163 */
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumn.php
——@@ -70,11 +70,11 @@
7171 // submit button
7272 $form = Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-form-submit' ) );
7373 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
74 - // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' ));
75 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'type' => 'submit' ) );
 74+ // $form .= Xml::submitButton( wfMsg( 'donate_interface-submit-button' ));
 75+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-cc-button' ), 'type' => 'submit' ) );
7676 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
7777 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
78 - wfMsg( 'payflowpro_gateway-donate-click' );
 78+ wfMsg( 'donate_interface-donate-click' );
7979 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
8080 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
8181 return $form;
——@@ -98,7 +98,7 @@
9999 protected function generatePersonalContainer() {
100100 $form = '';
101101 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) ); ;
102 - //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) );
 102+ //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'donate_interface-cc-form-header-personal' ) );
103103 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
104104
105105 $form .= $this->generatePersonalFields();
——@@ -139,7 +139,7 @@
140140 $form = '';
141141 // credit card info
142142 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-payment-info' ) );
143 - //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-payment' ), wfMsg( 'payflowpro_gateway-cc-form-header-payment' ) );
 143+ //$form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-payment' ), wfMsg( 'donate_interface-cc-form-header-payment' ) );
144144 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-cc' ) );
145145
146146 $form .= $this->generatePaymentFields();
——@@ -158,7 +158,7 @@
159159 $form .= '<td colspan="2"><span class="creditcard-error-msg">' . $this->form_errors['invalidamount'] . '</span></td>';
160160 $form .= '</tr>';
161161 $form .= '<tr>';
162 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-amount' ), 'amount' ) . '</td>';
 162+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-amount' ), 'amount' ) . '</td>';
163163 $form .= '<td>' . Xml::input( 'amount', '7', $this->form_data['amount'], array( 'type' => 'text', 'maxlength' => '10', 'id' => 'amount' ) ) .
164164 ' ' . $this->generateCurrencyDropdown() . '</td>';
165165 $form .= '</tr>';
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnLetter3.php
——@@ -15,12 +15,12 @@
1616 public function loadPlaceholders() {
1717 global $wgOut;
1818 // form placeholder values
19 - $first = wfMsg( 'payflowpro_gateway-donor-fname' );
20 - $last = wfMsg( 'payflowpro_gateway-donor-lname' );
21 - $street = wfMsg( 'payflowpro_gateway-donor-street' );
22 - $city = wfMsg( 'payflowpro_gateway-donor-city' );
23 - $zip = wfMsg( 'payflowpro_gateway-zip-code' );
24 - $email = wfMsg( 'payflowpro_gateway-donor-email' );
 19+ $first = wfMsg( 'donate_interface-donor-fname' );
 20+ $last = wfMsg( 'donate_interface-donor-lname' );
 21+ $street = wfMsg( 'donate_interface-donor-street' );
 22+ $city = wfMsg( 'donate_interface-donor-city' );
 23+ $zip = wfMsg( 'donate_interface-zip-code' );
 24+ $email = wfMsg( 'donate_interface-donor-email' );
2525 $js = <<<EOT
2626 <script type="text/javascript">
2727 ( function( $ ) {
——@@ -133,7 +133,7 @@
134134 // add noscript tags for javascript disabled browsers
135135 $form .= $this->getNoScript();
136136
137 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 137+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-please-complete' ) );
138138
139139 // provide a place at the top of the form for displaying general messages
140140 if ( $this->form_errors['general'] ) {
——@@ -168,7 +168,7 @@
169169
170170 // submit button
171171 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
172 - // $form .= Xml::submitButton( wfMsg( 'payflowpro_gateway-submit-button' ));
 172+ // $form .= Xml::submitButton( wfMsg( 'donate_interface-submit-button' ));
173173 $form .= '&#160;<br/>' . Xml::element( 'input', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/submit-donation-button.png", 'alt' => 'Submit donation', 'type' => 'image' ) );
174174 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
175175 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
——@@ -201,12 +201,12 @@
202202 $form .= '<td colspan="2">';
203203 $form .= '<table cellspacing="0" cellpadding="4" border="1" id="donation_amount">';
204204 $form .= '<tr>';
205 - $form .= '<td class="amount_header">'.wfMsg( 'payflowpro_gateway-description' ).'</td>';
206 - $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'payflowpro_gateway-donor-amount' ).'</td>';
207 - $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'payflowpro_gateway-donor-currency-label' ).'</td>';
 205+ $form .= '<td class="amount_header">'.wfMsg( 'donate_interface-description' ).'</td>';
 206+ $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'donate_interface-donor-amount' ).'</td>';
 207+ $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'donate_interface-donor-currency-label' ).'</td>';
208208 $form .= '</tr>';
209209 $form .= '<tr>';
210 - $form .= '<td class="amount_data">'.wfMsg( 'payflowpro_gateway-donation' ).'</td>';
 210+ $form .= '<td class="amount_data">'.wfMsg( 'donate_interface-donation' ).'</td>';
211211 $form .= '<td class="amount_data" style="text-align:right;width:75px;">'.$this->form_data['amount'] .
212212 Html::hidden( 'amount', $this->form_data['amount'] ) .
213213 '</td>';
——@@ -219,7 +219,7 @@
220220 $form .= '</tr>';
221221
222222 $form .= '<tr>';
223 - $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
 223+ $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'donate_interface-cc-form-header-personal' ) .
224224 Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
225225 $form .= '</tr>';
226226
——@@ -247,14 +247,14 @@
248248 $form .= '</tr>';
249249 }
250250 $form .= '<tr>';
251 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card-num' ), 'card_num' ) . '</td>';
 251+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-card-num' ), 'card_num' ) . '</td>';
252252 $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'type' => 'text', 'maxlength' => '100', 'id' => 'card_num', 'class' => 'fullwidth', 'autocomplete' => 'off' ) ) .
253253 '</td>';
254254 $form .= '</tr>';
255255
256256 // expiry
257257 $form .= '<tr>';
258 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
 258+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-expiration' ), 'expiration' ) . '</td>';
259259 $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>';
260260 $form .= '</tr>';
261261
——@@ -269,9 +269,9 @@
270270 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>';
271271 $form .= '</tr>';
272272 $form .= '<tr>';
273 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>';
274 - $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' ) ) .
275 - Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
 273+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-name-on-card' ), 'fname' ) . '</td>';
 274+ $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' ) ) .
 275+ Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
276276 $form .= "</tr>";
277277
278278 // street
——@@ -279,8 +279,8 @@
280280 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['street'] . '</span></td>';
281281 $form .= '</tr>';
282282 $form .= '<tr>';
283 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-billing-address' ), 'street' ) . '</td>';
284 - $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
 283+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-billing-address' ), 'street' ) . '</td>';
 284+ $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
285285 '</td>';
286286 $form .= '</tr>';
287287
——@@ -290,9 +290,9 @@
291291 $form .= '</tr>';
292292 $form .= '<tr>';
293293 $form .= '<td class="label"> </td>';
294 - $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
 294+ $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
295295 $this->generateStateDropdown() . ' ' .
296 - Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
 296+ Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
297297 Html::hidden( 'country', 'US' ) .
298298 '</td>';
299299 $form .= '</tr>';
——@@ -313,8 +313,8 @@
314314 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>';
315315 $form .= '</tr>';
316316 $form .= '<tr>';
317 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-email-receipt' ), 'emailAdd' ) . '</td>';
318 - $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
 317+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-email-receipt' ), 'emailAdd' ) . '</td>';
 318+ $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
319319 '</td>';
320320 $form .= '</tr>';
321321
——@@ -344,9 +344,9 @@
345345 $form = Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
346346 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
347347 $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' );
348 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
349 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) );
350 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 348+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 349+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-alt' ) );
 350+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
351351 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
352352 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
353353 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/TwoStepTwoColumnPremiumUS.php
——@@ -15,12 +15,12 @@
1616 public function loadPlaceholders() {
1717 global $wgOut;
1818 // form placeholder values
19 - $first = wfMsg( 'payflowpro_gateway-donor-fname' );
20 - $last = wfMsg( 'payflowpro_gateway-donor-lname' );
21 - $street = wfMsg( 'payflowpro_gateway-donor-street' );
22 - $city = wfMsg( 'payflowpro_gateway-donor-city' );
23 - $zip = wfMsg( 'payflowpro_gateway-zip-code' );
24 - $email = wfMsg( 'payflowpro_gateway-donor-email' );
 19+ $first = wfMsg( 'donate_interface-donor-fname' );
 20+ $last = wfMsg( 'donate_interface-donor-lname' );
 21+ $street = wfMsg( 'donate_interface-donor-street' );
 22+ $city = wfMsg( 'donate_interface-donor-city' );
 23+ $zip = wfMsg( 'donate_interface-zip-code' );
 24+ $email = wfMsg( 'donate_interface-donor-email' );
2525 $js = <<<EOT
2626 <script type="text/javascript">
2727 function loadPlaceholders() {
——@@ -123,7 +123,7 @@
124124
125125 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
126126 $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) );
127 - $form .= wfMsg( 'payflowpro_gateway-shirt-size-2', $wgRequest->getText( 'size' ) );
 127+ $form .= wfMsg( 'donate_interface-shirt-size-2', $wgRequest->getText( 'size' ) );
128128 $form .= Xml::closeElement( 'div' ); // close div#premium-confirmation
129129
130130 $form .= Xml::closeElement( 'td' );
——@@ -133,7 +133,7 @@
134134 // add noscript tags for javascript disabled browsers
135135 $form .= $this->getNoScript();
136136
137 - $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'payflowpro_gateway-please-complete' ) );
 137+ $form .= Xml::tags( 'h2', array( 'id' => 'donate-head' ), wfMsg( 'donate_interface-please-complete' ) );
138138
139139 // provide a place at the top of the form for displaying general messages
140140 if ( $this->form_errors['general'] ) {
——@@ -183,12 +183,12 @@
184184 $form .= '<td colspan="2">';
185185 $form .= '<table cellspacing="0" cellpadding="4" border="1" id="donation_amount">';
186186 $form .= '<tr>';
187 - $form .= '<td class="amount_header">'.wfMsg( 'payflowpro_gateway-description' ).'</td>';
188 - $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'payflowpro_gateway-donor-amount' ).'</td>';
189 - $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'payflowpro_gateway-donor-currency-label' ).'</td>';
 187+ $form .= '<td class="amount_header">'.wfMsg( 'donate_interface-description' ).'</td>';
 188+ $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'donate_interface-donor-amount' ).'</td>';
 189+ $form .= '<td class="amount_header" style="text-align:right;width:75px;">'.wfMsg( 'donate_interface-donor-currency-label' ).'</td>';
190190 $form .= '</tr>';
191191 $form .= '<tr>';
192 - $form .= '<td class="amount_data">'.wfMsg( 'payflowpro_gateway-donation' ).'</td>';
 192+ $form .= '<td class="amount_data">'.wfMsg( 'donate_interface-donation' ).'</td>';
193193 $form .= '<td class="amount_data" style="text-align:right;width:75px;">'.$this->form_data['amount'] .
194194 Html::hidden( 'amount', $this->form_data['amount'] ) .
195195 '</td>';
——@@ -201,7 +201,7 @@
202202 $form .= '</tr>';
203203
204204 $form .= '<tr>';
205 - $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'payflowpro_gateway-cc-form-header-personal' ) .
 205+ $form .= '<td colspan="2"><h3 class="cc_header">' . wfMsg( 'donate_interface-cc-form-header-personal' ) .
206206 Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/gateway_forms/includes/padlock.gif", 'style' => 'vertical-align:baseline;margin-left:8px;' ) ) . '</h3></td>';
207207 $form .= '</tr>';
208208
——@@ -229,14 +229,14 @@
230230 $form .= '</tr>';
231231 }
232232 $form .= '<tr>';
233 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-card-num' ), 'card_num' ) . '</td>';
 233+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-card-num' ), 'card_num' ) . '</td>';
234234 $form .= '<td>' . Xml::input( 'card_num', '30', $card_num, array( 'type' => 'text', 'maxlength' => '100', 'id' => 'card_num', 'class' => 'fullwidth', 'autocomplete' => 'off' ) ) .
235235 '</td>';
236236 $form .= '</tr>';
237237
238238 // expiry
239239 $form .= '<tr>';
240 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-donor-expiration' ), 'expiration' ) . '</td>';
 240+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-donor-expiration' ), 'expiration' ) . '</td>';
241241 $form .= '<td>' . $this->generateExpiryMonthDropdown() . ' / ' . $this->generateExpiryYearDropdown() . '</td>';
242242 $form .= '</tr>';
243243
——@@ -251,9 +251,9 @@
252252 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['lname'] . '</span></td>';
253253 $form .= '</tr>';
254254 $form .= '<tr>';
255 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-name-on-card' ), 'fname' ) . '</td>';
256 - $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' ) ) .
257 - Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
 255+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-name-on-card' ), 'fname' ) . '</td>';
 256+ $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' ) ) .
 257+ Xml::input( 'lname', '30', $this->form_data['lname'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-lname' ).'\' )', 'maxlength' => '25', 'id' => 'lname' ) ) . '</td>';
258258 $form .= "</tr>";
259259
260260 // street
——@@ -261,8 +261,8 @@
262262 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['street'] . '</span></td>';
263263 $form .= '</tr>';
264264 $form .= '<tr>';
265 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-billing-address' ), 'street' ) . '</td>';
266 - $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
 265+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-billing-address' ), 'street' ) . '</td>';
 266+ $form .= '<td>' . Xml::input( 'street', '30', $this->form_data['street'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-street' ).'\' )', 'maxlength' => '100', 'id' => 'street', 'class' => 'fullwidth' ) ) .
267267 '</td>';
268268 $form .= '</tr>';
269269
——@@ -272,9 +272,9 @@
273273 $form .= '</tr>';
274274 $form .= '<tr>';
275275 $form .= '<td class="label"> </td>';
276 - $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
 276+ $form .= '<td>' . Xml::input( 'city', '18', $this->form_data['city'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-city' ).'\' )', 'maxlength' => '40', 'id' => 'city' ) ) . ' ' .
277277 $this->generateStateDropdown() . ' ' .
278 - Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
 278+ Xml::input( 'zip', '5', $this->form_data['zip'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-zip-code' ).'\' )', 'maxlength' => '10', 'id' => 'zip' ) ) .
279279 Html::hidden( 'country', 'US' ) .
280280 '</td>';
281281 $form .= '</tr>';
——@@ -293,8 +293,8 @@
294294 $form .= '<td colspan=2><span class="creditcard-error-msg">' . $this->form_errors['emailAdd'] . '</span></td>';
295295 $form .= '</tr>';
296296 $form .= '<tr>';
297 - $form .= '<td class="label">' . Xml::label( wfMsg( 'payflowpro_gateway-email-receipt' ), 'emailAdd' ) . '</td>';
298 - $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'payflowpro_gateway-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
 297+ $form .= '<td class="label">' . Xml::label( wfMsg( 'donate_interface-email-receipt' ), 'emailAdd' ) . '</td>';
 298+ $form .= '<td>' . Xml::input( 'emailAdd', '30', $this->form_data['email'], array( 'type' => 'text', 'onfocus' => 'clearField( this, \''.wfMsg( 'donate_interface-donor-email' ).'\' )', 'maxlength' => '64', 'id' => 'emailAdd', 'class' => 'fullwidth' ) ) .
299299 '</td>';
300300 $form .= '</tr>';
301301
——@@ -324,9 +324,9 @@
325325 $form = Xml::openElement( 'div', array( 'class' => 'payflow-cc-form-section', 'id' => 'payflowpro_gateway-donate-addl-info' ) );
326326 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-donate-addl-info-text' ) );
327327 $form .= Xml::tags( 'div', array( 'style' => 'text-align:center;' ), '* * *' );
328 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-credit-storage-processing' ) );
329 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-otherways-alt' ) );
330 - $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'payflowpro_gateway-question-comment' ) );
 328+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-credit-storage-processing' ) );
 329+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-otherways-alt' ) );
 330+ $form .= Xml::tags( 'div', array( 'class' => '' ), wfMsg( 'donate_interface-question-comment' ) );
331331 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info-text
332332 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-addl-info
333333 return $form;
Index: trunk/extensions/DonationInterface/gateway_forms/OneStepTwoColumn.php
——@@ -20,9 +20,9 @@
2121 public function loadPlaceholders() {
2222 global $wgOut;
2323 // form placeholder values
24 - $first = wfMsg( 'payflowpro_gateway-donor-fname' );
25 - $last = wfMsg( 'payflowpro_gateway-donor-lname' );
26 - $other = wfMsg( 'payflowpro_gateway-other' );
 24+ $first = wfMsg( 'donate_interface-donor-fname' );
 25+ $last = wfMsg( 'donate_interface-donor-lname' );
 26+ $other = wfMsg( 'donate_interface-other' );
2727 $js = <<<EOT
2828 <script type="text/javascript">
2929 function loadPlaceholders() {
——@@ -161,12 +161,12 @@
162162 $form .= Xml::openElement( 'div', array( 'id' => 'mw-donate-submit-button' ) );
163163 if ( $this->paypal ) {
164164 $form .= Html::hidden( 'PaypalRedirect', false );
165 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) );
 165+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-paypal-button' ), 'onclick' => 'document.payment.PaypalRedirect.value=\'true\';return true;', 'type' => 'submit' ) );
166166 } else {
167 - $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'payflowpro_gateway-cc-button' ), 'type' => 'submit' ) );
 167+ $form .= Xml::element( 'input', array( 'class' => 'button-plain', 'value' => wfMsg( 'donate_interface-cc-button' ), 'type' => 'submit' ) );
168168 $form .= Xml::closeElement( 'div' ); // close div#mw-donate-submit-button
169169 $form .= Xml::openElement( 'div', array( 'class' => 'mw-donate-submessage', 'id' => 'payflowpro_gateway-donate-submessage' ) ) .
170 - wfMsg( 'payflowpro_gateway-donate-click' );
 170+ wfMsg( 'donate_interface-donate-click' );
171171 }
172172 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-donate-submessage
173173 $form .= Xml::closeElement( 'div' ); // close div#payflowpro_gateway-form-submit
——@@ -211,13 +211,13 @@
212212 global $wgRequest, $wgScriptPath;
213213 $form = '';
214214 $form .= Xml::openElement( 'div', array( 'id' => 'payflowpro_gateway-personal-info' ) );
215 - $form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'payflowpro_gateway-make-your-donation' ) );
 215+ $form .= Xml::tags( 'h3', array( 'class' => 'payflow-cc-form-header', 'id' => 'payflow-cc-form-header-personal' ), wfMsg( 'donate_interface-make-your-donation' ) );
216216 if ( !$this->paypal ) {
217217 $source = htmlspecialchars( $wgRequest->getText( 'utm_source' ) );
218218 $medium = htmlspecialchars( $wgRequest->getText( 'utm_medium' ) );
219219 $campaign = htmlspecialchars( $wgRequest->getText( 'utm_campaign' ) );
220220 $formname = htmlspecialchars( $wgRequest->getText( 'form_name' ) );
221 - $form .= Xml::Tags( 'p', array( 'id' => 'payflowpro_gateway-cc_otherways' ), wfMsg( 'payflowpro_gateway-paypal', $wgScriptPath, $formname, $source, $medium, $campaign ) );
 221+ $form .= Xml::Tags( 'p', array( 'id' => 'payflowpro_gateway-cc_otherways' ), wfMsg( 'donate_interface-paypal', $wgScriptPath, $formname, $source, $medium, $campaign ) );
222222 }
223223 $form .= Xml::openElement( 'table', array( 'id' => 'payflow-table-donor' ) );
224224

Status & tagging log