* (bug 5619) Split statistics messages for brighter output if

$wgDisableCounters or $wgMiserMode are true

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0432bbd..bda0e49 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -262,6 +262,8 @@ lighter making things easier to read.
 * Fix fallback implementation of mb_strlen so it works and isn't insanely
   slow for large strings, since it's used for page edit lengths
 * (bug 8815) Setting password in initUser() breaks LdapAuthentication plugin
+* (bug 5619) Split statistics messages for brighter output if $wgDisableCounters 
+  or $wgMiserMode are true
 
 == Languages updated ==
 

diff --git a/includes/SpecialStatistics.php b/includes/SpecialStatistics.php
index 59cca3e..aa8e685 100644 (file)
--- a/includes/SpecialStatistics.php
+++ b/includes/SpecialStatistics.php
@@ -31,31 +31,39 @@ function wfSpecialStatistics() {
                echo "total=$total;good=$good;views=$views;edits=$edits;users=$users;admins=$admins;images=$images;jobs=$numJobs\n";
                return;
        } else {
+               global $wgDisableCounters, $wgMiserMode, $wgUser, $wgLang, $wgContLang;
+
                $text = '==' . wfMsg( 'sitestats' ) . "==\n" ;
-               $text .= wfMsgExt( 'sitestatstext', array ( 'parsemag' ),
+               $text .= wfMsgExt( 'sitestats-text', array ( 'parsemag' ),
                        $wgLang->formatNum( $total ),
                        $wgLang->formatNum( $good ),
-                       $wgLang->formatNum( $views ),
                        $wgLang->formatNum( $edits ),
                        $wgLang->formatNum( sprintf( '%.2f', $total ? $edits / $total : 0 ) ),
-                       $wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) ),
-                       $wgLang->formatNum( $numJobs ),
                        $wgLang->formatNum( $images )
                );
 
+               if( !$wgDisableCounters && !$wgMiserMode ) {
+                       $text .= '<p>' . wfMsgExt( 'sitestats-views', array ( 'parsemag' ),
+                               $wgLang->formatNum( $views ),
+                               $wgLang->formatNum( sprintf( '%.2f', $edits ? $views / $edits : 0 ) )
+                       ) . '</p>';
+               }
+
+               $text .= '<p>' . wfMsgExt( 'sitestats-jobs', array ( 'parsemag' ),
+                       $wgLang->formatNum( $numJobs )
+               ) . '</p>';
+
                $text .= "\n==" . wfMsg( 'userstats' ) . "==\n";
 
