Skip to content

Sync with upstream #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TehKittyCat merged 5 commits into from
Mar 12, 2026
Merged

Sync with upstream #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df83d80
Localisation updates from https://translatewiki.net.
translatewiki Feb 26, 2026
d0aca7c
build: Updating npm dependencies
Feb 27, 2026
e66b3c6
Localisation updates from https://translatewiki.net.
translatewiki Mar 5, 2026
93ab688
build: Updating npm dependencies
Mar 6, 2026
271a2b5
TimedMediaThumbnail: Set physical width and height
Ladsgroup Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion i18n/et.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
"timedmedia-derivative-2160p.video.vp9.mp4": "Voogesitus 2160p (VP9)",
"timedmedia-derivative-desc-2160p.video.vp9.mp4": "Voogvideo (2160p VP9)",
"timedmedia-resolution-120": "Madal 120p",
"timedmedia-resolution-144": "Madal 144p",
"timedmedia-resolution-160": "Madal 160p",
"timedmedia-resolution-180": "Madal 180p",
"timedmedia-resolution-240": "Madal 240p",
Expand All @@ -119,7 +120,7 @@
"timedmedia-subtitle-new-go": "Mine",
"timedmedia-subtitle-no-video": "Puudub selle alltiitrite leheküljega seotud video.",
"timedmedia-subtitle-no-subtitles": "Selle video alltiitrid puuduvad praegu selles keeles ($1). Saad seda lehekülge [{{fullurl:{{FULLPAGENAME}}|action=edit}} redigeerida], et need lisada.",
"timedmedia-subtitle-remote": "Selle faili ajastatud tekst on hoidlas $1",
"timedmedia-subtitle-remote": "Selle faili ajastatud tekst on hoidlas $1.",
"timedmedia-subtitle-remote-link": "Selle faili [$1 kirjelduslehekülge] saad vaadata hoidlas $2.",
"timedmedia-subtitles-available": "Subtiitrid saadaval.",
"timedmedia-derivative-state-transcodes": "{{PLURAL:$1|Üks ümberkodeering|$1 ümberkodeeringut}}",
Expand Down
2 changes: 1 addition & 1 deletion i18n/gl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"timedmedia-derivative-state-transcodes": "{{PLURAL:$1|$1 transcodificación|$1 transcodificacións}}",
"timedmedia-derivative-state-active": "{{PLURAL:$1|$1 transcodificación activa|$1 transcodificacións activas}}",
"timedmedia-derivative-state-queued": "{{PLURAL:$1|$1 transcodificación|$1 transcodificacións}} na cola",
"timedmedia-derivative-state-failed": "{{PLURAL:$1|$1 transcodificación fallida|$1 transcodificacións fallidas}}",
"timedmedia-derivative-state-failed": "{{PLURAL:$1|$1 transcodificación errónea|$1 transcodificacións erróneas}}",
"timedmedia-derivative-state-missing": "{{PLURAL:$1|$1 parámetro de transcodificación non iniciado|$1 parámetros de transcodificación non iniciados}}",
"timedmedia-no-derivatives": "Non é precisa a transcodificación.",
"timedmedia-file": "Ficheiro",
Expand Down
1 change: 1 addition & 0 deletions i18n/sms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"timedmedia-midi-short-audio": "MIDI-jiõnnteâttõs, $1",
"timedmedia-mp4-short-video": "MP4 $1 -videoteâttõs, $2",
"timedmedia-mpeg-short-video": "MPEG $1 -videoteâttõs, $2",
"timedmedia-dismiss": "Piij ǩidd",
"timedmedia-download": "Laadd teâttõõzz",
"timedmedia-desc-link": "Lââʹssteâđ tän teâttõõzz pirr",
"timedmedia-status": "Status",
Expand Down
5 changes: 4 additions & 1 deletion includes/TimedMediaHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ public function validateParam( $name, $value ) {
*/
public function makeParamString( $params ) {
// Add the width param string ( same as images {width}px )
$paramString = ( isset( $params['width'] ) ) ? $params['width'] . 'px' : '';
$width = $params['physicalWidth'] ?? $params['width'] ?? null;
$paramString = ( $width ) ? $width . 'px' : '';
$paramString .= ( $paramString !== '' ) ? '-' : '';

// Get the raw thumbTime from thumbtime or start param
Expand Down Expand Up @@ -176,9 +177,11 @@ public function normaliseParams( $image, &$params ) {
if ( $params['width'] * $size['height'] > $params['height'] * $size['width'] ) {
$params['width'] = self::fitBoxWidth( $size['width'], $size['height'], $params['height'] );
}
$params['physicalHeight'] = $params['height'];
}
if ( isset( $params['width'] ) ) {
$params['height'] = File::scaleHeight( $size['width'], $size['height'], $params['width'] );
$params['physicalWidth'] = $params['width'];
}

// Make sure start time is not > than end time
Expand Down
Loading