https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102127
Revision: 102127
Author: jamesur
Date: 2011-11-05 23:04:00 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
changing please enter a state errors to please enter a state/province by
adjusting which already translated message we use
Modified Paths:
--------------
trunk/extensions/DonationInterface/donationinterface.php
trunk/extensions/DonationInterface/gateway_common/GatewayForm.php
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/js/globalcollect_test_2.js
trunk/extensions/DonationInterface/globalcollect_gateway/modules/js/validate.js
trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
Modified: trunk/extensions/DonationInterface/donationinterface.php
===================================================================
--- trunk/extensions/DonationInterface/donationinterface.php 2011-11-05
22:43:34 UTC (rev 102126)
+++ trunk/extensions/DonationInterface/donationinterface.php 2011-11-05
23:04:00 UTC (rev 102127)
@@ -618,6 +618,7 @@
'donate_interface-donor-postal',
'donate_interface-donor-country',
'donate_interface-donor-emailAdd',
+ 'donate_interface-state-province',
)
);
Modified: trunk/extensions/DonationInterface/gateway_common/GatewayForm.php
===================================================================
--- trunk/extensions/DonationInterface/gateway_common/GatewayForm.php
2011-11-05 22:43:34 UTC (rev 102126)
+++ trunk/extensions/DonationInterface/gateway_common/GatewayForm.php
2011-11-05 23:04:00 UTC (rev 102127)
@@ -151,7 +151,7 @@
if ( empty( $data['state'] ) || $data['state'] == 'YY' ) {
- $error['state'] = wfMsg( 'donate_interface-error-msg',
wfMsg( 'donate_interface-error-msg-state' ) );
+ $error['state'] = wfMsg( 'donate_interface-error-msg',
wfMsg( 'donate_interface-state-province' ) );
$this->setValidateFormResult( false );
}
Modified:
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html
2011-11-05 22:43:34 UTC (rev 102126)
+++
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/html/globalcollect_test.html
2011-11-05 23:04:00 UTC (rev 102127)
@@ -39,7 +39,7 @@
var stateField = document.getElementById( 'state' );
if( stateField.options[stateField.selectedIndex].value == '' ) {
- output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
// validate email address
@@ -235,4 +235,4 @@
</div>
</td>
</tr>
-</table>
\ No newline at end of file
+</table>
Modified:
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/js/globalcollect_test_2.js
===================================================================
---
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/js/globalcollect_test_2.js
2011-11-05 22:43:34 UTC (rev 102126)
+++
trunk/extensions/DonationInterface/gateway_forms/rapidhtml/js/globalcollect_test_2.js
2011-11-05 23:04:00 UTC (rev 102127)
@@ -55,7 +55,7 @@
var stateField = document.getElementById( 'state' );
if( stateField.options[stateField.selectedIndex].value == '' ) {
- output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
// validate email address
Modified:
trunk/extensions/DonationInterface/globalcollect_gateway/modules/js/validate.js
===================================================================
---
trunk/extensions/DonationInterface/globalcollect_gateway/modules/js/validate.js
2011-11-05 22:43:34 UTC (rev 102126)
+++
trunk/extensions/DonationInterface/globalcollect_gateway/modules/js/validate.js
2011-11-05 23:04:00 UTC (rev 102127)
@@ -255,8 +255,8 @@
required: true,
notEqual: 'YY',
messages: {
- required: mw.msg( 'donate_interface-error-msg-js' ) + ' '
+ mw.msg( 'donate_interface-error-msg-state' ),
- notEqual: mw.msg( 'donate_interface-error-msg-js' ) + ' '
+ mw.msg( 'donate_interface-error-msg-state' ),
+ required: mw.msg( 'donate_interface-error-msg-js' ) + ' '
+ mw.msg( 'donate_interface-state-province' ),
+ notEqual: mw.msg( 'donate_interface-error-msg-js' ) + ' '
+ mw.msg( 'donate_interface-state-province' ),
}
}
);
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
===================================================================
--- trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
2011-11-05 22:43:34 UTC (rev 102126)
+++ trunk/extensions/DonationInterface/payflowpro_gateway/form_placeholders.js
2011-11-05 23:04:00 UTC (rev 102127)
@@ -35,7 +35,7 @@
var stateField = document.getElementById( 'state' );
var stateFieldSelected =
stateField.options[stateField.selectedIndex].value;
if( stateFieldSelected == '' || stateFieldSelected == 'YY' ) {
- output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
var countryField = document.getElementById( 'country' );
if( countryField.options[countryField.selectedIndex].value == '' ) {
Modified:
trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
===================================================================
--- trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
2011-11-05 22:43:34 UTC (rev 102126)
+++ trunk/extensions/DonationInterface/payflowpro_gateway/validate_input.js
2011-11-05 23:04:00 UTC (rev 102127)
@@ -64,7 +64,7 @@
var selectedState = stateField.options[stateField.selectedIndex].value;
var countryField = document.getElementById( 'country' );
if( selectedState == 'YY' || selectedState == '' ) {
- output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
if( countryField.type == "select" ){ // country is a dropdown select
@@ -118,7 +118,7 @@
var stateField = document.getElementById( 'state' );
var countryField = document.getElementById( 'country' );
if( stateField.options[stateField.selectedIndex].value == 'YY' ) {
- output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-error-msg-state' ) + '.\r\n';
+ output += mw.msg( 'donate_interface-error-msg-js' ) + ' ' +
mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
if( countryField.type == "select" ){ // country is a dropdown select
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
