r78146 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78145‎ | r78146 | r78147 >
Date:21:48, 9 December 2010
Author:awjrichards
Status:deferred
Tags:
Comment:
Syncing from r78135 thru r78145 of trunk
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking.i18n.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking_body.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking_body.php
@@ -111,7 +111,6 @@
112112
113113 // PayPal
114114 $repost['business'] = $wgContributionTrackingPayPalBusiness;
115 - $repost['item_name'] = 'One-time donation';
116115 $repost['item_number'] = 'DONATE';
117116 $repost['no_note'] = '0';
118117 $repost['return'] = $returnto;
@@ -132,9 +131,11 @@
133132 $repost[ 'cmd' ] = '_xclick-subscriptions';
134133 $amount_field_name = 'a3';
135134 $repost['notify_url'] = $wgContributionTrackingPayPalRecurringIPN;
 135+ $repost['item_name'] = $this->msg( 'contrib-tracking-item-name-recurring' );
136136 } else {
137137 $repost['cmd'] = '_xclick';
138138 $repost['notify_url'] = $wgContributionTrackingPayPalIPN;
 139+ $repost['item_name'] = $this->msg( 'contrib-tracking-item-name-onetime' );
139140 }
140141 }
141142 else if ( $gateway == 'moneybookers' ) {
Index: branches/wmf/1.16wmf4/extensions/ContributionTracking/ContributionTracking.i18n.php
@@ -24,6 +24,9 @@
2525
2626 'contrib-tracking-button' => 'Continue',
2727
 28+ 'contrib-tracking-item-name-onetime' => 'One-time donation',
 29+ 'contrib-tracking-item-name-recurring' => 'Recurring monthly donation',
 30+
2831 );
2932
3033 /** Message documentation (Message documentation)
Property changes on: branches/wmf/1.16wmf4/extensions/ContributionTracking
___________________________________________________________________
Modified: svn:mergeinfo
3134 Merged /trunk/extensions/ContributionTracking:r78135-78145

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r78135Bug fixesyaron20:07, 9 December 2010
r78145Updating msg invocation to use escaped str rather than wikitextawjrichards21:45, 9 December 2010

Status & tagging log