jenkins-bot has submitted this change and it was merged.
Change subject: Changed Mp4Handler class call from wfMsgto wfMessage
......................................................................
Changed Mp4Handler class call from wfMsgto wfMessage
wfMsg is deprecated.
Changed wgLang to bitrateParams and timeperiodParam
Fixed whitespace issue
Change-Id: Icbf8bcee7f788bdc707ec0258c53bc8f6bd178c9
---
M handlers/Mp4Handler/Mp4Handler.php
1 file changed, 14 insertions(+), 12 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlers/Mp4Handler/Mp4Handler.php
b/handlers/Mp4Handler/Mp4Handler.php
index de1958c..897e101 100644
--- a/handlers/Mp4Handler/Mp4Handler.php
+++ b/handlers/Mp4Handler/Mp4Handler.php
@@ -104,14 +104,14 @@
* @return String
*/
function getShortDesc( $file ) {
- global $wgLang;
-
$streamTypes = $this->getStreamTypes( $file );
if ( !$streamTypes ) {
return parent::getShortDesc( $file );
}
- return wfMsg( 'timedmedia-mp4-short-video', implode( '/',
$streamTypes ),
- $wgLang->formatTimePeriod( $this->getLength( $file ) )
);
+ return wfMessage( 'timedmedia-mp4-short-video', implode( '/',
$streamTypes )
+ )->timeperiodParams(
+ $this->getLength( $file )
+ )->text();
}
/**
@@ -119,18 +119,20 @@
* @return String
*/
function getLongDesc( $file ) {
- global $wgLang;
$streamTypes = $this->getStreamTypes( $file );
if ( !$streamTypes ) {
return parent::getLongDesc( $file );
}
- return wfMsg('timedmedia-mp4-long-video',
- implode( '/', $streamTypes ),
- $wgLang->formatTimePeriod( $this->getLength($file) ),
- $wgLang->formatBitrate( $this->getBitRate( $file ) ),
- $wgLang->formatNum( $file->getWidth() ),
- $wgLang->formatNum( $file->getHeight() )
- );
+ return wfMessage('timedmedia-mp4-long-video',
+ implode( '/', $streamTypes )
+ )->timeperiodParams(
+ $this->getLength( $file )
+ )->bitrateParams(
+ $this->getBitRate( $file )
+ )->numParams(
+ $file->getWidth(),
+ $file->getHeight()
+ )->text();
}
--
To view, visit https://gerrit.wikimedia.org/r/108200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbf8bcee7f788bdc707ec0258c53bc8f6bd178c9
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
