r100729 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r100728‎ | r100729 | r100730 >
Date:19:03, 25 October 2011
Author:kaldari
Status:resolved (Comments)
Tags:fundraising 
Comment:
step 2 of i18n message migration, this will break lots of forms, which I need to fix. Also making form error messages available thru resourceloader module, and fixing up some of the js for the webitects form that it calls the API whenever data has been updated.
Modified paths:
  • /trunk/extensions/DonationInterface/donationinterface.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_common/interface.i18n.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.alias.php (added) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/donationinterface.php
——@@ -512,11 +512,39 @@
513513 'remoteExtPath' => 'DonationInterface/gateway_forms',
514514 );
515515
 516+$wgResourceModules[ 'ext.donationInterface.errorMessages' ] = array(
 517+ 'messages' => array(
 518+ 'donate_interface-error-msg-js',
 519+ 'donate_interface-error-msg-invalid-amount',
 520+ 'donate_interface-error-msg-email',
 521+ 'donate_interface-error-msg-card-num',
 522+ 'donate_interface-error-msg-amex',
 523+ 'donate_interface-error-msg-mc',
 524+ 'donate_interface-error-msg-visa',
 525+ 'donate_interface-error-msg-discover',
 526+ 'donate_interface-error-msg-amount',
 527+ 'donate_interface-error-msg-emailAdd',
 528+ 'donate_interface-error-msg-fname',
 529+ 'donate_interface-error-msg-lname',
 530+ 'donate_interface-error-msg-street',
 531+ 'donate_interface-error-msg-city',
 532+ 'donate_interface-error-msg-state',
 533+ 'donate_interface-error-msg-zip',
 534+ 'donate_interface-error-msg-country',
 535+ 'donate_interface-error-msg-card_type',
 536+ 'donate_interface-error-msg-card_num',
 537+ 'donate_interface-error-msg-expiration',
 538+ 'donate_interface-error-msg-cvv',
 539+ 'donate_interface-error-msg-captcha',
 540+ 'donate_interface-error-msg-captcha-please',
 541+ )
 542+);
 543+
516544 // form validation resource
517545 //TODO: Move this somewhere gateway-agnostic.
518546 $wgResourceModules[ 'pfp.form.core.validate' ] = array(
519547 'scripts' => 'validate_input.js',
520 - 'dependencies' => 'pfp.form.core.pfp_css',
 548+ 'dependencies' => array( 'pfp.form.core.pfp_css', 'ext.donationInterface.errorMessages' ),
521549 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
522550 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
523551 );
——@@ -527,8 +555,14 @@
528556 'scripts' => 'form_placeholders.js',
529557 'dependencies' => 'pfp.form.core.validate',
530558 'messages' => array(
531 - 'payflowpro_gateway-donor-fname',
532 - 'payflowpro_gateway-donor-lname'
 559+ 'donate_interface-donor-fname',
 560+ 'donate_interface-donor-lname',
 561+ 'donate_interface-donor-street',
 562+ 'donate_interface-donor-city',
 563+ 'donate_interface-donor-state',
 564+ 'donate_interface-donor-postal',
 565+ 'donate_interface-donor-country',
 566+ 'donate_interface-donor-address',
533567 ),
534568 'localBasePath' => $donationinterface_dir . 'payflowpro_gateway',
535569 'remoteExtPath' => 'DonationInterface/payflowpro_gateway',
——@@ -572,8 +606,8 @@
573607 //GlobalCollect gateway magical globals
574608 //TODO: all the bits where we make the i18n make sense for multiple gateways. This is clearly less than ideal.
575609 if ( $optionalParts['GlobalCollect'] === true ){
576 - $wgExtensionMessagesFiles['GlobalCollectGateway'] = $donationinterface_dir . 'payflowpro_gateway/payflowpro_gateway.i18n.php';
577 - $wgExtensionAliasesFiles['GlobalCollectGateway'] = $donationinterface_dir . 'payflowpro_gateway/payflowpro_gateway.alias.php';
 610+ $wgExtensionMessagesFiles['GlobalCollectGateway'] = $donationinterface_dir . 'globalcollect_gateway/globalcollect_gateway.i18n.php';
 611+ $wgExtensionAliasesFiles['GlobalCollectGateway'] = $donationinterface_dir . 'globalcollect_gateway/globalcollect_gateway.alias.php';
578612 }
579613
580614 //PayflowPro gateway magical globals
Index: trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
——@@ -13,9 +13,7 @@
1414 })(jQuery);
1515
1616 window.formCheck = function( ccform ) {
17 - var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'Zip', 'CardNum', 'Cvv' ];
18 -
19 - var fields = ["emailAdd","fname","lname","street","city","zip","card_num","cvv" ],
 17+ var fields = ['emailAdd','fname','lname','street','city','zip','card_num','cvv' ],
