$height_orig = $this->displayImg->getHeight( $page );
$height = $height_orig;
- $longDesc = $this->displayImg->getLongDesc();
+ $longDesc = wfMsgExt( 'file-info-wrapper', 'parseinline', $this->displayImg->getLongDesc() );
wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) );
/* Preserve original image info string, but strip the last char ')' so we can add even more */
$info = array();
- $info[] = substr( $original, 1, strlen( $original )-2 );
+ $info[] = $original;
if ($metadata['looped'])
$info[] = wfMsgExt( 'file-info-gif-looped', 'parseinline' );
if ($metadata['duration'])
$info[] = $wgLang->formatTimePeriod( $metadata['duration'] );
- $infoString = $wgLang->commaList( $info );
-
- return "($infoString)";
+ return $wgLang->commaList( $info );
}
}
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() ) );
return "$nbytes";
}
static function getGeneralShortDesc( $file ) {
global $wgLang;
- $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
- $wgLang->formatNum( $file->getSize() ) ) . ')';
+ $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
+ $wgLang->formatNum( $file->getSize() ) );
return "$nbytes";
}
return $original;
$info = array();
- $info[] = substr( $original, 1, strlen( $original )-2 );
+ $info[] = $original;
if ($metadata['loopCount'] == 0)
$info[] = wfMsgExt( 'file-info-png-looped', 'parseinline' );
if ($metadata['duration'])
$info[] = $wgLang->formatTimePeriod( $metadata['duration'] );
- $infoString = $wgLang->commaList( $info );
-
- return "($infoString)";
+ return $wgLang->commaList( $info );
}
}
if( $img ) {
$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
if( $thumb ) {
- $desc = $img->getShortDesc();
+ $desc = wfMsgExt( 'file-info-wrapper', 'parseinline', $img->getShortDesc() );
wfProfileOut( __METHOD__ );
// Float doesn't seem to interact well with the bullets.
// Table messes up vertical alignment of the bullets.
'thumbsize' => 'Thumbnail size:',
'widthheight' => '$1×$2', # only translate this message to other languages if you have to change it
'widthheightpage' => '$1×$2, $3 {{PLURAL:$3|page|pages}}',
-'file-info' => '(file size: $1, MIME type: $2)',
-'file-info-size' => '($1 × $2 pixels, file size: $3, MIME type: $4)',
+'file-info' => 'file size: $1, MIME type: $2',
+'file-info-size' => '$1 × $2 pixels, file size: $3, MIME type: $4',
+'file-info-wrapper' => '($1)',
'file-nohires' => '<small>No higher resolution available.</small>',
-'svg-long-desc' => '(SVG file, nominally $1 × $2 pixels, file size: $3)',
+'svg-long-desc' => 'SVG file, nominally $1 × $2 pixels, file size: $3',
'show-big-image' => 'Full resolution',
'show-big-image-thumb' => '<small>Size of this preview: $1 × $2 pixels</small>',
'file-info-gif-looped' => 'looped',
'widthheightpage' => 'This message is used on image pages in the dimensions column in the file history section for images with more than one page. Parameter $1 is the image width (in pixels), parameter $2 is the image height, and parameter $3 is the number of pages.',
'file-info' => 'File info displayed on file description page.',
'file-info-size' => 'File info displayed on file description page.',
+'file-info-wrapper' => 'Surrounds file info descriptions',
'file-nohires' => 'File info displayed on file description page. For example of message in use see [[:File:Mouse10.gif]].',
'svg-long-desc' => 'Displayed under an SVG image at the image description page. Note that argument 3 is a string that includes the file size unit symbol. See for example [[:File:Yes check.svg]].',
'show-big-image' => 'Displayed under an image at the image description page, when it is displayed smaller there than it was uploaded.',
'widthheightpage',
'file-info',
'file-info-size',
+ 'file-info-wrapper',
'file-nohires',
'svg-long-desc',
'show-big-image',