http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96683
Revision: 96683
Author: kaldari
Date: 2011-09-09 19:02:47 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
using wgExtensionAssetsPath, changing confusing card error to card_type error
Modified Paths:
--------------
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
Modified:
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/gateway_forms/RapidHtml.php
2011-09-09 19:02:47 UTC (rev 96683)
@@ -28,7 +28,7 @@
'@zip', // => $wgRequest->getText( 'zip' ),
'@country', // => $wgRequest->getText( 'country' ),
'@card_num', // => str_replace( ' ', '', $wgRequest->getText(
'card_num' ) ),
- '@card', // => $wgRequest->getText( 'card' ),
+ '@card_type', // => $wgRequest->getText( 'card_type' ),
'@expiration', // => $wgRequest->getText( 'mos' ) . substr(
$wgRequest->getText( 'year' ), 2, 2 ),
'@cvv', // => $wgRequest->getText( 'cvv' ),
'@currency_code', //'currency' => $wgRequest->getText(
'currency_code' ),
@@ -67,7 +67,7 @@
'#retryMsg',
'#amount',
'#card_num',
- '#card',
+ '#card_type',
'#cvv',
'#fname',
'#lname',
Modified:
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
===================================================================
---
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test.html
2011-09-09 19:02:47 UTC (rev 96683)
@@ -140,7 +140,7 @@
</td>
</tr>
<tr>
- <td colspan="2"><span
class="creditcard-error-msg">#card#card_num</span></td>
+ <td colspan="2"><span
class="creditcard-error-msg">#card_num</span></td>
</tr>
<tr>
<td class="label"><label for="card_num">Card
number</label></td>
Modified:
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
===================================================================
---
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/gateway_forms/html/globalcollect_test_2.html
2011-09-09 19:02:47 UTC (rev 96683)
@@ -172,7 +172,7 @@
</td>
</tr>
<tr>
- <td colspan=2><span
class="creditcard-error-msg">#card#card_num</span></td>
+ <td colspan=2><span
class="creditcard-error-msg">#card_num</span></td>
<tr>
<tr>
<td class="label"><label for="card_num">Card
number</label></td>
Modified:
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
2011-09-09 19:02:47 UTC (rev 96683)
@@ -54,11 +54,11 @@
* @param $par Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgRequest, $wgOut, $wgScriptPath,
+ global $wgRequest, $wgOut, $wgExtensionAssetsPath,
$wgPayFlowProGatewayCSSVersion;
$wgOut->addExtensionStyle(
-
"{$wgScriptPath}/extensions/DonationInterface/gateway_forms/css/gateway.css?284"
.
+ $wgExtensionAssetsPath .
'/DonationInterface/gateway_forms/css/gateway.css?284' .
$wgPayFlowProGatewayCSSVersion );
$scriptVars = array(
@@ -73,6 +73,7 @@
'globalcollectGatewayErrorMsgState' => wfMsg(
'globalcollect_gateway-error-msg-state' ),
'globalcollectGatewayErrorMsgZip' => wfMsg(
'globalcollect_gateway-error-msg-zip' ),
'globalcollectGatewayErrorMsgCountry' => wfMsg(
'globalcollect_gateway-error-msg-country' ),
+ 'globalcollectGatewayErrorMsgCardType' => wfMsg(
'globalcollect_gateway-error-msg-card_type' ),
'globalcollectGatewayErrorMsgCardNum' => wfMsg(
'globalcollect_gateway-error-msg-card_num' ),
'globalcollectGatewayErrorMsgExpiration' => wfMsg(
'globalcollect_gateway-error-msg-expiration' ),
'globalcollectGatewayErrorMsgCvv' => wfMsg(
'globalcollect_gateway-error-msg-cvv' ),
@@ -586,7 +587,7 @@
'retryMsg' => '',
'invalidamount' => '',
'card_num' => '',
- 'card' => '',
+ 'card_type' => '',
'cvv' => '',
'fname' => '',
'lname' => '',
Modified:
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
2011-09-09 19:02:47 UTC (rev 96683)
@@ -70,6 +70,7 @@
'payflowproGatewayErrorMsgState' => wfMsg(
'payflowpro_gateway-error-msg-state' ),
'payflowproGatewayErrorMsgZip' => wfMsg(
'payflowpro_gateway-error-msg-zip' ),
'payflowproGatewayErrorMsgCountry' => wfMsg(
'payflowpro_gateway-error-msg-country' ),
+ 'payflowproGatewayErrorMsgCardType' => wfMsg(
'payflowpro_gateway-error-msg-card_type' ),
'payflowproGatewayErrorMsgCardNum' => wfMsg(
'payflowpro_gateway-error-msg-card_num' ),
'payflowproGatewayErrorMsgExpiration' => wfMsg(
'payflowpro_gateway-error-msg-expiration' ),
'payflowproGatewayErrorMsgCvv' => wfMsg(
'payflowpro_gateway-error-msg-cvv' ),
@@ -966,7 +967,7 @@
'size' => 'small',
'premium_language' => 'es',
'card_num' => $card_nums[ $cards[ $card_index
]][ $card_num_index ],
- 'card' => $cards[ $card_index ],
+ 'card_type' => $cards[ $card_index ],
'expiration' => date( 'my', strtotime( '+1 year
1 month' ) ),
'cvv' => '001',
'currency' => 'USD',
@@ -1019,7 +1020,7 @@
'size' => $wgRequest->getText( 'size' ),
'premium_language' => $wgRequest->getText(
'premium_language', "en" ),
'card_num' => str_replace( ' ', '',
$wgRequest->getText( 'card_num' ) ),
- 'card' => $wgRequest->getText( 'card' ),
+ 'card_type' => $wgRequest->getText( 'card_type'
),
'expiration' => $wgRequest->getText( 'mos' ) .
substr( $wgRequest->getText( 'year' ), 2, 2 ),
'cvv' => $wgRequest->getText( 'cvv' ),
'currency' => $wgRequest->getText(
'currency_code' ),
@@ -1073,7 +1074,7 @@
'retryMsg' => '',
'invalidamount' => '',
'card_num' => '',
- 'card' => '',
+ 'card_type' => '',
'cvv' => '',
'fname' => '',
'lname' => '',
Modified:
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
===================================================================
---
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
2011-09-09 19:01:44 UTC (rev 96682)
+++
branches/fundraising/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
2011-09-09 19:02:47 UTC (rev 96683)
@@ -63,6 +63,7 @@
'payflowpro_gateway-error-msg-state' => 'state',
'payflowpro_gateway-error-msg-zip' => 'postal code',
'payflowpro_gateway-error-msg-country' => 'country',
+ 'payflowpro_gateway-error-msg-card_type' => 'credit card type',
'payflowpro_gateway-error-msg-card_num' => 'credit card number',
'payflowpro_gateway-error-msg-expiration' => "card's expiration date",
'payflowpro_gateway-error-msg-cvv' => 'CVV from the back of your card',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