2018 numFields = fields.length,
2119 i,
2220 output = '',
——@@ -23,20 +21,20 @@
2422
2523 for( i = 0; i < numFields; i++ ) {
2624 if( document.getElementById( fields[i] ).value == '' ) {
27 - currField = window['payflowproGatewayErrorMsg'+ msg[i]];
28 - output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\r\n';
 25+ currField = mw.msg( 'donate_interface-error-msg-' + fields[i] );
 26+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + currField + '.\r\n';
2927 }
3028 }
3129
3230 if (document.getElementById('fname').value == '$first') {
33 - output += payflowproGatewayErrorMsgJs + ' first name.\r\n';
 31+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' first name.\r\n';
3432 }
3533 if (document.getElementById('lname').value == '$last') {
36 - output += payflowproGatewayErrorMsgJs + ' last name.\r\n';
 34+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' last name.\r\n';
3735 }
3836 var countryField = document.getElementById( 'country' );
3937 if( countryField.options[countryField.selectedIndex].value == '' ) {
40 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgCountry'] + '.\r\n';
 38+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
4139 }
4240
4341 // validate email address
——@@ -44,7 +42,7 @@
4543 var dotpos = document.payment.emailAdd.value.lastIndexOf(".");
4644
4745 if( apos < 1 || dotpos-apos < 2 ) {
48 - output += payflowproGatewayErrorMsgEmail;
 46+ output += mw.msg( 'donate_interface-error-msg-email' );
4947 }
5048
5149 if( output ) {
Index: trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
——@@ -52,29 +52,28 @@
5353 var output = '';
5454 var currField = '';
5555 var i = 0;
56 - var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'Zip'];
5756 var fields = [ "emailAdd","fname","lname","street","city","zip" ],
5857 numFields = fields.length;
5958 for( i = 0; i < numFields; i++ ) {
6059 if( document.getElementById( fields[i] ).value == '' ) {
61 - currField = window['payflowproGatewayErrorMsg'+ msg[i]];
62 - output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\r\n';
 60+ currField = mw.msg( 'donate_interface-error-msg-' + fields[i] );
 61+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + currField + '.\r\n';
6362 }
6463 }
6564 var stateField = document.getElementById( 'state' );
6665 var countryField = document.getElementById( 'country' );
6766 if( stateField.options[stateField.selectedIndex].value == 'YY' ) {
68 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgState'] + '.\r\n';
 67+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
6968 }
7069
7170 if( countryField.type == "select" ){ // country is a dropdown select
7271 if( countryField.options[countryField.selectedIndex].value == '' ) {
73 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgCountry'] + '.\r\n';
 72+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
7473 }
7574 }
7675 else{ // country is a hidden or text input
7776 if( countryField.value == '' ) {
78 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgCountry'] + '.\r\n';
 77+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
7978 }
8079 }
8180
——@@ -88,7 +87,7 @@
8988 var dotpos = form.emailAdd.value.lastIndexOf(".");
9089
9190 if( apos < 1 || dotpos-apos < 2 ) {
92 - output += payflowproGatewayErrorMsgEmail;
 91+ output += mw.msg( 'donate_interface-error-msg-email' );
9392 }
9493
9594 if( output ) {
——@@ -107,33 +106,29 @@
108107 var output = '';
109108 var currField = '';
110109 var i = 0;
111 - var msg = [ 'EmailAdd', 'Fname', 'Lname', 'Street', 'City', 'Zip', 'CardNum', 'Cvv' ];
112110 var fields = ["emailAdd","fname","lname","street","city","zip","card_num","cvv" ],
113111 numFields = fields.length;
114112 for( i = 0; i < numFields; i++ ) {
115113 if( document.getElementById( fields[i] ).value == '' ) {
116 - currField = window['payflowproGatewayErrorMsg'+ msg[i]];
117 - output += payflowproGatewayErrorMsgJs + ' ' + currField + '.\r\n';
 114+ currField = mw.msg( 'donate_interface-error-msg-' + fields[i] );
 115+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + currField + '.\r\n';
118116 }
119117 }
120118 var stateField = document.getElementById( 'state' );
121119 var countryField = document.getElementById( 'country' );
122120 if( stateField.options[stateField.selectedIndex].value == 'YY' ) {
123 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgState'] + '.\r\n';
 121+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
124122 }
125 - // output += "State:" + stateField.options[stateField.selectedIndex].value + '.\r\n';
126123
127124 if( countryField.type == "select" ){ // country is a dropdown select
128125 if( countryField.options[countryField.selectedIndex].value == '' ) {
129 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgCountry'] + '.\r\n';
 126+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
130127 }
131 - // output += "Country:" + countryField.options[countryField.selectedIndex].value + '.\r\n';
132128 }
133129 else{ // country is a hidden or text input
134130 if( countryField.value == '' ) {
135 - output += payflowproGatewayErrorMsgJs + ' ' + window['payflowproGatewayErrorMsgCountry'] + '.\r\n';
 131+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
136132 }
137 - // output += "Country:" + countryField.value + '.\r\n';
138133 }
139134
140135 //set state to "outside us"
——@@ -146,7 +141,7 @@
147142 var dotpos = form.emailAdd.value.lastIndexOf(".");
148143
149144 if( apos < 1 || dotpos-apos < 2 ) {
150 - output += payflowproGatewayErrorMsgEmail;
 145+ output += mw.msg( 'donate_interface-error-msg-email' );
151146 }
152147
153148 if( output ) {
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
——@@ -201,35 +201,6 @@
202202 $wgOut->addHTML( '<p>' . $responseMsg );
203203 }
204204
205 - //TODO: Remember why the heck I decided to leave this here...
206 - //arguably, it's because it's slightly more "view" related, but... still, shouldn't you get stashed
207 - //in the new GatewayForm class so we can override in children if we feel like it? Odd.
208 - function addErrorMessageScript() {
209 - global $wgOut;
210 - $gateway_id = $this->adapter->getIdentifier();
211 -
212 - $scriptVars = array(
213 - $gateway_id . 'GatewayErrorMsgJs' => wfMsg( $gateway_id . '_gateway-error-msg-js' ),
214 - $gateway_id . 'GatewayErrorMsgEmail' => wfMsg( $gateway_id . '_gateway-error-msg-email' ),
215 - $gateway_id . 'GatewayErrorMsgAmount' => wfMsg( $gateway_id . '_gateway-error-msg-amount' ),
216 - $gateway_id . 'GatewayErrorMsgEmailAdd' => wfMsg( $gateway_id . '_gateway-error-msg-emailAdd' ),
217 - $gateway_id . 'GatewayErrorMsgFname' => wfMsg( $gateway_id . '_gateway-error-msg-fname' ),
218 - $gateway_id . 'GatewayErrorMsgLname' => wfMsg( $gateway_id . '_gateway-error-msg-lname' ),
219 - $gateway_id . 'GatewayErrorMsgStreet' => wfMsg( $gateway_id . '_gateway-error-msg-street' ),
220 - $gateway_id . 'GatewayErrorMsgCity' => wfMsg( $gateway_id . '_gateway-error-msg-city' ),
221 - $gateway_id . 'GatewayErrorMsgState' => wfMsg( $gateway_id . '_gateway-error-msg-state' ),
222 - $gateway_id . 'GatewayErrorMsgZip' => wfMsg( $gateway_id . '_gateway-error-msg-zip' ),
223 - $gateway_id . 'GatewayErrorMsgCountry' => wfMsg( $gateway_id . '_gateway-error-msg-country' ),
224 - $gateway_id . 'GatewayErrorMsgCardType' => wfMsg( $gateway_id . '_gateway-error-msg-card_type' ),
225 - $gateway_id . 'GatewayErrorMsgCardNum' => wfMsg( $gateway_id . '_gateway-error-msg-card_num' ),
226 - $gateway_id . 'GatewayErrorMsgExpiration' => wfMsg( $gateway_id . '_gateway-error-msg-expiration' ),
227 - $gateway_id . 'GatewayErrorMsgCvv' => wfMsg( $gateway_id . '_gateway-error-msg-cvv' ),
228 - $gateway_id . 'GatewayCVVExplain' => wfMsg( $gateway_id . '_gateway-cvv-explain' ),
229 - );
230 -
231 - $wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) );
232 - }
233 -
234205 }
235206
236207 // end class
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
——@@ -11,7 +11,6 @@
1212 /** English */
1313 $messages['en'] = array(
1414 'payflowprogateway' => 'Make your donation now',
15 - 'globalcollectgateway' => 'Make your donation now',
1615 'payflowpro_gateway-desc' => 'PayPal Payflow Pro credit card processing',
1716 'payflowpro_gateway-response-0' => 'Your transaction has been approved.
1817 Thank you for your donation!',
Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.alias.php
——@@ -0,0 +1,13 @@
 2+<?php
 3+
 4+$specialPageAliases = array();
 5+
 6+/** English */
 7+$specialPageAliases['en'] = array(
 8+ 'GlobalCollectGateway' => array( 'GlobalCollectGateway' ),
 9+);
 10+
 11+/**
 12+ * For backwards compatibility with MediaWiki 1.15 and earlier.
 13+ */
 14+$aliases =& $specialPageAliases;
\ No newline at end of file
Index: trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects_2_3step.js
——@@ -71,71 +71,20 @@
7272 // set the action to go to PayPal
7373 $( 'input[name="gateway"]' ).val( "paypal" );
7474 $( 'input[name="PaypalRedirect"]' ).val( "1" );
75 - $( "#loading" ).html( "<img src=" + scriptPath + "'/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/images/loading-white.gif' /> Redirecting to PayPal…" );
 75+ $( "#loading" ).html( '<img alt="loading" src="'+mw.config.get( 'wgScriptPath' )+'/extensions/DonationInterface/gateway_forms/includes/loading-white.gif" /> Redirecting to PayPal…' );
7676 document.paypalcontribution.action = actionURL;
7777 document.paypalcontribution.submit();
7878 }
7979 } );
8080 $( "#paymentContinueBtn" ).live( "click", function() {
8181 if ( validate_personal( document.paypalcontribution ) ) {
82 - showStep3();
 82+ displayCreditCardForm()
8383 }
8484 } );
8585 // Set the cards to progress to step 3
8686 $( ".cardradio" ).live( "click", function() {
8787 if ( validate_personal( document.paypalcontribution ) ) {
88 - $( '#payment' ).empty();
89 - // Load wait spinner
90 - $( '#payment' ).append( '<br/><br/><br/><img alt="loading" src="'+mw.config.get( 'wgScriptPath' )+'/extensions/DonationInterface/gateway_forms/includes/loading-white.gif" />' );
91 - showStep3(); // Open the 3rd section
92 - var language = 'en'; // default value is English
93 - var matches = document.location.href.match(/uselang=(\w+)/i); // fine the real language
94 - if ( matches[1] ) {
95 - language = matches[1];
96 - }
97 - var sendData = {
98 - 'action': 'donate',
99 - 'gateway': 'globalcollect',
100 - 'currency': 'USD',
101 - 'amount': $( "input[name='amount']" ).val(),
102 - 'fname': $( "input[name='fname']" ).val(),
103 - 'lname': $( "input[name='lname']" ).val(),
104 - 'street': $( "input[name='street']" ).val(),
105 - 'city': $( "input[name='city']" ).val(),
106 - 'state': $( "input[name='state']" ).val(),
107 - 'zip': $( "input[name='zip']" ).val(),
108 - 'emailAdd': $( "input[name='emailAdd']" ).val(),
109 - 'country': $( "input[name='country']" ).val(),
110 - 'payment_method': 'card',
111 - 'language': language,
112 - 'card_type': $( "input[name='cardtype']" ).val().toLowerCase(),
113 - 'format': 'json'
114 - };
115 -
116 - $.ajax( {
117 - 'url': mw.util.wikiScript( 'api' ),
118 - 'data': sendData,
119 - 'dataType': 'json',
120 - 'type': 'GET',
121 - 'success': function( data ) {
122 - if ( data.result.errors ) {
123 - var errors = new Array();
124 - $.each( data.result.errors, function( index, value ) {
125 - alert( value );
126 - } );
127 - } else {
128 - if ( data.result.formaction ) {
129 - $( '#payment' ).empty();
130 - // Insert the iframe into the form
131 - $( '#payment' ).append(
132 - '<iframe src="'+data.result.formaction+'" width="318" height="300" frameborder="0"></iframe>'
133 - );
134 -
135 - }
136 - }
137 - }
138 - } );
139 -
 88+ displayCreditCardForm()
14089 }
14190 else {
14291 // show the continue button to indicate how to get to step 3 since they
——@@ -165,7 +114,7 @@
166115 showStep2();
167116 } );
168117 $( "#step3header" ).click( function() {
169 - showStep3();
 118+ displayCreditCardForm();
170119 } );
171120 // Set selected amount to amount
172121 $( 'input[name="amountRadio"]' ).click( function() {
——@@ -184,6 +133,60 @@
185134
186135 } );
187136
 137+function displayCreditCardForm() {
 138+ $( '#payment' ).empty();
 139+ // Load wait spinner
 140+ $( '#payment' ).append( '<br/><br/><br/><img alt="loading" src="'+mw.config.get( 'wgScriptPath' )+'/extensions/DonationInterface/gateway_forms/includes/loading-white.gif" />' );
 141+ showStep3(); // Open the 3rd section
 142+ var language = 'en'; // default value is English
 143+ var matches = document.location.href.match(/uselang=(\w+)/i); // fine the real language
 144+ if ( matches[1] ) {
 145+ language = matches[1];
 146+ }
 147+ var sendData = {
 148+ 'action': 'donate',
 149+ 'gateway': 'globalcollect',
 150+ 'currency': 'USD',
 151+ 'amount': $( "input[name='amount']" ).val(),
 152+ 'fname': $( "input[name='fname']" ).val(),
 153+ 'lname': $( "input[name='lname']" ).val(),
 154+ 'street': $( "input[name='street']" ).val(),
 155+ 'city': $( "input[name='city']" ).val(),
 156+ 'state': $( "input[name='state']" ).val(),
 157+ 'zip': $( "input[name='zip']" ).val(),
 158+ 'emailAdd': $( "input[name='emailAdd']" ).val(),
 159+ 'country': $( "input[name='country']" ).val(),
 160+ 'payment_method': 'card',
 161+ 'language': language,
 162+ 'card_type': $( "input[name='cardtype']" ).val().toLowerCase(),
 163+ 'format': 'json'
 164+ };
 165+
 166+ $.ajax( {
 167+ 'url': mw.util.wikiScript( 'api' ),
 168+ 'data': sendData,
 169+ 'dataType': 'json',
 170+ 'type': 'GET',
 171+ 'success': function( data ) {
 172+ if ( data.result.errors ) {
 173+ var errors = new Array();
 174+ $.each( data.result.errors, function( index, value ) {
 175+ alert( value );
 176+ } );
 177+ } else {
 178+ if ( data.result.formaction ) {
 179+ $( '#payment' ).empty();
 180+ // Insert the iframe into the form
 181+ $( '#payment' ).append(
 182+ '<iframe src="'+data.result.formaction+'" width="318" height="300" frameborder="0"></iframe>'
 183+ );
 184+
 185+ }
 186+ }
 187+ }
 188+ } );
 189+}
 190+
188191 function showStep1() {
189192 // show the correct sections
190193 $( "#step1wrapper" ).slideDown();
Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
——@@ -177,35 +177,6 @@
178178 }
179179 }
180180
181 - //TODO: Remember why the heck I decided to leave this here...
182 - //arguably, it's because it's slightly more "view" related, but... still, shouldn't you get stashed
183 - //in the new GatewayForm class so we can override in chlidren if we feel like it? Odd.
184 - function addErrorMessageScript() {
185 - global $wgOut;
186 - $gateway_id = $this->adapter->getIdentifier();
187 -
188 - $scriptVars = array(
189 - $gateway_id . 'GatewayErrorMsgJs' => wfMsg( $gateway_id . '_gateway-error-msg-js' ),
190 - $gateway_id . 'GatewayErrorMsgEmail' => wfMsg( $gateway_id . '_gateway-error-msg-email' ),
191 - $gateway_id . 'GatewayErrorMsgAmount' => wfMsg( $gateway_id . '_gateway-error-msg-amount' ),
192 - $gateway_id . 'GatewayErrorMsgEmailAdd' => wfMsg( $gateway_id . '_gateway-error-msg-emailAdd' ),
193 - $gateway_id . 'GatewayErrorMsgFname' => wfMsg( $gateway_id . '_gateway-error-msg-fname' ),
194 - $gateway_id . 'GatewayErrorMsgLname' => wfMsg( $gateway_id . '_gateway-error-msg-lname' ),
195 - $gateway_id . 'GatewayErrorMsgStreet' => wfMsg( $gateway_id . '_gateway-error-msg-street' ),
196 - $gateway_id . 'GatewayErrorMsgCity' => wfMsg( $gateway_id . '_gateway-error-msg-city' ),
197 - $gateway_id . 'GatewayErrorMsgState' => wfMsg( $gateway_id . '_gateway-error-msg-state' ),
198 - $gateway_id . 'GatewayErrorMsgZip' => wfMsg( $gateway_id . '_gateway-error-msg-zip' ),
199 - $gateway_id . 'GatewayErrorMsgCountry' => wfMsg( $gateway_id . '_gateway-error-msg-country' ),
200 - $gateway_id . 'GatewayErrorMsgCardType' => wfMsg( $gateway_id . '_gateway-error-msg-card_type' ),
201 - $gateway_id . 'GatewayErrorMsgCardNum' => wfMsg( $gateway_id . '_gateway-error-msg-card_num' ),
202 - $gateway_id . 'GatewayErrorMsgExpiration' => wfMsg( $gateway_id . '_gateway-error-msg-expiration' ),
203 - $gateway_id . 'GatewayErrorMsgCvv' => wfMsg( $gateway_id . '_gateway-error-msg-cvv' ),
204 - $gateway_id . 'GatewayCVVExplain' => wfMsg( $gateway_id . '_gateway-cvv-explain' ),
205 - );
206 -
207 - $wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) );
208 - }
209 -
210181 }
211182
212183 // end class
Index: trunk/extensions/DonationInterface/gateway_common/interface.i18n.php
——@@ -51,68 +51,67 @@
5252 'donate_interface-SEK' => 'SEK: Swedish Krona',
5353 'donate_interface-ILS' => 'ILS: Israeli Shekel',
5454
55 - // These messages will have their keys changed soon
56 - 'payflowpro_gateway-accessible' => 'This page is only accessible from the donation page.',
57 - 'payflowpro_gateway-paypal-button' => 'Donate via PayPal',
58 - 'payflowpro_gateway-cc-button' => 'Donate by Credit Card',
59 - 'payflowpro_gateway-donor-legend' => 'Donor information',
60 - 'payflowpro_gateway-card-legend' => 'Credit card information',
61 - 'payflowpro_gateway-amount-legend' => 'Donation amount',
62 - 'payflowpro_gateway-cvv-link' => 'Where is this?',
63 - 'payflowpro_gateway-donor-legend' => 'Donor information',
64 - 'payflowpro_gateway-donor-amount' => 'Amount',
65 - 'payflowpro_gateway-donor-currency-label' => 'Currency',
66 - 'payflowpro_gateway-donor-email' => 'Email address',
67 - 'payflowpro_gateway-donor-name' => 'Name',
68 - 'payflowpro_gateway-donor-fname' => 'First name',
69 - 'payflowpro_gateway-donor-mname' => 'Middle name',
70 - 'payflowpro_gateway-donor-lname' => 'Last name',
71 - 'payflowpro_gateway-donor-street' => 'Street',
72 - 'payflowpro_gateway-donor-city' => 'City',
73 - 'payflowpro_gateway-donor-state' => 'State',
74 - 'payflowpro_gateway-donor-postal' => 'Postal code',
75 - 'payflowpro_gateway-donor-country' => 'Country/Region',
76 - 'payflowpro_gateway-donor-address' => 'Address',
77 - 'payflowpro_gateway-donor-card' => 'Credit card',
78 - 'payflowpro_gateway-donor-card-num' => 'Card number',
79 - 'payflowpro_gateway-donor-expiration' => 'Expiration date',
80 - 'payflowpro_gateway-donor-security' => 'Security code',
81 - 'payflowpro_gateway-donor-submit' => 'Donate',
82 - 'payflowpro_gateway-donor-currency-msg' => 'This donation is being made in $1',
 55+ // Migrated messages
 56+ 'donate_interface-accessible' => 'This page is only accessible from the donation page.',
 57+ 'donate_interface-paypal-button' => 'Donate via PayPal',
 58+ 'donate_interface-cc-button' => 'Donate by Credit Card',
 59+ 'donate_interface-donor-legend' => 'Donor information',
 60+ 'donate_interface-card-legend' => 'Credit card information',
 61+ 'donate_interface-amount-legend' => 'Donation amount',
 62+ 'donate_interface-cvv-link' => 'Where is this?',
 63+ 'donate_interface-donor-legend' => 'Donor information',
 64+ 'donate_interface-donor-amount' => 'Amount',
 65+ 'donate_interface-donor-currency-label' => 'Currency',
 66+ 'donate_interface-donor-email' => 'Email address',
 67+ 'donate_interface-donor-name' => 'Name',
 68+ 'donate_interface-donor-fname' => 'First name',
 69+ 'donate_interface-donor-mname' => 'Middle name',
 70+ 'donate_interface-donor-lname' => 'Last name',
 71+ 'donate_interface-donor-street' => 'Street',
 72+ 'donate_interface-donor-city' => 'City',
 73+ 'donate_interface-donor-state' => 'State',
 74+ 'donate_interface-donor-postal' => 'Postal code',
 75+ 'donate_interface-donor-country' => 'Country/Region',
 76+ 'donate_interface-donor-address' => 'Address',
 77+ 'donate_interface-donor-card' => 'Credit card',
 78+ 'donate_interface-donor-card-num' => 'Card number',
 79+ 'donate_interface-donor-expiration' => 'Expiration date',
 80+ 'donate_interface-donor-security' => 'Security code',
 81+ 'donate_interface-donor-submit' => 'Donate',
 82+ 'donate_interface-donor-currency-msg' => 'This donation is being made in $1',