-               $text .= wfMsgExt( 'userstatstext', array ( 'parsemag' ),
+               $text .= wfMsgExt( 'userstats-text', array ( 'parsemag' ),
                        $wgLang->formatNum( $users ),
                        $wgLang->formatNum( $admins ),
-                       '[[' . wfMsgForContent( 'grouppage-sysop' ) . ']]', # TODO somehow remove, kept for backwards compatibility
                        $wgLang->formatNum( sprintf( '%.2f', $admins / $users * 100 ) ),
                        User::makeGroupLinkWiki( 'sysop' )
                );
 
                $wgOut->addWikiText( $text );
 
-               global $wgDisableCounters, $wgMiserMode, $wgUser, $wgLang, $wgContLang;
                if( !$wgDisableCounters && !$wgMiserMode ) {
                        $page = $dbr->tableName( 'page' );
                        $sql = "SELECT page_namespace, page_title, page_counter FROM {$page} WHERE page_is_redirect = 0 AND page_counter > 0 ORDER BY page_counter DESC";
@@ -74,11 +82,11 @@ function wfSpecialStatistics() {
                                $dbr->freeResult( $res );
                        }
                }
-               
+
                $footer = wfMsg( 'statistics-footer' );
                if( !wfEmptyMsg( 'statistics-footer', $footer ) && $footer != '' )
                        $wgOut->addWikiText( $footer );
-               
+
        }
 }
 ?>

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index c9c7a16..a71e85c 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1065,20 +1065,18 @@ Falls es sich um ein Bild gehandelt hat, so können Sie mit <tt><nowiki>[[</nowi
 'statistics'             => 'Statistik',
 'sitestats'              => 'Seitenstatistik',
 'userstats'              => 'Benutzerstatistik',
-'sitestatstext'          => "Es gibt insgesamt '''$1''' {{PLURAL:$1|Seite|Seiten}} in der Datenbank.
+'sitestats-text'         => "Es gibt insgesamt '''$1''' {{PLURAL:$1|Seite|Seiten}} in der Datenbank.
 Das schliesst Diskussionsseiten, Seiten über {{SITENAME}}, kleine Seiten, Weiterleitungen und andere Seiten ein,
 die eventuell nicht als Seiten gewertet werden können.
 
 Diese ausgenommen gibt es '''$2''' {{PLURAL:$2|Seite|Seiten}}, die als Seite gewertet werden {{PLURAL:$2|kann|können}}.
 
-Insgesamt {{PLURAL:$8|wurde '''1''' Datei|wurden '''$8''' Dateien}} hochgeladen.
+Es {{PLURAL:$5|wurde bisher '''1''' Datei|wurden bisher '''$5''' Dateien}} hochgeladen.
 
-Insgesamt gab es '''$3''' {{PLURAL:$3|Seitenabruf|Seitenabrufe}} und '''$4''' {{PLURAL:$4|Seitenbearbeitung|Seitenbearbeitungen}} seit {{SITENAME}} eingerichtet wurde.
-Daraus ergeben sich '''$5''' Bearbeitungen pro Seite und '''$6''' Seitenabrufe pro Bearbeitung.
-
-Länge der [http://meta.wikimedia.org/wiki/Help:Job_queue „Job queue“]: '''$7'''",
-'userstatstext'          => "Es gibt '''$1''' {{PLURAL:$1|registrierten|registrierte}} [[Special:Listusers|Benutzer]].
-Davon {{PLURAL:$2|hat|haben}} '''$2''' (=$4%) $5-Rechte.",
+Seit Einrichtung von {{SITENAME}} gab es '''$3''' {{PLURAL:$3|Seitenbearbeitung|Seitenbearbeitungen}}. Daraus ergeben sich '''$4''' Bearbeitungen pro Seite.",
+'sitestats-views'        => "Insgesamt gab es '''$1''' {{PLURAL:$1|Seitenabruf|Seitenabrufe}} und damit '''$2''' Seitenabrufe pro Bearbeitung.",
+'sitestats-jobs'         => "Länge der [http://meta.wikimedia.org/wiki/Help:Job_queue „Job queue“]: '''$1'''",
+'userstats-text'          => "Es gibt '''$1''' {{PLURAL:$1|registrierten|registrierte}} [[Special:Listusers|Benutzer]]. Davon {{PLURAL:$2|hat|haben}} '''$2''' (='''$3%''') $4-Rechte.",
 'statistics-mostpopular' => 'Meist besuchte Seiten',
 
 'disambiguations'      => 'Begriffsklärungsseiten',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 228024e..67280bb 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1449,21 +1449,18 @@ this old version, (rev) = revert to this old version.
 'statistics'   => 'Statistics',
 'sitestats'            => '{{SITENAME}} statistics',
 'userstats'            => 'User statistics',
-'sitestatstext' => "There {{PLURAL:$1|is '''1''' page|are '''$1''' total pages}} in the database.
+'sitestats-text' => "There {{PLURAL:$1|is '''1''' page|are '''$1''' total pages}} in the database.
 This includes \"talk\" pages, pages about {{SITENAME}}, minimal \"stub\"
 pages, redirects, and others that probably don't qualify as content pages.
 Excluding those, there {{PLURAL:$2|is '''1''' page that is a|are '''$2''' pages that are}} probably legitimate
 content {{PLURAL:$2|page|pages}}. 
 
-'''$8''' {{PLURAL:$8|file|files}} have been uploaded.
+'''$5''' {{PLURAL:$5|file|files}} have been uploaded.
 
-There have been a total of '''$3''' {{PLURAL:$3|page view|page views}}, and '''$4''' {{PLURAL:$4|page edit|page edits}}
-since {{SITENAME}} was setup.
-That comes to '''$5''' average edits per page, and '''$6''' views per edit.
-
-The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$7'''.",
-'userstatstext' => "There {{PLURAL:$1|is '''1''' registered user|are '''$1''' registered users}}, of which
-'''$2''' (or '''$4%''') {{PLURAL:$2|has|have}} $5 rights.",
+There have been a total '''$3''' {{PLURAL:$3|page edit|page edits}} since {{SITENAME}} was setup. That comes to '''$4''' average edits per page.",
+'sitestats-views' => "There have been a total of '''$1''' {{PLURAL:$1|page view|page views}} and '''$2''' views per edit.",
+'sitestats-jobs' => "The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$1'''.",
+'userstats-text' => "There {{PLURAL:$1|is '''1''' registered user|are '''$1''' registered users}}, of which '''$2''' (or '''$3%''') {{PLURAL:$2|has|have}} $4 rights.",
 'statistics-mostpopular' => 'Most viewed pages',
 'statistics-footer' => '',
 

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 4d9e392..b9a932e 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -863,8 +863,10 @@ $wgMessageStructure = array(
                'statistics',
                'sitestats',
                'userstats',
-               'sitestatstext',
-               'userstatstext',
+               'sitestats-text',
+               'sitestats-views',
+               'sitestats-jobs',
+               'userstats-text',
                'statistics-mostpopular',
                'statistics-footer',
        ),