r77563 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77562‎ | r77563 | r77564 >
Date:08:03, 2 December 2010
Author:raymond
Status:reverted
Tags:
Comment:
Follow-up r77555: Remove unused message (used for extensions only)
Tweak messages for consistency
Update maintenance script
Modified paths:
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -1113,6 +1113,7 @@
11141114 'right-override-export-depth',
11151115 'right-sendemail',
11161116 'right-revisionmove',
 1117+ 'right-disableaccount',
11171118 ),
11181119 'rightslog' => array(
11191120 'rightslog',
@@ -3227,6 +3228,16 @@
32283229 'sqlite-has-fts',
32293230 'sqlite-no-fts',
32303231 ),
 3232+ 'disableaccount' => array(
 3233+ 'disableaccount',
 3234+ 'disableaccount-user',
 3235+ 'disableaccount-confirm',
 3236+ 'disableaccount-mustconfirm',
 3237+ 'disableaccount-confirm',
 3238+ 'disableaccount-nosuchuser',
 3239+ 'disableaccount-success',
 3240+ 'disableaccount-logentry',
 3241+ ),
32313242 );
32323243
32333244 /** Comments for each block */
@@ -3439,4 +3450,5 @@
34403451 'db-error-messages' => 'Database error messages',
34413452 'html-forms' => 'HTML forms',
34423453 'sqlite' => 'SQLite database support',
 3454+ 'disableaccount' => 'Special:DisableAccount',
34433455 );
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -1950,6 +1950,7 @@
19511951 'right-override-export-depth' => 'Export pages including linked pages up to a depth of 5',
19521952 'right-sendemail' => 'Send e-mail to other users',
19531953 'right-revisionmove' => 'Move revisions',
 1954+'right-disableaccount' => 'Disable accounts',
19541955
19551956 # User rights log
19561957 'rightslog' => 'User rights log',
@@ -4360,17 +4361,16 @@
43614362 'sqlite-has-fts' => '$1 with full-text search support',
43624363 'sqlite-no-fts' => '$1 without full-text search support',
43634364
4364 -## Special:DisableAccount
4365 -'disableaccount-desc' => 'Allows administrators to disable individual accounts.',
4366 -'right-disableaccount' => 'Disable accounts',
4367 -'disableaccount' => 'Disable a user account',
4368 -'disableaccount-user' => 'User name:',
 4365+# Special:DisableAccount
 4366+'disableaccount' => 'Disable an user account',
 4367+'disableaccount-user' => 'Username:',
43694368 'disableaccount-confirm' => "Disable this user account.
4370 -The user will not be able to log in, reset their password, or receive email notifications.
 4369+The user will not be able to log in, reset their password, or receive e-mail notifications.
43714370 If the user is currently logged in anywhere, they will be immediately logged out.
43724371 ''Note that disabling an account is not reversible without system administrator intervention.''",
43734372 'disableaccount-mustconfirm' => 'You must confirm that you wish to disable this account.',
43744373 'disableaccount-nosuchuser' => 'The user account "$1" does not exist.',
43754374 'disableaccount-success' => 'The user account "$1" has been permanently disabled.',
4376 -'disableaccount-logentry' => 'permanently disabled the user account [[$1]].',
 4375+'disableaccount-logentry' => 'permanently disabled the user account [[$1]]',
43774376 );
 4377+

Follow-up revisions

RevisionCommit summaryAuthorDate
r77688Fix grammar in r77563catrope23:29, 3 December 2010
r86146Revert r77555 and followups r77563, r77572, r78116 (merge DisableAccount to c...demon22:49, 15 April 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r77555Merge DisableAccount extension into core, disabled by default because the rig...werdna04:17, 2 December 2010

Status & tagging log