Mdale has submitted this change and it was merged.
Change subject: code cleanup, remove tabs
......................................................................
code cleanup, remove tabs
Change-Id: I70b7e17ac775fa57ae55280812a58891ddb9068a
---
M TimedMediaHandler.i18n.php
M TimedMediaHandler.php
M TimedMediaHandler_body.php
M TimedMediaIframeOutput.php
M TimedMediaThumbnail.php
5 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
Mdale: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/TimedMediaHandler.i18n.php b/TimedMediaHandler.i18n.php
index d7fb5de..5b282e3 100644
--- a/TimedMediaHandler.i18n.php
+++ b/TimedMediaHandler.i18n.php
@@ -25,42 +25,42 @@
'timedmedia-mp4-short-video' => 'MP4 $1 video file, $2',
'timedmedia-mp4-long-video' => 'MP4 audio/video file, $1, length $2, $4
× $5 pixels, $3 overall',
- 'timedmedia-no-player-js' => 'Sorry, your browser either has
JavaScript disabled or does not have any supported player.<br />
+ 'timedmedia-no-player-js' => 'Sorry, your browser either has JavaScript
disabled or does not have any supported player.<br />
You can <a href="$1">download the clip</a> or <a
href="//www.mediawiki.org/wiki/Extension:TimedMediaHandler/Client_download">download
a player</a> to play the clip in your browser.',
'timedmedia-more' => 'More…',
'timedmedia-dismiss' => 'Close',
'timedmedia-download' => 'Download file',
- 'timedmedia-play-media' => 'Play media',
+ 'timedmedia-play-media' => 'Play media',
'timedmedia-desc-link' => 'About this file',
'timedmedia-oggThumb-version' => 'OggHandler requires oggThumb version
$1 or later.',
'timedmedia-oggThumb-failed' => 'oggThumb failed to create the
thumbnail.',
// Transcode status table:
- 'timedmedia-status-header' => 'Transcode status',
- 'timedmedia-update-status' => 'Update transcode status',
- 'timedmedia-status' => 'Status',
- 'timedmedia-status-unknown' => 'Unknown status',
- 'timedmedia-transcodeinfo' => 'Transcode derivative
description',
- 'timedmedia-actions' => 'Actions',
- 'timedmedia-direct-link' => 'Download derivative',
- 'timedmedia-not-ready' => 'Not ready',
- 'timedmedia-completed-on' => 'Completed transcode $1',
- 'timedmedia-error-on' => 'Error in transcode on $1.',
- 'timedmedia-started-transcode' => 'Transcode started $1 ago. $2',
- 'timedmedia-percent-done' => 'About $1% done',
- 'timedmedia-in-job-queue' => 'Added to Job queue $1 ago',
+ 'timedmedia-status-header' => 'Transcode status',
+ 'timedmedia-update-status' => 'Update transcode status',
+ 'timedmedia-status' => 'Status',
+ 'timedmedia-status-unknown' => 'Unknown status',
+ 'timedmedia-transcodeinfo' => 'Transcode derivative description',
+ 'timedmedia-actions' => 'Actions',
+ 'timedmedia-direct-link' => 'Download derivative',
+ 'timedmedia-not-ready' => 'Not ready',
+ 'timedmedia-completed-on' => 'Completed transcode $1',
+ 'timedmedia-error-on' => 'Error in transcode on $1.',
+ 'timedmedia-started-transcode' => 'Transcode started $1 ago. $2',
+ 'timedmedia-percent-done' => 'About $1% done',
+ 'timedmedia-in-job-queue' => 'Added to Job queue $1 ago',
'timedmedia-unknown-target-size'=> 'Unknown target size, $1 encoded',
- 'timedmedia-days' => '{{PLURAL:$1|1 day|$1
days}}',
- 'timedmedia-hours' => '{{PLURAL:$1|1 hour|$1
hours}}',
- 'timedmedia-minutes' => '{{PLURAL:$1|1 minute|$1
minutes}}',
- 'timedmedia-seconds' => '{{PLURAL:$1|1 second|$1
seconds}}',
- 'timedmedia-show-error' => 'Show error',
- 'timedmedia-reset' => 'Reset transcode',
- 'timedmedia-reset-confirm' => 'Resetting this transcode
will remove any existing file (if present), and it will re-add the transcode to
the job queue. It will take some time to re-transcode. <br /><br />
+ 'timedmedia-days' => '{{PLURAL:$1|1 day|$1 days}}',
+ 'timedmedia-hours' => '{{PLURAL:$1|1 hour|$1 hours}}',
+ 'timedmedia-minutes' => '{{PLURAL:$1|1 minute|$1 minutes}}',
+ 'timedmedia-seconds' => '{{PLURAL:$1|1 second|$1 seconds}}',
+ 'timedmedia-show-error' => 'Show error',
+ 'timedmedia-reset' => 'Reset transcode',
+ 'timedmedia-reset-confirm' => 'Resetting this transcode will remove any
existing file (if present), and it will re-add the transcode to the job queue.
It will take some time to re-transcode. <br /><br />
Are you sure you want to proceed?',
- 'timedmedia-reset-error' => 'Error in resetting
transcode job.',
+ 'timedmedia-reset-error' => 'Error in resetting transcode job.',
// Original uploaded asset
'timedmedia-ogg' => 'Ogg',
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index 5e6d4da..bea11ae 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -247,5 +247,5 @@
'author' => array( 'Michael Dale', 'Tim Starling', 'James
Heinrich', 'Jan Gerber' ),
'url' =>
'https://www.mediawiki.org/wiki/Extension:TimedMediaHandler',
'descriptionmsg' => 'timedmedia-desc',
- 'version' => '0.3',
+ 'version' => '0.3',
);
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index c80e9dc..55b7bdc 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -23,9 +23,9 @@
return array(
'img_width' => 'width',
'timedmedia_thumbtime' => 'thumbtime',
- 'timedmedia_starttime' => 'start',
- 'timedmedia_endtime' => 'end',
- 'timedmedia_disablecontrols' => 'disablecontrols',
+ 'timedmedia_starttime' => 'start',
+ 'timedmedia_endtime' => 'end',
+ 'timedmedia_disablecontrols' => 'disablecontrols',
);
}
diff --git a/TimedMediaIframeOutput.php b/TimedMediaIframeOutput.php
index 817e5d3..32809c5 100644
--- a/TimedMediaIframeOutput.php
+++ b/TimedMediaIframeOutput.php
@@ -5,7 +5,7 @@
* This enables iframe based embeds of the wikimeia player with the following
syntax:
*
* <iframe
src="http://commons.wikimedia.org/wiki/File:Folgers.ogv?embedplayer=yes";
- * width="240" height="180" frameborder="0" ></iframe>
+ * width="240" height="180" frameborder="0" ></iframe>
*
*/
diff --git a/TimedMediaThumbnail.php b/TimedMediaThumbnail.php
index a082dbc..cd1bfa6 100644
--- a/TimedMediaThumbnail.php
+++ b/TimedMediaThumbnail.php
@@ -129,7 +129,7 @@
# MJPEG, that's the same as JPEG except it's supported
by the windows build of ffmpeg
# No audio, one frame
- $cmd .= ' -f mjpeg -an -vframes 1 ' .
+ $cmd .= ' -f mjpeg -an -vframes 1 ' .
wfEscapeShellArg( $options['dstPath'] ) . ' 2>&1';
$retval = 0;
--
To view, visit https://gerrit.wikimedia.org/r/64912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70b7e17ac775fa57ae55280812a58891ddb9068a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J <jger...@wikimedia.org>
Gerrit-Reviewer: Mdale <md...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