8383 'payflow_gateway-card-name-amex' => 'American Express',
8484 'payflow_gateway-card-name-visa' => 'Visa',
8585 'payflow_gateway-card-name-mc' => 'Mastercard',
8686 'payflow_gateway-card-name-discover' => 'Discover',
8787 'payflow_gateway-error-msg-nopaypal' => 'Due to a technical error, we cannot send your request to PayPal. Please try using our regular credit card donation form.',
88 - 'payflowpro_gateway-error-msg' => 'Please enter your $1',
89 - 'payflowpro_gateway-error-msg-js' => 'Please enter your',
90 - 'payflowpro_gateway-error-msg-invalid-amount' => '**Please enter a valid amount**',
91 - 'payflowpro_gateway-error-msg-email' => '**Please enter a valid e-mail address**',
92 - 'payflowpro_gateway-error-msg-card-num' => '**Please enter a valid credit card number for one of the accepted credit card types**',
93 - 'payflowpro_gateway-error-msg-amex' => '**Please enter a correct card number for American Express.**',
94 - 'payflowpro_gateway-error-msg-mc' => '**Please enter a correct card number for MasterCard.**',
95 - 'payflowpro_gateway-error-msg-visa' => '**Please enter a correct card number for Visa.**',
96 - 'payflowpro_gateway-error-msg-discover' => '**Please enter a correct card number for Discover.**',
97 - 'payflowpro_gateway-error-msg-amount' => 'donation amount',
98 - 'payflowpro_gateway-error-msg-emailAdd' => 'e-mail address',
99 - 'payflowpro_gateway-error-msg-fname' => 'first name',
100 - 'payflowpro_gateway-error-msg-lname' => 'last name',
101 - 'payflowpro_gateway-error-msg-street' => 'street address',
102 - 'payflowpro_gateway-error-msg-city' => 'city',
103 - 'payflowpro_gateway-error-msg-state' => 'state',
104 - 'payflowpro_gateway-error-msg-zip' => 'postal code',
105 - 'payflowpro_gateway-error-msg-country' => 'country',
106 - 'payflowpro_gateway-error-msg-card_type' => 'credit card type',
107 - 'payflowpro_gateway-error-msg-card_num' => 'credit card number',
108 - 'payflowpro_gateway-error-msg-expiration' => "card's expiration date",
109 - 'payflowpro_gateway-error-msg-cvv' => 'CVV from the back of your card',
110 - 'payflowpro_gateway-error-msg-captcha' => "The Captcha value you entered is incorrect. Please try again.",
111 - 'payflowpro_gateway-error-msg-captcha-please' => "For your credit card security, please type the characters you see above.",
 88+ 'donate_interface-error-msg' => 'Please enter your $1',
 89+ 'donate_interface-error-msg-js' => 'Please enter your',
 90+ 'donate_interface-error-msg-invalid-amount' => '**Please enter a valid amount**',
 91+ 'donate_interface-error-msg-email' => '**Please enter a valid e-mail address**',
 92+ 'donate_interface-error-msg-card-num' => '**Please enter a valid credit card number for one of the accepted credit card types**',
 93+ 'donate_interface-error-msg-amex' => '**Please enter a correct card number for American Express.**',
 94+ 'donate_interface-error-msg-mc' => '**Please enter a correct card number for MasterCard.**',
 95+ 'donate_interface-error-msg-visa' => '**Please enter a correct card number for Visa.**',
 96+ 'donate_interface-error-msg-discover' => '**Please enter a correct card number for Discover.**',
 97+ 'donate_interface-error-msg-amount' => 'donation amount',
 98+ 'donate_interface-error-msg-emailAdd' => 'e-mail address',
 99+ 'donate_interface-error-msg-fname' => 'first name',
 100+ 'donate_interface-error-msg-lname' => 'last name',
 101+ 'donate_interface-error-msg-street' => 'street address',
 102+ 'donate_interface-error-msg-city' => 'city',
 103+ 'donate_interface-error-msg-state' => 'state',
 104+ 'donate_interface-error-msg-zip' => 'postal code',
 105+ 'donate_interface-error-msg-country' => 'country',
 106+ 'donate_interface-error-msg-card_type' => 'credit card type',
 107+ 'donate_interface-error-msg-card_num' => 'credit card number',
 108+ 'donate_interface-error-msg-expiration' => "card's expiration date",
 109+ 'donate_interface-error-msg-cvv' => 'CVV from the back of your card',
 110+ 'donate_interface-error-msg-captcha' => "The Captcha value you entered is incorrect. Please try again.",
 111+ 'donate_interface-error-msg-captcha-please' => "For your credit card security, please type the characters you see above.",
