From 4183d14e32fb0619b8c5a9eef8a70cd733cad257 Mon Sep 17 00:00:00 2001 From: albacodina <48245111+albacodina@users.noreply.github.com> Date: Thu, 5 Dec 2024 08:53:15 +0100 Subject: [PATCH 1/2] TTK-27400: Fix multistream track language access (#684) --- src/Pumukit/WebTVBundle/Resources/views/Misc/tracks.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pumukit/WebTVBundle/Resources/views/Misc/tracks.html.twig b/src/Pumukit/WebTVBundle/Resources/views/Misc/tracks.html.twig index a465f25fd..1a4725646 100644 --- a/src/Pumukit/WebTVBundle/Resources/views/Misc/tracks.html.twig +++ b/src/Pumukit/WebTVBundle/Resources/views/Misc/tracks.html.twig @@ -8,7 +8,7 @@ </a> | <span class="language"> - {% set lang = (object.getProperty('opencastlanguage')?(object.getProperty('opencastlanguage')|lower):(object.isMultistream()?object.getFilteredTrackWithTags(['display'], [], [], []).getLanguage():'en')) %} + {% set lang = (object.getProperty('opencastlanguage')?(object.getProperty('opencastlanguage')|lower):(object.isMultistream()?object.getFilteredTrackWithTags(['display'], [], [], []).language():'en')) %} {{ is_addon_language(lang) ? lang | language_name_custom : lang | language_name | capitalize }} </span> | {{ mmobj_duration(object) | duration_string }} From e9a3c303fc2fb07e6947f10d5896774fedf869db Mon Sep 17 00:00:00 2001 From: Pabloo474 <159337840+Pabloo474@users.noreply.github.com> Date: Thu, 5 Dec 2024 09:14:38 +0100 Subject: [PATCH 2/2] TTK-27403: Update dirname variable (#685) * TTK-27403: Update dirname variable * fix: phpcsfixer --------- Co-authored-by: pablo.garcia <pablo.garcia@teltek.es> Co-authored-by: Pablo Ogando Ferreira <pablo.ogando@teltek.es> --- src/Pumukit/EncoderBundle/Services/JobRender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pumukit/EncoderBundle/Services/JobRender.php b/src/Pumukit/EncoderBundle/Services/JobRender.php index 6aff56b9d..db98e7f68 100644 --- a/src/Pumukit/EncoderBundle/Services/JobRender.php +++ b/src/Pumukit/EncoderBundle/Services/JobRender.php @@ -49,7 +49,7 @@ public function renderBat(Job $job): string $vars['input'] = $job->getPathIni(); $vars['output'] = $job->getPathEnd(); - $vars['output_dirname'] = dirname($vars['output']); + $vars['output_dirname'] = dirname($vars['output']).'/'.pathinfo($vars['output'], PATHINFO_FILENAME); $vars['output_basename'] = basename($vars['output']); foreach (range(1, 9) as $identifier) {