* (bug 5593) Change "bureaucrat log" to "rights log"

* Show a boilerplate "(none)" in place of a blank within the log action text for user rights

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ba0dd25..1202b13 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -36,7 +36,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5344) Fix regression that broke slashes in extension tag parameters
 * Improve Special:Log performance on big log sets
 * (bug 5507) Changed mediawiki:logouttext from plain to wikitext
-* (bug 4760) Prevent creation of entries in protection log when protection levels haven't changed
+* (bug 4760) Prevent creation of entries in protection log when protection
+  levels haven't changed
 * (bug 861) Show page protection/unprotection events in histories
 * (bug 5499) Don't clear the tag strip state when asked not to clear state.
   Fixes regression with use of <ref> in a template breaking <nowiki> etc.
@@ -44,12 +45,16 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Display the anon talk page info message on anon talk pages again
   (moved outside the parser cache)
 * Optional {{DISPLAYTITLE|title with markup}} magic word
-  Deactivated by default, set "$wgAllowDisplayTitle = true" in LocalSettings.php to activate
+  Deactivated by default, set "$wgAllowDisplayTitle = true" in LocalSettings.php
+  to activate
 * Cleaned SpecialContributions a bit
 * Added a table to track interlanguage links
-* (bug 5544) Fix redirect arrow in Special:Listredirects for right-to-left languages
-* Replace "doubleredirectsarrow" with a content language check that picks the appropriate arrow
-* (bug 5537) Add stub language file for Samogitian (bat-smg); inherits Lithuanian (lt)
+* (bug 5544) Fix redirect arrow in Special:Listredirects for right-to-left
+  languages
+* Replace "doubleredirectsarrow" with a content language check that picks the
+  appropriate arrow
+* (bug 5537) Add stub language file for Samogitian (bat-smg); inherits
+  Lithuanian (lt)
 * Don't force edit summaries when a user is editing their own user/talk page
 * (bug 5510) Warning produced when using {{SUBPAGENAME}} in some namespaces
 * (bug 385) Installer support for PostgreSQL, fixes for PG compatibility
@@ -57,15 +62,15 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   All extensions using it have been corrected.
 * Propagate ISBN number for Booksources in LanguageNo.php
 * (bug 5548) Improvements to Indonesian localisation [patch: Ivan Lanin]
-* Add TALKSPACE, SUBJECTSPACE, TALKPAGENAME, SUBJECTPAGENAME (and encoded forms for all)
-  magic words
+* Add TALKSPACE, SUBJECTSPACE, TALKPAGENAME, SUBJECTPAGENAME (and encoded forms
+  for all) magic words
 * (bug 5403) Fix Special:Newpages RSS/Atom feeds
 * Reject malformed addresses in X-Forwarded-For entries
 * (bug 3359) Add hooks on completion of file upload
 * (bug 5559) Improve detection of ImageMagick [patch: Greg Turnquist]
 * (bug 5475) New pages feeds ignore "limit" argument
-* (bug 5184) CSS misapplied to elements in Special:Allmessages due to conflicting
-  anchor identifiers
+* (bug 5184) CSS misapplied to elements in Special:Allmessages due to
+  conflicting anchor identifiers
 * (bug 5519) Allow sidebar cache to be disabled; disable it by default.
 * Maintenance script to import the contents of a text file into a wiki page
 * Add $wgReservedUsernames configuration directive to block account creation/use
@@ -114,7 +119,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5659) Change grammar hacks for Bosnian Wikimedia namespaces.
   This sort of special casing should be removed and fixed properly.
 * Remove useless whitespace from Special:Brokenredirects header
-* Treat "allmessagesnotsupporteddb" as wikitext when echoing; change default text
+* Treat "allmessagesnotsupporteddb" as wikitext when echoing; change default
+  text
 * (bug 5497) regeression in HTML normalization in 1.6 (unclosed <li>,<dd>,<dt>)
 * (bug 5709) Allow customisation of separator for categories
 * (bug 5684) Introduce Special:Randomredirect