112112 'php-response-declined' => 'Your transaction could not be accepted.',
113 - 'payflowpro_gateway-thankyou' => 'Thank you for your donation!',
114 - 'payflowpro_gateway-post-transaction' => 'Transaction details',
115 - 'payflowpro_gateway-submit-button' => 'Donate',
116 - 'payflowpro_gateway-cvv-explain' => '<h4>What is CVV?</h4>
 113+ 'donate_interface-thankyou' => 'Thank you for your donation!',
 114+ 'donate_interface-post-transaction' => 'Transaction details',
 115+ 'donate_interface-cvv-explain' => '<h4>What is CVV?</h4>
117116 <p>Cardholder Verification Value (CVV): These three or four digit numbers help ensure that the physical card is in the cardholder’s possession. This helps to prevent unauthorized or fraudulent use.</p>
118117 <h4>Visa, Mastercard</h4>
119118 <p>The 3-digit code is located on the back of your card, inside the signature area.
——@@ -120,132 +119,132 @@
121120 <h4>American Express</h4>
122121 <p>The code is <i>always</i> located <i>above</i> the embossed (raised) account number on the face of the card.
123122 In some instances, the code is located on the left side of the card, but is always above the account number.</p><br />',
124 - 'payflowpro_gateway-question-comment' => 'Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
125 - 'payflowpro_gateway-donate-click' => 'Your credit card will be securely processed.',
126 - 'payflowpro_gateway-otherways' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give, including PayPal, check, or mail</a>.',
127 - 'payflowpro_gateway-otherways-alt' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.',
128 - 'payflowpro_gateway-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a>',
129 - 'payflowpro_gateway-paypal' => 'Have a PayPal account? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donate with PayPal</a>.',
130 - 'payflowpro_gateway-credit-storage-processing' => 'We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.',
131 - 'payflowpro_gateway-token-mismatch' => 'Your session has expired. Please try filling out and submitting the form again.',
132 - 'payflowpro_gateway-cc-form-header-personal' => 'Billing information',
133 - 'payflowpro_gateway-cc-form-header-payment' => 'Payment information',
134 - 'payflowpro_gateway-make-your-donation' => 'Make your donation now',
135 - 'payflowpro_gateway-state-in-us' => 'if inside the US',
136 - 'payflowpro_gateway-comment' => 'Comment',
137 - 'payflowpro_gateway-first' => 'First',
138 - 'payflowpro_gateway-middle' => 'Middle',
139 - 'payflowpro_gateway-last' => 'Last',
140 - 'payflowpro_gateway-other' => 'Other',
141 - 'payflowpro_gateway-noscript-msg' => 'It appears that you do not have JavaScript enabled, or your browser does not support it.
 123+ 'donate_interface-question-comment' => 'Questions or comments? Contact: <a href="mailto:donate@wikimedia.org">donate@wikimedia.org</a>',
 124+ 'donate_interface-donate-click' => 'Your credit card will be securely processed.',
 125+ 'donate_interface-otherways' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give, including PayPal, check, or mail</a>.',
 126+ 'donate_interface-otherways-alt' => 'There are <a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">other ways to give</a>, including by check.',
 127+ 'donate_interface-otherways-short' => '<a href="http://wikimediafoundation.org/wiki/Ways_to_Give/en">Other ways to give</a>',
 128+ 'donate_interface-paypal' => 'Have a PayPal account? <a href="$1/index.php/Special:PayflowProGateway?_cache_=true&paypal=true&masthead=none&form_name=$2&text_template=2010/JimmyAppealLong&language=en&utm_source=$3&utm_medium=$4&utm_campaign=$5">Donate with PayPal</a>.',
 129+ 'donate_interface-credit-storage-processing' => 'We do not store your credit card information, and your personal data is subject to our <a href="http://wikimediafoundation.org/wiki/Donor_policy">donor privacy policy</a>.',
 130+ 'donate_interface-token-mismatch' => 'Your session has expired. Please try filling out and submitting the form again.',
 131+ 'donate_interface-cc-form-header-personal' => 'Billing information',
 132+ 'donate_interface-cc-form-header-payment' => 'Payment information',
 133+ 'donate_interface-make-your-donation' => 'Make your donation now',
 134+ 'donate_interface-state-in-us' => 'if inside the US',
 135+ 'donate_interface-comment' => 'Comment',
 136+ 'donate_interface-first' => 'First',
 137+ 'donate_interface-middle' => 'Middle',
 138+ 'donate_interface-last' => 'Last',
 139+ 'donate_interface-other' => 'Other',
 140+ 'donate_interface-noscript-msg' => 'It appears that you do not have JavaScript enabled, or your browser does not support it.
