* Add tooltips for Users and Active users, shortening the displayed text

* Add missing 'cant-block-while-blocked' from r41108

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index b4835c9..67f54b7 100644 (file)
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -58,8 +58,8 @@ function wfSpecialStatistics( $par = '' ) {
                        Xml::tags( 'th', array( 'colspan' => '2' ), wfMsg( 'statistics-header-pages' ) ) .
                        formatRow( wfMsgExt( 'statistics-articles', array( 'parseinline' ) ),
                                        $wgLang->formatNum( $good ) ) .
-                       formatRow( wfMsgExt( 'statistics-pages', array( 'parseinline' ) ),
-                                       $wgLang->formatNum( $total ) ) .
+                       formatRow( wfMsgExt( 'statistics-pages', array( 'parseinline' ) . '</div>' ),
+                                       $wgLang->formatNum( $total ), NULL, 'statistics-pages-tooltip' ) .
                        formatRow( wfMsgExt( 'statistics-files', array( 'parseinline' ) ),
                                        $wgLang->formatNum( $images ) ) .
 
@@ -77,7 +77,7 @@ function wfSpecialStatistics( $par = '' ) {
                        formatRow( wfMsgExt( 'statistics-users', array( 'parseinline' ) ),
                                        $wgLang->formatNum( $users ) ) .
                        formatRow( wfMsgExt( 'statistics-users-active', array( 'parseinline' ) ),
-                                       $wgLang->formatNum( $activeUsers ) );
+                                       $wgLang->formatNum( $activeUsers ), NULL, 'statistics-users-active-tooltip' );
 
                # Statistic - usergroups
                foreach( $wgGroupPermissions as $group => $permissions ) {
@@ -162,7 +162,11 @@ function wfSpecialStatistics( $par = '' ) {
  * @param float $number a number
  * @return string table row in HTML format
  */
-function formatRow( $text, $number, $trExtraParams = '' ) {
+function formatRow( $text, $number, $trExtraParams = '', $tooltip = '' ) {
+       if( $tooltip ) {
+               $text = '<div title="' . wfMsg( $tooltip ) . '">' . $text . '</div>';
+       }
+
        return "<tr{$trExtraParams}>
                        <td>" .
                                $text .

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1e03f49..f41083d 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1924,23 +1924,25 @@ Remember to check for other links to the templates before deleting them.',
 'randomredirect-nopages' => 'There are no redirects in this namespace.',
 
 # Statistics
-'statistics'               => 'Statistics',
-'statistics-header-pages'  => 'Page statistics',
-'statistics-header-edits'  => 'Edit statistics',
-'statistics-header-views'  => 'View statistics',
-'statistics-header-users'  => 'User statistics',
-'statistics-articles'      => 'Content pages',
-'statistics-pages'         => 'Pages <small>(this includes "talk" pages, pages about {{SITENAME}}, minimal "stub" pages, redirects, and others)</small>',
-'statistics-files'         => 'Uploaded files',
-'statistics-edits'         => 'Page edits since {{SITENAME}} was setup',
-'statistics-edits-average' => 'Average edits per page',
-'statistics-views-total'   => 'Views total',
-'statistics-views-peredit' => 'Views per edit',
-'statistics-jobqueue'      => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] length',
-'statistics-users'         => 'Registered [[Special:ListUsers|users]]',
-'statistics-users-active'  => 'Active users <small>(users who have edited or performed an action other than account creation in the past month)</small>',
-'statistics-mostpopular'   => 'Most viewed pages',
-'statistics-footer'        => '', # do not translate or duplicate this message to other languages
+'statistics'                      => 'Statistics',
+'statistics-header-pages'         => 'Page statistics',
+'statistics-header-edits'         => 'Edit statistics',
+'statistics-header-views'         => 'View statistics',
+'statistics-header-users'         => 'User statistics',
+'statistics-articles'             => 'Content pages',
+'statistics-pages'                => 'Pages',
+'statistics-pages-tooltip'        => 'All pages in the wiki, including talk pages, redirects, etc.',
+'statistics-files'                => 'Uploaded files',
+'statistics-edits'                => 'Page edits since {{SITENAME}} was setup',
+'statistics-edits-average'        => 'Average edits per page',
+'statistics-views-total'          => 'Views total',
+'statistics-views-peredit'        => 'Views per edit',
+'statistics-jobqueue'             => '[http://www.mediawiki.org/wiki/Manual:Job_queue Job queue] length',
+'statistics-users'                => 'Registered [[Special:ListUsers|users]]',
+'statistics-users-active'         => 'Active users',
+'statistics-users-active-tooltip' => 'Users who have performed an action in the past month',
+'statistics-mostpopular'          => 'Most viewed pages',
+'statistics-footer'               => '', # do not translate or duplicate this message to other languages
 
 'disambiguations'         => 'Disambiguation pages',
 'disambiguations-summary' => '', # do not translate or duplicate this message to other languages

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 3ba87df..9278840 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1206,6 +1206,7 @@ $wgMessageStructure = array(
                'statistics-header-users',
                'statistics-articles',
                'statistics-pages',
+               'statistics-pages-tooltip',
                'statistics-files',
                'statistics-edits',
                'statistics-edits-average',
@@ -1214,6 +1215,7 @@ $wgMessageStructure = array(
                'statistics-jobqueue',
                'statistics-users',
                'statistics-users-active',
+               'statistics-users-active-tooltip',
                'statistics-mostpopular',
                'statistics-footer',
        ),
@@ -1744,6 +1746,7 @@ $wgMessageStructure = array(
                'sorbs',
                'sorbsreason',
                'sorbs_create_account_reason',
+               'cant-block-while-blocked',
        ),
        'developertools' => array(
                'lockdb',