http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76423
Revision: 76423
Author: kaldari
Date: 2010-11-10 01:54:22 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
updates for Tuesday test
Modified Paths:
--------------
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php
trunk/extensions/DonationInterface/payflowpro_gateway/includes/stateAbbreviations.inc
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.us-states.i18n.php
Modified:
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
===================================================================
---
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
2010-11-10 01:27:56 UTC (rev 76422)
+++
trunk/extensions/DonationInterface/donate_interface/donate_interface.i18n.php
2010-11-10 01:54:22 UTC (rev 76423)
@@ -21,7 +21,7 @@
'donate_interface-comment-message' => 'Have a thought to share with the
world? Put up to 200 characters here:',
'donate_interface-comment-label' => 'Comment:',
'donate_interface-anon-message' => 'Please list my name (next to my
comment) on the public donor list.',
- 'donate_interface-email-agreement' => "I agree to receive future
Wikimedia Foundation newsletters or e-mails.",
+ 'donate_interface-email-agreement' => "I agree to receive occasional
updates from the Wikimedia Foundation.",
'donate_interface-comment-title' => 'Public comment',
'donate_interface-big-amount-display' => '$100',
'donate_interface-medium-amount-display' => '$75',
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php
2010-11-10 01:27:56 UTC (rev 76422)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/forms/TwoColumnLetter5.php
2010-11-10 01:54:22 UTC (rev 76423)
@@ -119,6 +119,19 @@
// email
$form .= $this->getEmailField();
+
+ // email opt-in
+ $email_opt_value = ( $wgRequest->wasPosted() ) ?
$this->form_data[ 'email-opt' ] : true;
+ $form .= '<tr>';
+ $form .= '<td class="label"> </td>';
+ $form .= '<td class="check-option">' . Xml::check( 'email-opt',
$email_opt_value );
+ $form .= ' ';
+ // put the label inside Xml::openElement so any HTML in the msg
might get rendered (right, Germany?)
+ $form .= Xml::openElement( 'label', array( 'for' => 'email-opt'
) );
+ $form .= wfMsg( 'donate_interface-email-agreement' );
+ $form .= Xml::closeElement( 'label' );
+ $form .= '</td>';
+ $form .= '</tr>';
$form .= '<tr>';
$form .= '<td class="label">' . wfMsg(
'payflowpro_gateway-payment-type' ) . '</td>';
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/includes/stateAbbreviations.inc
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/includes/stateAbbreviations.inc
2010-11-10 01:27:56 UTC (rev 76422)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/includes/stateAbbreviations.inc
2010-11-10 01:54:22 UTC (rev 76423)
@@ -5,7 +5,7 @@
*/
function statesMenuXML() {
$states = array(
- 'YY' => '-Select a State-',
+ 'YY' => 'Select a State',
'XX' => 'Outside the U.S.',
'AK' => 'Alaska',
'AL' => 'Alabama',
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
2010-11-10 01:27:56 UTC (rev 76422)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
2010-11-10 01:54:22 UTC (rev 76423)
@@ -195,7 +195,7 @@
'payflowpro_gateway-payment-type' => 'Payment type',
// For more USA states, see payflowpro_gateway.us-states.i18n.php.
- 'payflowpro_gateway-state-dropdown-YY' => 'Select a State...',
+ 'payflowpro_gateway-state-dropdown-YY' => 'Select a State',
'payflowpro_gateway-state-dropdown-XX' => 'Outside the U.S.',
);
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.us-states.i18n.php
===================================================================
---
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.us-states.i18n.php
2010-11-10 01:27:56 UTC (rev 76422)
+++
trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.us-states.i18n.php
2010-11-10 01:54:22 UTC (rev 76423)
@@ -11,7 +11,7 @@
/** English */
$messages['en'] = array(
// Below two messages are in payflowpro_gateway.i18n.php.
- //'payflowpro_gateway-state-dropdown-YY' => 'Select a State-',
+ //'payflowpro_gateway-state-dropdown-YY' => 'Select a State',
//'payflowpro_gateway-state-dropdown-XX' => 'Outside the U.S.',
'payflowpro_gateway-state-dropdown-AK' => 'Alaska',
'payflowpro_gateway-state-dropdown-AL' => 'Alabama',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