142141 In order to provide a safe, secure and pleasant experience, our donation form requires JavaScript.',
143 - 'payflowpro_gateway-noscript-redirect-msg' => 'If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:',
144 - 'payflowpro_gateway-anon-message' => 'Please list my name on the public donor list.',
145 - 'payflowpro_gateway-donate-wikipedia' => 'Donate on Wikipedia',
146 - 'payflowpro_gateway-or' => 'or',
147 - 'payflowpro_gateway-your-information' => 'Your information',
148 - 'payflowpro_gateway-mailing-address' => 'Mailing address',
149 - 'payflowpro_gateway-billing-address' => 'Billing address',
150 - 'payflowpro_gateway-billing-name' => 'Billing name',
151 - 'payflowpro_gateway-title' => 'Title',
152 - 'payflowpro_gateway-company-name' => 'Company or organization name',
153 - 'payflowpro_gateway-address-1' => 'Address 1',
154 - 'payflowpro_gateway-address-2' => 'Address 2',
155 - 'payflowpro_gateway-address-lines' => 'Address lines',
156 - 'payflowpro_gateway-address-line-2' => 'Address (line 2)',
157 - 'payflowpro_gateway-street-address' => 'Street address',
158 - 'payflowpro_gateway-street-address-line-2' => 'Street address (line 2)',
159 - 'payflowpro_gateway-street-1' => 'Street 1',
160 - 'payflowpro_gateway-street-2' => 'Street 2',
161 - 'payflowpro_gateway-apartment-number' => 'Apt. #',
162 - 'payflowpro_gateway-city-town' => 'City/Town',
163 - 'payflowpro_gateway-town-city' => 'Town/City',
164 - 'payflowpro_gateway-state-province' => 'State/Province',
165 - 'payflowpro_gateway-zip' => 'Zip',
166 - 'payflowpro_gateway-zip-code' => 'Zip code',
167 - 'payflowpro_gateway-zip-postal' => 'Zip/Postal',
168 - 'payflowpro_gateway-zip-postal-code' => 'Zip/Postal code',
169 - 'payflowpro_gateway-billing-code' => 'Billing zip',
170 - 'payflowpro_gateway-country' => 'Country',
171 - 'payflowpro_gateway-select-country' => 'Select a country',
172 - 'payflowpro_gateway-confirm-email' => 'Confirm e-mail',
173 - 'payflowpro_gateway-phone' => 'Phone',
174 - 'payflowpro_gateway-telephone' => 'Telephone',
175 - 'payflowpro_gateway-telephone-home' => 'Tel. (home)',
176 - 'payflowpro_gateway-billing-phone-number' => 'Billing phone number',
177 - 'payflowpro_gateway-donation-information' => 'Donation information',
178 - 'payflowpro_gateway-cc-billing-information' => 'Credit card billing information',
179 - 'payflowpro_gateway-pay-by-credit-card' => 'Pay by credit card',
180 - 'payflowpro_gateway-which-card' => 'Which card would you like to use',
181 - 'payflowpro_gateway-choose-donation-method' => 'Choose donation method',
182 - 'payflowpro_gateway-cardholders-name' => 'Cardholder’s name',
183 - 'payflowpro_gateway-name-on-card' => 'Name on card',
184 - 'payflowpro_gateway-type-of-card' => 'Type of card',
185 - 'payflowpro_gateway-cards-accepted' => 'Cards accepted',
186 - 'payflowpro_gateway-card-type' => 'Card type',
187 - 'payflowpro_gateway-credit-card-type' => 'Credit card type',
188 - 'payflowpro_gateway-credit-card-number' => 'Credit card number',
189 - 'payflowpro_gateway-credit-card-number-abbreviated' => 'Credit card #',
190 - 'payflowpro_gateway-credit-card-expiration' => 'Credit card expiration',
191 - 'payflowpro_gateway-card-expiration' => 'Card expiration',
192 - 'payflowpro_gateway-select-month-of-expiration' => 'Select month of expiration',
193 - 'payflowpro_gateway-select-year-of-expiration' => 'Select year of expiration',
194 - 'payflowpro_gateway-expires-question' => 'Expires?',
195 - 'payflowpro_gateway-expires' => 'Expires',
196 - 'payflowpro_gateway-card-security-code' => 'Card security code',
197 - 'payflowpro_gateway-cvv' => 'CVV',
198 - 'payflowpro_gateway-cvv-number-abbreviated' => 'CVV #',
199 - 'payflowpro_gateway-cvv2' => 'CVV2',
200 - 'payflowpro_gateway-cvv-number' => 'CVV number',
201 - 'payflowpro_gateway-verification-number' => 'Verification number',
202 - 'payflowpro_gateway-what-is-this' => 'What is this?',
203 - 'payflowpro_gateway-do-not-include-dashes' => 'Please do not include dashes',
204 - 'payflowpro_gateway-please-donate-today' => 'Please donate today',
205 - 'payflowpro_gateway-donate-now' => 'Donate now',
206 - 'payflowpro_gateway-please-select-gift-amount' => 'Please select a gift amount',
207 - 'payflowpro_gateway-select-gift-amount' => 'Select gift amount',
208 - 'payflowpro_gateway-select-amount' => 'Select amount',
209 - 'payflowpro_gateway-amount' => 'Amount',
210 - 'payflowpro_gateway-make-a-donation' => 'Make a donation',
211 - 'payflowpro_gateway-enter-your-amount' => 'Or enter your amount in the box above',
212 - 'payflowpro_gateway-will-support-with-gift' => 'I will support with a gift of:',
213 - 'payflowpro_gateway-will-make-tax-deductible-gift' => 'I will make a tax-deductible gift of:',
214 - 'payflowpro_gateway-submit-my-secure-donation' => 'Submit my secure donation',
215 - 'payflowpro_gateway-next' => 'Next',
216 - 'payflowpro_gateway-continue' => 'Continue',
217 - 'payflowpro_gateway-cancel' => 'Cancel',
218 - 'payflowpro_gateway-payment' => 'Payment',
219 - 'payflowpro_gateway-payment-type' => 'Payment type',
220 - 'payflowpro_gateway-month' => '$1 ($2)',
221 - 'payflowpro_gateway-please-complete' => 'Please complete your donation below ...',
222 - 'payflowpro_gateway-description' => 'Description',
223 - 'payflowpro_gateway-donation' => 'Donation',
224 - 'payflowpro_gateway-email-receipt' => 'E-mail receipt to',
225 - 'payflowpro_gateway-monthly-donation' => 'Make a monthly donation',
226 - 'payflowpro_gateway-via-paypal' => '(via PayPal)',
227 - 'payflowpro_gateway-shirt-size' => 'T-shirt size:',
228 - 'payflowpro_gateway-shirt-size-2' => 'T-shirt size: $1',
229 - 'payflowpro_gateway-language' => 'Language:',
230 - 'payflowpro_gateway-front' => 'Front',
231 - 'payflowpro_gateway-back' => 'Back',
232 - 'payflowpro_gateway-front-of-shirt' => 'Front of shirt',
233 - 'payflowpro_gateway-back-of-shirt' => 'Back of shirt',
234 - 'payflowpro_gateway-select-a-size' => 'Please select a size.',
235 - 'payflowpro_gateway-select' => 'Size:',
236 - 'payflowpro_gateway-shipping-address' => 'Shipping address',
237 - 'payflowpro_gateway-shipping-address-different' => 'My shipping address is different from my billing address.',
238 - 'payflowpro_gateway-shipping-address-same' => 'Shipping address same as billing address.',
239 - 'payflowpro_gateway-only-billing-address' => 'Shirts can only be shipped to your billing address.',
240 - 'payflowpro_gateway-donation-must-equal' => 'Donation must equal $1 or more.',
241 - 'payflowpro_gateway-thank-you' => 'Thank you! Your donation has been received.',
242 - 'payflowpro_gateway-wikipedia-translation' => 'Please note: "Wikipedia" on the shirt sleeve will be the "Wikipedia 10" graphic, which is not translated.',
243 - 'payflowpro_gateway-on-the-back' => 'With this on the back:',
244 - 'payflowpro_gateway-tshirt-confirmation' => 'Your t-shirt will be shipped in the size and language below:',
245 - 'payflowpro_gateway-donation-tshirt' => 'Donation (t-shirt offer)',
 142+ 'donate_interface-noscript-redirect-msg' => 'If you cannot or do not wish to enable JavaScript, you may still contribute by visiting:',
 143+ 'donate_interface-anon-message' => 'Please list my name on the public donor list.',
 144+ 'donate_interface-donate-wikipedia' => 'Donate on Wikipedia',
 145+ 'donate_interface-or' => 'or',
 146+ 'donate_interface-your-information' => 'Your information',
 147+ 'donate_interface-mailing-address' => 'Mailing address',
 148+ 'donate_interface-billing-address' => 'Billing address',
 149+ 'donate_interface-billing-name' => 'Billing name',
 150+ 'donate_interface-title' => 'Title',
 151+ 'donate_interface-company-name' => 'Company or organization name',
 152+ 'donate_interface-address-1' => 'Address 1',
 153+ 'donate_interface-address-2' => 'Address 2',
 154+ 'donate_interface-address-lines' => 'Address lines',
 155+ 'donate_interface-address-line-2' => 'Address (line 2)',
 156+ 'donate_interface-street-address' => 'Street address',
 157+ 'donate_interface-street-address-line-2' => 'Street address (line 2)',
 158+ 'donate_interface-street-1' => 'Street 1',
 159+ 'donate_interface-street-2' => 'Street 2',
 160+ 'donate_interface-apartment-number' => 'Apt. #',
 161+ 'donate_interface-city-town' => 'City/Town',
 162+ 'donate_interface-town-city' => 'Town/City',
 163+ 'donate_interface-state-province' => 'State/Province',
 164+ 'donate_interface-zip' => 'Zip',
 165+ 'donate_interface-zip-code' => 'Zip code',
 166+ 'donate_interface-zip-postal' => 'Zip/Postal',
 167+ 'donate_interface-zip-postal-code' => 'Zip/Postal code',
 168+ 'donate_interface-billing-code' => 'Billing zip',
 169+ 'donate_interface-country' => 'Country',
 170+ 'donate_interface-select-country' => 'Select a country',
 171+ 'donate_interface-confirm-email' => 'Confirm e-mail',
 172+ 'donate_interface-phone' => 'Phone',
 173+ 'donate_interface-telephone' => 'Telephone',
 174+ 'donate_interface-telephone-home' => 'Tel. (home)',
 175+ 'donate_interface-billing-phone-number' => 'Billing phone number',
 176+ 'donate_interface-donation-information' => 'Donation information',
 177+ 'donate_interface-cc-billing-information' => 'Credit card billing information',
 178+ 'donate_interface-pay-by-credit-card' => 'Pay by credit card',
 179+ 'donate_interface-which-card' => 'Which card would you like to use',
 180+ 'donate_interface-choose-donation-method' => 'Choose donation method',
 181+ 'donate_interface-cardholders-name' => 'Cardholder’s name',
 182+ 'donate_interface-name-on-card' => 'Name on card',
 183+ 'donate_interface-type-of-card' => 'Type of card',
 184+ 'donate_interface-cards-accepted' => 'Cards accepted',
 185+ 'donate_interface-card-type' => 'Card type',
 186+ 'donate_interface-credit-card-type' => 'Credit card type',
 187+ 'donate_interface-credit-card-number' => 'Credit card number',
 188+ 'donate_interface-credit-card-number-abbreviated' => 'Credit card #',
 189+ 'donate_interface-credit-card-expiration' => 'Credit card expiration',
 190+ 'donate_interface-card-expiration' => 'Card expiration',
 191+ 'donate_interface-select-month-of-expiration' => 'Select month of expiration',
 192+ 'donate_interface-select-year-of-expiration' => 'Select year of expiration',
 193+ 'donate_interface-expires-question' => 'Expires?',
 194+ 'donate_interface-expires' => 'Expires',
 195+ 'donate_interface-card-security-code' => 'Card security code',
 196+ 'donate_interface-cvv' => 'CVV',
 197+ 'donate_interface-cvv-number-abbreviated' => 'CVV #',
 198+ 'donate_interface-cvv2' => 'CVV2',
 199+ 'donate_interface-cvv-number' => 'CVV number',
 200+ 'donate_interface-verification-number' => 'Verification number',
 201+ 'donate_interface-what-is-this' => 'What is this?',
 202+ 'donate_interface-do-not-include-dashes' => 'Please do not include dashes',
 203+ 'donate_interface-please-donate-today' => 'Please donate today',
 204+ 'donate_interface-donate-now' => 'Donate now',
 205+ 'donate_interface-please-select-gift-amount' => 'Please select a gift amount',
 206+ 'donate_interface-select-gift-amount' => 'Select gift amount',
 207+ 'donate_interface-select-amount' => 'Select amount',
 208+ 'donate_interface-amount' => 'Amount',
 209+ 'donate_interface-make-a-donation' => 'Make a donation',
 210+ 'donate_interface-enter-your-amount' => 'Or enter your amount in the box above',
 211+ 'donate_interface-will-support-with-gift' => 'I will support with a gift of:',
 212+ 'donate_interface-will-make-tax-deductible-gift' => 'I will make a tax-deductible gift of:',
 213+ 'donate_interface-submit-my-secure-donation' => 'Submit my secure donation',
 214+ 'donate_interface-next' => 'Next',
 215+ 'donate_interface-continue' => 'Continue',
 216+ 'donate_interface-cancel' => 'Cancel',
 217+ 'donate_interface-payment' => 'Payment',
 218+ 'donate_interface-payment-type' => 'Payment type',
 219+ 'donate_interface-month' => '$1 ($2)',
 220+ 'donate_interface-please-complete' => 'Please complete your donation below ...',
 221+ 'donate_interface-description' => 'Description',
 222+ 'donate_interface-donation' => 'Donation',
 223+ 'donate_interface-email-receipt' => 'E-mail receipt to',
 224+ 'donate_interface-monthly-donation' => 'Make a monthly donation',
 225+ 'donate_interface-via-paypal' => '(via PayPal)',
 226+ 'donate_interface-shirt-size' => 'T-shirt size:',
 227+ 'donate_interface-shirt-size-2' => 'T-shirt size: $1',
 228+ 'donate_interface-language' => 'Language:',
 229+ 'donate_interface-front' => 'Front',
 230+ 'donate_interface-back' => 'Back',
 231+ 'donate_interface-front-of-shirt' => 'Front of shirt',
 232+ 'donate_interface-back-of-shirt' => 'Back of shirt',
 233+ 'donate_interface-select-a-size' => 'Please select a size.',
 234+ 'donate_interface-select' => 'Size:',
 235+ 'donate_interface-shipping-address' => 'Shipping address',
 236+ 'donate_interface-shipping-address-different' => 'My shipping address is different from my billing address.',
 237+ 'donate_interface-shipping-address-same' => 'Shipping address same as billing address.',
 238+ 'donate_interface-only-billing-address' => 'Shirts can only be shipped to your billing address.',
 239+ 'donate_interface-donation-must-equal' => 'Donation must equal $1 or more.',
 240+ 'donate_interface-thank-you' => 'Thank you! Your donation has been received.',
 241+ 'donate_interface-wikipedia-translation' => 'Please note: "Wikipedia" on the shirt sleeve will be the "Wikipedia 10" graphic, which is not translated.',
 242+ 'donate_interface-on-the-back' => 'With this on the back:',
 243+ 'donate_interface-tshirt-confirmation' => 'Your t-shirt will be shipped in the size and language below:',
 244+ 'donate_interface-donation-tshirt' => 'Donation (t-shirt offer)',
246245
247 - // For more USA states, see payflowpro_gateway.us-states.i18n.php.
248 - 'payflowpro_gateway-state-dropdown-YY' => 'Select a state',
249 - 'payflowpro_gateway-state-dropdown-XX' => 'Outside the U.S.',
 246+ // For more USA states, see donate_interface.us-states.i18n.php.
 247+ 'donate_interface-state-dropdown-YY' => 'Select a state',
 248+ 'donate_interface-state-dropdown-XX' => 'Outside the U.S.',
250249 );
251250
252251 /** Message documentation (Message documentation)

Comments

#Comment by Tim Starling (talk | contribs)   04:17, 2 December 2011 
Call to undefined method GlobalCollectGateway::addErrorMessageScript

Backtrace:

#0 .../extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php(57): SpecialPage->__call('addErrorMessage...', Array)
...
#Comment by Kaldari (talk | contribs)   18:04, 2 December 2011

Fixed in r104982.

Status & tagging log