Update auf 1.13.0

1 files changed, 33 insertions, 23 deletions

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 19914929..b2cb70f6 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -1,13 +1,14 @@
 <?php
-
 /**
  * Media-handling base classes and generic functionality
+ * @file
+ * @ingroup Media
  */
 
 /**
  * Base media handler class
  *
- * @addtogroup Media
+ * @ingroup Media
  */
 abstract class MediaHandler {
 	const TRANSFORM_LATER = 1;
@@ -43,7 +44,7 @@ abstract class MediaHandler {
 	abstract function getParamMap();
 
 	/*
-	 * Validate a thumbnail parameter at parse time. 
+	 * Validate a thumbnail parameter at parse time.
 	 * Return true to accept the parameter, and false to reject it.
 	 * If you return false, the parser will do something quiet and forgiving.
 	 */
@@ -60,14 +61,14 @@ abstract class MediaHandler {
 	abstract function parseParamString( $str );
 
 	/**
-	 * Changes the parameter array as necessary, ready for transformation. 
+	 * Changes the parameter array as necessary, ready for transformation.
 	 * Should be idempotent.
 	 * Returns false if the parameters are unacceptable and the transform should fail
 	 */
 	abstract function normaliseParams( $image, &$params );
 
 	/**
-	 * Get an image size array like that returned by getimagesize(), or false if it 
+	 * Get an image size array like that returned by getimagesize(), or false if it
 	 * can't be determined.
 	 *
 	 * @param Image $image The image object, or false if there isn't one
@@ -110,7 +111,7 @@ abstract class MediaHandler {
 	}
 
 	/**
-	 * Get a MediaTransformOutput object representing the transformed output. Does not 
+	 * Get a MediaTransformOutput object representing the transformed output. Does not
 	 * actually do the transform.
 	 *
 	 * @param Image $image The image object
@@ -123,7 +124,7 @@ abstract class MediaHandler {
 	}
 
 	/**
-	 * Get a MediaTransformOutput object representing the transformed output. Does the 
+	 * Get a MediaTransformOutput object representing the transformed output. Does the
 	 * transform unless $flags contains self::TRANSFORM_LATER.
 	 *
 	 * @param Image $image The image object
@@ -140,14 +141,14 @@ abstract class MediaHandler {
 	 */
 	function getThumbType( $ext, $mime ) {
 		return array( $ext, $mime );
-	}	
+	}
 
 	/**
 	 * True if the handled types can be transformed
 	 */
 	function canRender( $file ) { return true; }
 	/**
-	 * True if handled types cannot be displayed directly in a browser 
+	 * True if handled types cannot be displayed directly in a browser
 	 * but can be rendered
 	 */
 	function mustRender( $file ) { return false; }
@@ -166,7 +167,7 @@ abstract class MediaHandler {
 
 	/**
 	 * Get an associative array of page dimensions
-	 * Currently "width" and "height" are understood, but this might be 
+	 * Currently "width" and "height" are understood, but this might be
 	 * expanded in the future.
 	 * Returns false if unknown or if the document is not multi-page.
 	 */
@@ -191,7 +192,7 @@ abstract class MediaHandler {
 	 *       ...
 	 *    )
 	 * )
-	 * The UI will format this into a table where the visible fields are always 
+	 * The UI will format this into a table where the visible fields are always
 	 * visible, and the collapsed fields are optionally visible.
 	 *
 	 * The function should return false if there is no metadata to display.
@@ -199,7 +200,7 @@ abstract class MediaHandler {
 
 	/**
 	 * FIXME: I don't really like this interface, it's not very flexible
-	 * I think the media handler should generate HTML instead. It can do 
+	 * I think the media handler should generate HTML instead. It can do
 	 * all the formatting according to some standard. That makes it possible
 	 * to do things like visual indication of grouped and chained streams
 	 * in ogg container files.
@@ -234,7 +235,9 @@ abstract class MediaHandler {
 	function getLongDesc( $file ) {
 		global $wgUser;
 		$sk = $wgUser->getSkin();
-		return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() );
+		return wfMsgExt( 'file-info', 'parseinline',
+			$sk->formatSize( $file->getSize() ),
+			$file->getMimeType() );
 	}
 
 	function getDimensionsString( $file ) {
@@ -272,7 +275,7 @@ abstract class MediaHandler {
 /**
  * Media handler abstract base class for images
  *
- * @addtogroup Media
+ * @ingroup Media
  */
 abstract class ImageHandler extends MediaHandler {
 	function canRender( $file ) {
@@ -354,13 +357,13 @@ abstract class ImageHandler extends MediaHandler {
 	function getTransform( $image, $dstPath, $dstUrl, $params ) {
 		return $this->doTransform( $image, $dstPath, $dstUrl, $params, self::TRANSFORM_LATER );
 	}
-	
+
 	/**
 	 * Validate thumbnail parameters and fill in the correct height
 	 *
 	 * @param integer &$width Specified width (input/output)
 	 * @param integer &$height Height (output only)
-	 * @return false to indicate that an error should be returned to the user. 
+	 * @return false to indicate that an error should be returned to the user.
 	 */
 	function validateThumbParams( &$width, &$height, $srcWidth, $srcHeight, $mimeType ) {
 		$width = intval( $width );
@@ -385,7 +388,7 @@ abstract class ImageHandler extends MediaHandler {
 		}
 		$url = $script . '&' . wfArrayToCGI( $this->getScriptParams( $params ) );
 		$page = isset( $params['page'] ) ? $params['page'] : false;
-		
+
 		if( $image->mustRender() || $params['width'] < $image->getWidth() ) {
 			return new ThumbnailImage( $image, $url, $params['width'], $params['height'], $page );
 		}
@@ -400,8 +403,8 @@ abstract class ImageHandler extends MediaHandler {
 
 	function getShortDesc( $file ) {
 		global $wgLang;
-		$nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
-			$wgLang->formatNum( $file->getSize() ) ) . ')';
+		$nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
+			$wgLang->formatNum( $file->getSize() ) );
 		$widthheight = wfMsgHtml( 'widthheight', $wgLang->formatNum( $file->getWidth() ) ,$wgLang->formatNum( $file->getHeight() ) );
 
 		return "$widthheight ($nbytes)";
@@ -409,17 +412,24 @@ abstract class ImageHandler extends MediaHandler {
 
 	function getLongDesc( $file ) {
 		global $wgLang;
-		return wfMsgHtml('file-info-size', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ), 
-			$wgLang->formatSize( $file->getSize() ), $file->getMimeType() );
+		return wfMsgExt('file-info-size', 'parseinline',
+			$wgLang->formatNum( $file->getWidth() ),
+			$wgLang->formatNum( $file->getHeight() ),
+			$wgLang->formatSize( $file->getSize() ),
+			$file->getMimeType() );
 	}
 
 	function getDimensionsString( $file ) {
 		global $wgLang;
 		$pages = $file->pageCount();
+		$width = $wgLang->formatNum( $file->getWidth() );
+		$height = $wgLang->formatNum( $file->getHeight() );
+		$pagesFmt = $wgLang->formatNum( $pages );
+
 		if ( $pages > 1 ) {
-			return wfMsg( 'widthheightpage', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ), $wgLang->formatNum( $pages ) );
+			return wfMsgExt( 'widthheightpage', 'parsemag', $width, $height, $pagesFmt );
 		} else {
-			return wfMsg( 'widthheight', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ) );
+			return wfMsg( 'widthheight', $width, $height );
 		}
 	}
 }