* (bug 33819) Display filesize on Special:NewFiles in appropriate unit.

Do the same for the rest of the file usages of 'nbytes' in Generic.php

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 5c16405..d87c1cf 100644 (file)
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -404,7 +404,8 @@ abstract class MediaHandler {
         * @return string
         */
        function getShortDesc( $file ) {
-               return wfMessage( 'nbytes' )->numParams( $file->getSize() )->escaped();
+               global $wgLang;
+               return $wgLang->formatSize( $file->getSize() );
        }
 
        /**
@@ -422,7 +423,8 @@ abstract class MediaHandler {
         * @return string
         */
        static function getGeneralShortDesc( $file ) {
-               return wfMessage( 'nbytes' )->numParams( $file->getSize() )->escaped();
+               global $wgLang;
+               return $wgLang->formatSize( $file->getSize() );
        }
 
        /**
@@ -707,7 +709,8 @@ abstract class ImageHandler extends MediaHandler {
         * @return string
         */
        function getShortDesc( $file ) {
-               $nbytes = wfMessage( 'nbytes' )->numParams( $file->getSize() )->escaped();
+               global $wgLang;
+               $nbytes = $wgLang->formatSize( $file->getSize() );
                $widthheight = wfMessage( 'widthheight' )->numParams( $file->getWidth(), $file->getHeight() )->escaped();
 
                return "$widthheight ($nbytes)";