Merge branch 'release/v3.4.1'

Author: octfx

EmbedVideo.i18n.magic.php

@@ -29,4 +29,5 @@
 	'autoresize' => [ 0, 'autoresize' ],
 	'title' => [ 0, 'title=$1' ],
 	'description' => [ 0, 'description=$1' ],
+	'class' => [ 0, 'class=$1' ],
 ];

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "starcitizenwiki/embedvideo",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"type": "mediawiki-extension",
 	"description": "Adds a parser function embedding video from popular sources.",
 	"license": "MIT",

extension.json

@@ -1,6 +1,6 @@
 {
 	"name": "EmbedVideo",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"author": [
 		"[https://www.mediawiki.org/wiki/User:Octfx Octfx]",
 		"[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]",
@@ -70,7 +70,8 @@
 				{ "name": "iframe.js", "file": "modules/iframe.js" }
 			],
 			"styles": [
-				"ext.embedVideo.consent.less"
+				"ext.embedVideo.consent.less",
+				"ext.embedVideo.evl.less"
 			],
 			"position": "top",
 			"targets": [

i18n/qqq.json

@@ -10,6 +10,7 @@
 	"embedvideo-consent-privacy-notice-dismiss": "{{identical|Dismiss}}",
 	"embedvideo-service-archiveorg": "{{Optional}}",
 	"embedvideo-service-bilibili": "{{Optional}}",
+	"embedvideo-service-bandcamp": "{{optional}}\nThe name of an online music publishing service, https://bandcamp.com/ .",
 	"embedvideo-service-dailymotion": "{{optional}}\nName of Dailymotion video streaming service, see https://www.dailymotion.com",
 	"embedvideo-service-kakaotv": "{{Optional}}",
 	"embedvideo-service-loom": "{{optional}}",

i18n/zh-hans.json

@@ -17,30 +17,32 @@
 	"embedvideo-consent-privacy-notice-continue": "继续",
 	"embedvideo-consent-privacy-notice-dismiss": "关闭",
 	"embedvideo-service-bilibili": "哔哩哔哩",
+	"embedvideo-service-videolink": "视频链接",
 	"embedvideo-service-localvideo": "本地文件",
 	"embedvideo-service-externalvideo": "外部视频",
 	"embedvideo-play": "播放视频",
-	"embedvideo-error-missingparams": "EmbedVideo缺少一个必须的参数。",
-	"embedvideo-error-service": "嵌入视频无法识别视频服务“$1”。",
-	"embedvideo-error-id": "视频嵌入收到了一个对服务“$1”不可用的id “$2“",
-	"embedvideo-error-width": "EmbedVideo收到了一个错误的高度参数“$1”",
-	"embedvideo-error-height": "EmbedVideo收到了一个错误的高度参数“$1”",
-	"embedvideo-error-alignment": "EmbedVideo的对齐参数“$1”有非法值。有效值为“left”“center”或“right”。",
-	"embedvideo-error-valignment": "EmbedVideo的对齐参数“$1”有非法值。有效值为“top”“middle”“bottom”或“baseline”。",
-	"embedvideo-error-urlargs": "EmbedVideo收到的URL参数列表包含畸形数据或空参数。",
-	"embedvideo-error-unknown": "EmbedVideo在尝试生成该视频嵌入块时遇到了一个未知的错误。（$1）",
-	"embedvideo-error-evp_deprecated": "#evp解析器函数在EmbedVideo 2.0中已弃用。请将您的解析器函数标记转换为#ev。",
-	"embedvideo-error-container": "为‘集装箱’ 提供的参数为不可用的。",
-	"embedvideo-video-long-desc": "$1, $2 解码编辑器, 长度 $3, $4x$5 像素, 总体 $6",
-	"embedvideo-audio-long-desc": "$1，$2 解码编辑器，总体长度$3，$4",
-	"embedvideo-error-cantdecode_evu": "无法使视频通过$1",
-	"apihelp-embedvideo-summary": "得到所给参数生成的视频嵌入代码。",
-	"apihelp-embedvideo-param-service": "服务的名称（YouTube，推特等等）",
-	"apihelp-embedvideo-param-id": "对该服务所需的视频ID",
-	"apihelp-embedvideo-param-dimensions": "一个数字宽度（100）或宽比高（100 x 100）",
-	"apihelp-embedvideo-param-alignment": "视频校准",
+	"embedvideo-error-missingparams": "EmbedVideo缺少一个必需的参数。",
+	"embedvideo-error-service": "EmbedVideo无法识别视频服务“$1”。",
+	"embedvideo-error-id": "EmbedVideo收到了对于服务“$1”的错误ID“$2“",
+	"embedvideo-error-width": "EmbedVideo收到了错误的宽度参数“$1”。",
+	"embedvideo-error-height": "EmbedVideo收到了错误的高度参数“$1”。",
+	"embedvideo-error-alignment": "给予了EmbedVideo的对齐参数“$1”一个非法的值。有效值为“left”“center”或“right”。",
+	"embedvideo-error-valignment": "给予了EmbedVideo的垂直对齐参数“$1”一个非法的值。有效值为“top”“middle”“bottom”或“baseline”。",
+	"embedvideo-error-urlargs": "EmbedVideo收到的URL参数列表包含异常数据或空参数。",
+	"embedvideo-error-unknown": "EmbedVideo在尝试生成该视频嵌入块时发生未知错误。（$1）",
+	"embedvideo-error-evp_deprecated": "#evp解析器函数在EmbedVideo 2.0中已弃用。请将您的解析器函数标签转换为#ev。",
+	"embedvideo-error-container": "提供给“container”的参数无效。",
+	"embedvideo-video-long-desc": "$1，编解码器$2，长度$3，$4x$5像素，总体$6",
+	"embedvideo-audio-long-desc": "$1，编解码器$2，长度$3，总体$4",
+	"embedvideo-error-cantdecode_evu": "无法解析来自$1的视频",
+	"embedvideo-error-url-not-whitelisted": "$wgAllowExternalImagesFrom中未设置提供的URL",
+	"apihelp-embedvideo-summary": "获取给定参数所生成视频的嵌入代码。",
+	"apihelp-embedvideo-param-service": "服务名称（youtube、twitch等）",
+	"apihelp-embedvideo-param-id": "用于该服务的视频ID",
+	"apihelp-embedvideo-param-dimensions": "数字宽度（100）或宽 x 高（100 x 100）",
+	"apihelp-embedvideo-param-alignment": "视频对齐",
 	"apihelp-embedvideo-param-description": "视频描述",
 	"apihelp-embedvideo-param-container": "接受框架，或留空",
-	"apihelp-embedvideo-param-urlargs": "视频URL中额外需要通过的争论（对于部分服务）",
-	"apihelp-embedvideo-param-autoresize": "自动调整视频大小？（是或否）"
+	"apihelp-embedvideo-param-urlargs": "视频URL中的额外参数（用于部分服务）",
+	"apihelp-embedvideo-param-autoresize": "自动调整视频大小？（true或false）"
 }

includes/EmbedService/EmbedHtmlFormatter.php

@@ -49,6 +49,10 @@ public static function toHtml( AbstractEmbedService $service, array $config = []
 			$config
 		);
 
+		if ( !empty( $config['img-class'] ) ) {
+			$config['class'] .= ' ' . $config['img-class'];
+		}
+
 		$inlineStyles = [
 			'container' => $config['style'] ?? '',
 			'wrapper' => '',

includes/Media/AudioHandler.php

@@ -42,6 +42,7 @@ public function getParamMap(): array {
 			'loop' => 'loop',
 			'nocontrols' => 'nocontrols',
 			'muted'	=> 'muted',
+			'class'	=> 'class',
 		];
 	}
 
@@ -63,7 +64,7 @@ public function validateParam( $name, $value ): bool {
 			return $this->parseTimeString( $value ) !== false;
 		}
 
-		if ( $name === 'autoplay' || $name === 'loop' || $name === 'nocontrols' ) {
+		if ( in_array( $name, [ 'autoplay', 'loop', 'nocontrols', 'class' ], true ) ) {
 			return true;
 		}
 
@@ -124,7 +125,7 @@ public function parseParamString( $string ): array {
 	 * Returns false if the parameters are unacceptable and the transform should fail
 	 *
 	 * @param stdClass|File $image
-	 * @param array $params
+	 * @param array &$params
 	 * @return bool Success
 	 */
 	public function normaliseParams( $image, &$params ): bool {
@@ -151,6 +152,7 @@ public function normaliseParams( $image, &$params ): bool {
 		}
 
 		$params['page'] = 1;
+		$params['img-class'] = $params['img-class'] ?? $params['class'] ?? null;
 
 		return true;
 	}

includes/Media/TransformOutput/AudioTransformOutput.php

@@ -52,7 +52,7 @@ public function toHtml( $options = [] ): string {
 		return Html::rawElement( 'audio', [
 			'src' => $this->getSrc(),
 			'width' => $this->getWidth(),
-			'class' => $options['img-class'] ?? false,
+			'class' => $options['img-class'] ?? $this->parameters['img-class'] ?? false,
 			'style' => $this->getStyle( $options ),
 			'controls' => !isset( $this->parameters['nocontrols'] ),
 			'autoplay' => isset( $this->parameters['autoplay'] ),

includes/Media/TransformOutput/VideoEmbedTransformOutput.php

@@ -24,6 +24,7 @@ public function toHtml( $options = [] ): string {
 			'withConsent' => true,
 			'autoresize' => ( $this->parameters['autoresize'] ?? false ) === true,
 			'description' => $this->parameters['description'] ?? null,
+			'img-class' => $this->parameters['img-class'] ?? null,
 		] );
 	}
 }

includes/Media/TransformOutput/VideoTransformOutput.php

@@ -48,7 +48,7 @@ public function toHtml( $options = [] ): string {
 			'src' => $this->getSrc(),
 			'width' => $this->getWidth(),
 			'height' => $this->getHeight(),
-			'class' => $options['img-class'] ?? false,
+			'class' => $options['img-class'] ?? $this->parameters['img-class'] ?? false,
 			'style' => $this->getStyle( $options ),
 			'poster' => $this->parameters['posterUrl'] ?? false,
 			'controls' => !isset( $this->parameters['nocontrols'] ),