Remove the redundant legend line from recent changes and watchlist. The symbols itsel...

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index fd8adfe..0a824d1 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -129,47 +129,6 @@ class ChangesList {
                        . '</abbr>';
        }
 
-       /**
-        * Some explanatory wrapper text for the given flag, to be used in a legend
-        * explaining what the flags mean.  For instance, "N - new page".  See
-        * also flag().
-        *
-        * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot'
-        * @return String: Raw HTML
-        */
-       private static function flagLine( $key ) {
-               return wfMsgExt( "recentchanges-legend-$key", array( 'escapenoentities',
-                       'replaceafter' ), self::flag( $key ) );
-       }
-
-       /**
-        * A handy legend to tell users what the little "m", "b", and so on mean.
-        *
-        * @return String: Raw HTML
-        */
-       public static function flagLegend() {
-               global $wgGroupPermissions, $wgLang;
-
-               $flags = array( self::flagLine( 'newpage' ),
-                       self::flagLine( 'minor' ) );
-
-               # Don't show info on bot edits unless there's a bot group of some kind
-               foreach ( $wgGroupPermissions as $rights ) {
-                       if ( isset( $rights['bot'] ) && $rights['bot'] ) {
-                               $flags[] = self::flagLine( 'bot' );
-                               break;
-                       }
-               }
-
-               if ( self::usePatrol() ) {
-                       $flags[] = self::flagLine( 'unpatrolled' );
-               }
-
-               return '<div class="mw-rc-label-legend">' .
-                       wfMsgExt( 'recentchanges-label-legend', 'parseinline',
-                       $wgLang->commaList( $flags ) ) . '</div>';
-       }
-
        /**
         * Returns text for the start of the tabular part of RC
         * @return String

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 0a9ad82..638355f 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -506,8 +506,6 @@ class SpecialRecentChanges extends IncludableSpecialPage {
                        Xml::fieldset( wfMsg( 'recentchanges-legend' ), $panelString, array( 'class' => 'rcoptions' ) )
                );
 
-               $wgOut->addHTML( ChangesList::flagLegend() );
-
                $this->setBottomText( $wgOut, $opts );
        }
 

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index d0eda25..5dc17ee 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -331,8 +331,6 @@ function wfSpecialWatchlist( $par ) {
        $form .= Xml::closeElement( 'fieldset' );
        $wgOut->addHTML( $form );
 
-       $wgOut->addHTML( ChangesList::flagLegend() );
-
        # If there's nothing to show, stop here
        if( $numRows == 0 ) {
                $wgOut->addWikiMsg( 'watchnochange' );

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d2dd78a..02ea64e 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2003,14 +2003,9 @@ You can also choose to let others contact you through your user or talk page wit
 'recentchanges-legend'              => 'Recent changes options',
 'recentchangestext'                 => 'Track the most recent changes to the wiki on this page.',
 'recentchanges-feed-description'    => 'Track the most recent changes to the wiki in this feed.',
-'recentchanges-label-legend'        => 'Legend: $1.',
-'recentchanges-legend-newpage'      => '$1 - new page',
 'recentchanges-label-newpage'       => 'This edit created a new page',
-'recentchanges-legend-minor'        => '$1 - minor edit',
 'recentchanges-label-minor'         => 'This is a minor edit',
-'recentchanges-legend-bot'          => '$1 - bot edit',
 'recentchanges-label-bot'           => 'This edit was performed by a bot',
-'recentchanges-legend-unpatrolled'  => '$1 - unpatrolled edit',
 'recentchanges-label-unpatrolled'   => 'This edit has not yet been patrolled',
 'rcnote'                            => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $5, $4.",
 'rcnotefrom'                        => "Below are the changes since '''$2''' (up to '''$1''' shown).",

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 7f406af..63ef92c 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1162,14 +1162,9 @@ $wgMessageStructure = array(
                'recentchanges-legend',
                'recentchangestext',
                'recentchanges-feed-description',
-               'recentchanges-label-legend',
-               'recentchanges-legend-newpage',
                'recentchanges-label-newpage',
-               'recentchanges-legend-minor',
                'recentchanges-label-minor',
-               'recentchanges-legend-bot',
                'recentchanges-label-bot',
-               'recentchanges-legend-unpatrolled',
                'recentchanges-label-unpatrolled',
                'rcnote',
                'rcnotefrom',