http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95861
Revision: 95861
Author: akshay
Date: 2011-08-31 13:21:18 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Followup r95197, fixed code to display extension specific messages
Modified Paths:
--------------
trunk/extensions/SignupAPI/SignupAPI.i18n.php
trunk/extensions/SignupAPI/SignupAPI.php
trunk/extensions/SignupAPI/includes/ApiValidateSignup.php
trunk/extensions/SignupAPI/includes/verification.js
Modified: trunk/extensions/SignupAPI/SignupAPI.i18n.php
===================================================================
--- trunk/extensions/SignupAPI/SignupAPI.i18n.php 2011-08-31 12:53:39 UTC
(rev 95860)
+++ trunk/extensions/SignupAPI/SignupAPI.i18n.php 2011-08-31 13:21:18 UTC
(rev 95861)
@@ -11,6 +11,8 @@
$messages['en'] = array(
'signupapi-desc' => 'Cleans up the [[Special:UserLogin|login page]]
from signup related stuff and adds an API for signup',
'signupapi-ok' => 'OK',
+ 'signupapi-noname' => 'No username was specified',
+ 'signupapi-userexists' => 'User exists',
'signupapi-enterpassword' => 'You must enter a password',
'signupapi-passwordtooshort' => 'Password is too short',
'signupapi-weak' => 'Weak',
@@ -18,7 +20,7 @@
'signupapi-strong' => 'Strong',
'signupapi-badretype' => 'The passwords you entered do not match',
'signupapi-passwordsmatch' => 'Passwords match',
-
+ 'signupapi-invalidemailaddress' => 'Email address in invalid',
);
/** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
Modified: trunk/extensions/SignupAPI/SignupAPI.php
===================================================================
--- trunk/extensions/SignupAPI/SignupAPI.php 2011-08-31 12:53:39 UTC (rev
95860)
+++ trunk/extensions/SignupAPI/SignupAPI.php 2011-08-31 13:21:18 UTC (rev
95861)
@@ -52,13 +52,16 @@
'scripts' => 'includes/verification.js',
'messages' => array(
'signupapi-ok',
+ 'signupapi-noname',
+ 'signupapi-userexists',
'signupapi-enterpassword',
'signupapi-passwordtooshort',
'signupapi-weak',
'signupapi-medium',
'signupapi-strong',
'signupapi-badretype',
- 'signupapi-passwordsmatch'
+ 'signupapi-passwordsmatch',
+ 'signupapi-invalidemailaddress',
),
'dependencies' => array( 'jquery.ui.progressbar' ),
'localBasePath' => dirname( __FILE__ ),
Modified: trunk/extensions/SignupAPI/includes/ApiValidateSignup.php
===================================================================
--- trunk/extensions/SignupAPI/includes/ApiValidateSignup.php 2011-08-31
12:53:39 UTC (rev 95860)
+++ trunk/extensions/SignupAPI/includes/ApiValidateSignup.php 2011-08-31
13:21:18 UTC (rev 95861)
@@ -25,28 +25,28 @@
case "username":
$mUser = User::newFromName( $params['inputVal'],
'creatable' );
if ( !is_object( $mUser ) ) {
- $result['result'] = wfMsg( 'noname' );
+ $result['result'] = wfMsg( 'signupapi-noname'
);
$result['icon'] = 'MW-Icon-AlertMark.png';
}
if ( 0 != $mUser->idForName() ) {
- $result['result'] = wfMsg( 'userexists' );
+ $result['result'] = wfMsg(
'signupapi-userexists' );
$result['icon'] = "MW-Icon-NoMark.png";
}
else {
- $result['result'] = wfMsg( 'ok' );
+ $result['result'] = wfMsg( 'signupapi-ok' );
$result['icon'] = "MW-Icon-CheckMark.png";
}
break;
case "email" :
if ( $valid = User::isValidEmailAddr(
$params['inputVal'] ) ) {
- $result['result']= wfMsg( 'ok' );
+ $result['result']= wfMsg( 'signupapi-ok' );
$result['icon'] = "MW-Icon-CheckMark.png";
}
else {
- $result['result']= wfMsg( 'invalidemailaddress' );
+ $result['result']= wfMsg(
'signupapi-invalidemailaddress' );
$result['icon'] = "MW-Icon-NoMark.png";
}
break;
Modified: trunk/extensions/SignupAPI/includes/verification.js
===================================================================
--- trunk/extensions/SignupAPI/includes/verification.js 2011-08-31 12:53:39 UTC
(rev 95860)
+++ trunk/extensions/SignupAPI/includes/verification.js 2011-08-31 13:21:18 UTC
(rev 95861)
@@ -27,7 +27,7 @@
if (pwd.value.length==0) {
strength.innerHTML = mw.message( 'signupapi-enterpassword' );
} else if (pwd.value.length<minlength) {
- strength.innerHTML = mw.message( 'passwordtooshort', minlength );
+ strength.innerHTML = mw.message( 'signupapi-passwordtooshort', minlength );
$("#progress").progressbar({value: 10});
$("div.ui-progressbar-value").css("background","red");
} else if (strongRegex.test(pwd.value)) {
@@ -55,7 +55,7 @@
message = mw.message( 'signupapi-passwordsmatch' );
}else {
image = "<img src='"+ imagePath +"MW-Icon-NoMark.png'>";
- message = mw.message( 'badretype' );
+ message = mw.message( 'signupapi-badretype' );
}
valresult.innerHTML = image+message;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