@@ -125,10 +131,12 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   ("editinginterface")
 * (bug 4834) Fix XHTML output when using $wgMaxTocLevel
 * Pass login link to "whitelistedittext" containing 'returnto' parameter
-* (bug 5728): mVersion missing from User::__sleep() leading to constant cache miss
+* (bug 5728): mVersion missing from User::__sleep() leading to constant cache
+  miss
 * Updated maintenance/transstat.php so it can show duplicate messages
-* Improvements to update scripts; print out the version, check for superuser credentials
-  before attempting a connection, and produce a friendlier error if the connection fails
+* Improvements to update scripts; print out the version, check for superuser
+  credentials before attempting a connection, and produce a friendlier error if
+  the connection fails
 * (bug 5005) Fix XHTML <gallery> output.
 * (bug 5315) "Expires: -1" HTTP header made strictly valid (using 1970 date).
 * (bug 4825) note in DefaultSettings.php about 'profiling' table creation
@@ -145,7 +153,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Rewrite reassignEdits script to be more efficient; support optional updates to
   recent changes table; add reporting and silent modes
 * Cleaned up formatNum usage in langfiles
-* (bug 5716) Warn when a user tries to upload a file which was previously deleted
+* (bug 5716) Warn when a user tries to upload a file which was previously
+  deleted
 * (bug 5565) Add a class attribute to the table on Special:Allpages
 * "lang=xx" option for parser test cases to set content language
 * (bug 5764) Friulian translation updated
@@ -156,10 +165,13 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Suppress 7za output on dumpBackup
 * (bug 5338) Reject extra initial colons in title
 * (bug 5487) Escape self-closed HTML pair tags
