http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98066
Revision: 98066
Author: ialex
Date: 2011-09-25 14:38:54 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Simplify things by using wfMessage() instead of wfMsg() et al.
Modified Paths:
--------------
trunk/phase3/includes/media/Generic.php
Modified: trunk/phase3/includes/media/Generic.php
===================================================================
--- trunk/phase3/includes/media/Generic.php 2011-09-25 13:54:55 UTC (rev
98065)
+++ trunk/phase3/includes/media/Generic.php 2011-09-25 14:38:54 UTC (rev
98066)
@@ -380,8 +380,10 @@
* Note, everything here is passed through the parser later on (!)
*/
protected static function addMeta( &$array, $visibility, $type, $id,
$value, $param = false ) {
- $msgName = "$type-$id";
- if ( wfEmptyMsg( $msgName ) ) {
+ $msg = wfMessage( "$type-$id", $param );
+ if ( $msg->exists() ) {
+ $name = $msg->text();
+ } else {
// This is for future compatibility when using instant
commons.
// So as to not display as ugly a name if a new metadata
// property is defined that we don't know about
@@ -389,8 +391,6 @@
// by default).
wfDebug( __METHOD__ . ' Unknown metadata name: ' . $id
. "\n" );
$name = wfEscapeWikiText( $id );
- } else {
- $name = wfMsg( $msgName, $param );
}
$array[$visibility][] = array(
'id' => "$type-$id",
@@ -404,10 +404,7 @@
* @return string
*/
function getShortDesc( $file ) {
- global $wgLang;
- $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
- $wgLang->formatNum( $file->getSize() ) );
- return "$nbytes";
+ return wfMessage( 'nbytes' )->numParams( $file->getSize()
)->escaped();
}
/**
@@ -416,9 +413,8 @@
*/
function getLongDesc( $file ) {
global $wgLang;
- return wfMsgExt( 'file-info', 'parseinline',
- $wgLang->formatSize( $file->getSize() ),
- $file->getMimeType() );
+ return wfMessage( 'file-info', $wgLang->formatSize(
$file->getSize() ),
+ $file->getMimeType() )->parse();
}
/**
@@ -426,10 +422,7 @@
* @return string
*/
static function getGeneralShortDesc( $file ) {
- global $wgLang;
- $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
- $wgLang->formatNum( $file->getSize() ) );
- return "$nbytes";
+ return wfMessage( 'nbytes' )->numParams( $file->getSize()
)->escaped();
}
/**
@@ -438,9 +431,8 @@
*/
static function getGeneralLongDesc( $file ) {
global $wgLang;
- return wfMsgExt( 'file-info', 'parseinline',
- $wgLang->formatSize( $file->getSize() ),
- $file->getMimeType() );
+ return wfMessage( 'file-info', $wgLang->formatSize(
$file->getSize() ),
+ $file->getMimeType() )->parse();
}
/**
@@ -712,10 +704,8 @@
* @return string
*/
function getShortDesc( $file ) {
- global $wgLang;
- $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
- $wgLang->formatNum( $file->getSize() ) );
- $widthheight = wfMsgHtml( 'widthheight', $wgLang->formatNum(
$file->getWidth() ) ,$wgLang->formatNum( $file->getHeight() ) );
+ $nbytes = wfMessage( 'nbytes' )->numParams( $file->getSize()
)->escaped();
+ $widthheight = wfMessage( 'widthheight' )->numParams(
$file->getWidth(), $file->getHeight() )->escaped();
return "$widthheight ($nbytes)";
}
@@ -728,18 +718,13 @@
global $wgLang;
$pages = $file->pageCount();
if ( $pages === false || $pages <= 1 ) {
- $msg = wfMsgExt('file-info-size', 'parseinline',
- $wgLang->formatNum( $file->getWidth() ),
- $wgLang->formatNum( $file->getHeight() ),
- $wgLang->formatSize( $file->getSize() ),
- $file->getMimeType() );
+ $msg = wfMessage( 'file-info-size' )->numParams(
$file->getWidth(),
+ $file->getHeight() )->params(
$wgLang->formatSize( $file->getSize() ),
+ $file->getMimeType() )->parse();
} else {
- $msg = wfMsgExt('file-info-size-pages', 'parseinline',
- $wgLang->formatNum( $file->getWidth() ),
- $wgLang->formatNum( $file->getHeight() ),
- $wgLang->formatSize( $file->getSize() ),
- $file->getMimeType(),
- $wgLang->formatNum( $pages ) );
+ $msg = wfMessage( 'file-info-size-pages' )->numParams(
$file->getWidth(),
+ $file->getHeight() )->params(
$wgLang->formatSize( $file->getSize() ),
+ $file->getMimeType() )->numParams( $pages
)->parse();
}
return $msg;
}
@@ -749,16 +734,11 @@
* @return string
*/
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 wfMsgExt( 'widthheightpage', 'parsemag', $width,
$height, $pagesFmt );
+ return wfMessage( 'widthheightpage' )->numParams(
$file->getWidth(), $file->getHeight(), $pages )->text();
} else {
- return wfMsg( 'widthheight', $width, $height );
+ return wfMessage( 'widthheight' )->numParams(
$file->getWidth(), $file->getHeight() )->text();
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
