From 3274b66a6dd5564cbd544ac53e82cae26fa454fc Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Mon, 12 May 2008 13:56:21 +0000 Subject: [PATCH] Tweaks to Special:ListGroupRights: * Have the internally-used permission key in parentheses after the descriptive text, since a primary purpose of the page is for sysadmins' convenience. * Make sure to use the word "rollback" in rollback-related messages -- that's the name of the button, after all. * Adjust the wording of a couple of other messages so they sound better or are clearer. --- includes/SpecialListgrouprights.php | 5 ++++- languages/messages/MessagesEn.php | 29 ++++++++++++++------------- maintenance/language/messageTypes.inc | 1 + maintenance/language/messages.inc | 1 + 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/includes/SpecialListgrouprights.php b/includes/SpecialListgrouprights.php index cabdbd7b37..13fddd6ce7 100644 --- a/includes/SpecialListgrouprights.php +++ b/includes/SpecialListgrouprights.php @@ -95,7 +95,10 @@ class SpecialListGroupRights extends SpecialPage { $r = array(); foreach( $permissions as $permission => $granted ) { if ( $granted ) { - $description = User::getRightDescription($permission); + $description = wfMsgHTML( 'listgrouprights-right-display', + User::getRightDescription($permission), + $permission + ); $r[] = $description; } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 08b4b346c4..3b0f6f8bcb 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1469,10 +1469,10 @@ please see math/README to configure.', 'right-suppressredirect' => 'Not create a redirect from the old name when moving a page', 'right-upload' => 'Upload files', 'right-reupload' => 'Overwrite an existing file', -'right-reupload-own' => 'Overwrite an existing file uploaded by the same user', +'right-reupload-own' => 'Overwrite an existing file uploaded by oneself', 'right-reupload-shared' => 'Override files on the shared media repository locally', 'right-upload_by_url' => 'Upload a file from a URL address', -'right-purge' => 'Purge the site cache for a page without a confirmation page', +'right-purge' => 'Purge the site cache for a page without confirmation', 'right-autoconfirmed' => 'Edit semi-protected pages', 'right-bot' => 'Be treated as an automated process', 'right-nominornewtalk' => 'Not have minor edits to discussion pages trigger the new messages prompt', @@ -1494,18 +1494,18 @@ please see math/README to configure.', 'right-editprotected' => 'Edit protected pages (without cascading protection)', 'right-editinterface' => 'Edit the user interface', 'right-editusercssjs' => "Edit other users' CSS and JS files", -'right-rollback' => 'Quickly revert the last user who edited a particular page', -'right-markbotedits' => 'Mark reverted edits as bot edits', +'right-rollback' => 'Quickly rollback the edits of the last user who edited a particular page', +'right-markbotedits' => 'Mark rolled-back edits as bot edits', 'right-import' => 'Import pages from other wikis', 'right-importupload' => 'Import pages from a file upload', -'right-patrol' => 'Mark edits as patrolled', -'right-autopatrol' => 'Have edits automatically marked as patrolled', +'right-patrol' => "Mark others' edits as patrolled", +'right-autopatrol' => "Have one's own edits automatically marked as patrolled", 'right-patrolmarks' => 'View recent changes patrol marks', 'right-unwatchedpages' => 'View a list of unwatched pages', 'right-trackback' => 'Submit a trackback', 'right-mergehistory' => 'Merge the history of pages', 'right-userrights' => 'Edit all user rights', -'right-userrights-interwiki' => 'Edit user rights of users in other wiki sites', +'right-userrights-interwiki' => 'Edit user rights of users on other wikis', 'right-siteadmin' => 'Lock and unlock the database', # User rights log @@ -1958,13 +1958,14 @@ It may contain one or more characters which cannot be used in titles.', 'listusers-noresult' => 'No user found.', # Special:Listgrouprights -'listgrouprights' => 'User group rights', -'listgrouprights-summary' => 'The following is a list of user groups defined on this wiki, with their associated access rights. -Additional information about individual rights can be found [[{{MediaWiki:Listgrouprights-helppage}}|here]].', -'listgrouprights-group' => 'Group', -'listgrouprights-rights' => 'Rights', -'listgrouprights-helppage' => 'Help:Group rights', -'listgrouprights-members' => '(list of members)', +'listgrouprights' => 'User group rights', +'listgrouprights-summary' => 'The following is a list of user groups defined on this wiki, with their associated access rights. +Additional information about individual rights can be found at [[{{MediaWiki:Listgrouprights-helppage}}]].', +'listgrouprights-group' => 'Group', +'listgrouprights-rights' => 'Rights', +'listgrouprights-helppage' => 'Help:Group rights', +'listgrouprights-members' => '(list of members)', +'listgrouprights-right-display' => '$1 ($2)', # only translate this message to other languages if you have to change it # E-mail user 'mailnologin' => 'No send address', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index f6b3c94e87..c100975ab5 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -279,6 +279,7 @@ $wgOptionalMessages = array( 'comma-separator', 'colon-separator', 'autocomment-prefix', + 'listgrouprights-right-display', ); /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */ diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 80f87ba930..8a23a93964 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1292,6 +1292,7 @@ $wgMessageStructure = array( 'listgrouprights-rights', 'listgrouprights-helppage', 'listgrouprights-members', + 'listgrouprights-right-display', ), 'emailuser' => array( 'mailnologin', -- 2.20.1