-* Add "raw suffix" magic word for some magic words, e.g. {{NUMBEROFUSERS|R}} will
-  produce a count minus formatting
-* Fix Parser::cleanSig() to use Parser::startExternalParse() and choose an appropriate
-  output format given the scope of the clean
+* Add "raw suffix" magic word for some magic words, e.g. {{NUMBEROFUSERS|R}}
+  will produce a count minus formatting
+* Fix Parser::cleanSig() to use Parser::startExternalParse() and choose an
+  appropriate output format given the scope of the clean
+* (bug 5593) Change "bureaucrat log" to "rights log"
+* Show a boilerplate "(none)" in place of a blank within the log action text for
+  user rights
 
 == Compatibility ==
 

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 6b7d2ff..66df19f 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -114,7 +114,7 @@ class LogPage {
                        ''        => 'log',
                        'block'   => 'blocklogpage',
                        'protect' => 'protectlogpage',
-                       'rights'  => 'bureaucratlog',
+                       'rights'  => 'rightslog',
                        'delete'  => 'dellogpage',
                        'upload'  => 'uploadlogpage',
                        'move'    => 'movelogpage'
@@ -159,7 +159,7 @@ class LogPage {
                        'protect/unprotect' => 'unprotectedarticle',
 
                        // TODO: This whole section should be moved to extensions/Makesysop/SpecialMakesysop.php
-                       'rights/rights'     => 'bureaucratlogentry',
+                       'rights/rights'     => 'rightslogentry',
                        'rights/addgroup'   => 'addgrouplogentry',
                        'rights/rngroup'    => 'renamegrouplogentry',
                        'rights/chgroup'    => 'changegrouplogentry',
@@ -195,6 +195,8 @@ class LogPage {
                                                        }
                                                        break;
                                                case 'rights':
+                                                       if( trim( $params[0] ) == '' )
+                                                               $params[0] = wfMsg( 'rightsnone' );
                                                        $text = $wgContLang->ucfirst( $title->getText() );
                                                        $titleLink = $skin->makeLinkObj( Title::makeTitle( NS_USER, $text ) );
                                                        break;

diff --git a/languages/Messages.php b/languages/Messages.php
index 40307eb..8045c07 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1343,9 +1343,9 @@ Type the name of the user in the box and press the button to make the user an ad
 'makesysopfail'                => "<b>User \"$1\" could not be made into a sysop. (Did you enter the name correctly?)</b>",
 'setbureaucratflag' => 'Set bureaucrat flag',
 'setstewardflag'    => 'Set steward flag',
-'bureaucratlog'                => 'Bureaucrat_log',
+'rightslog'            => 'User rights log',
 'rightslogtext'                => 'This is a log of changes to user rights.',
-'bureaucratlogentry'   => 'changed group membership for $1 from $2 to $3',
+'rightslogentry'       => 'changed group membership for $1 from $2 to $3',
 'rights'                       => 'Rights:',
 'set_user_rights'      => 'Set user rights',
 'user_rights_set'      => "<b>User rights for \"$1\" updated</b>",
@@ -1354,6 +1354,7 @@ Type the name of the user in the box and press the button to make the user an ad
 'already_sysop'     => 'This user is already an administrator',
 'already_bureaucrat' => 'This user is already a bureaucrat',
 'already_steward'   => 'This user is already a steward',
+'rightsnone'           => '(none)',
 
 # Move page
 #

diff --git a/languages/MessagesDe.php b/languages/MessagesDe.php
index 8b576bb..e7828d6 100644 (file)
--- a/languages/MessagesDe.php
+++ b/languages/MessagesDe.php
@@ -1050,7 +1050,9 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "makesysopok"           => "<b>Benutzer \"$1\" ist nun ein Administrator.</b>",
 "makesysopfail"         => "<b>Benutzer \"$1\" konnte nicht zu einem Administrator gemacht werden. (Haben Sie den Namen richtig geschrieben?)</b>",
 "makesysop"         => "Mache einen Benutzer zum Administrator",
-"bureaucratlogentry"   => "Rechte für Benutzer \"$1\" auf \"$2\" gesetzt",
+'rightslog' => 'Rechte-Logbuch',
+'rightslogtext' => 'Dies ist das Logbuch der Änderungen der Benutzerrechte.',
+"rightslogentry"       => "Rechte für Benutzer \"$1\" auf \"$2\" gesetzt",
 "rights"               => "Rechte:",
 "set_user_rights"      => "Benutzerrechte setzen",
 "user_rights_set"      => "<b>Benutzerrechte für \"$1\" aktualisiert</b>",
@@ -1058,6 +1060,7 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 'already_sysop'                => 'Dieser Benutzer ist bereits Administrator.',
 'already_bureaucrat'   => 'Dieser Benutzer ist bereits Bürokrat.',
 'already_steward'      => 'Dieser Benutzer ist bereits Steward.',
+'rightsnone'           => '(nichts)',
 
 "1movedto2"            => "$1 wurde nach $2 verschoben",
 "1movedto2_redir"      => "[[$1]] wurde über eine Weiterleitung nach [[$2]] verschoben",

diff --git a/languages/MessagesFr.php b/languages/MessagesFr.php
index 12ae565..7ae0104 100644 (file)
--- a/languages/MessagesFr.php
+++ b/languages/MessagesFr.php
@@ -895,8 +895,8 @@ N\'oubliez pas de la déverrouiller lorsque vous aurez terminé votre opération
 'unlockdbsuccesstext' => 'La base de données de {{SITENAME}} est déverrouillée.',
 
 # Special:Makesysop
-'bureaucratlog'                => 'Log_bureaucrate',
-'bureaucratlogentry'   => 'Droits de l\'utilisateur « $1 » mis à « $2 ».',
+'rightslog'            => 'Log des droits',
+'rightslogentry'       => 'Droits de l\'utilisateur « $1 » mis à « $2 ».',
 'makesysoptitle'       => 'Donne les droits d\'administrateur.',
 'makesysoptext'                => 'Ce formulaire est utilisé par les bureaucrates pour donner les droits d\'administrateur.
 Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donner les droits.',
@@ -911,7 +911,6 @@ Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donne
 'set_rights_fail'      => '<b>Les droits de l\'utilisateur « $1 » n\'ont pas pu être mis à jour. (Avez vous entré le nom correctement?)</b>',
 'makesysop'         => 'Donner les droits d\'administrateur à un utilisateur',
 
-
 # Spam
 #
 'spamprotectionmatch' => 'Le texte suivant a déclenché le détecteur de spam: $1',