diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index a31f3bc3d8..cf5d4b46b7 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -148,7 +148,7 @@ class LanguageController 'Move down range' => $translator->trans('Move down range'), 'error video editor' => $translator->trans('prod:edit: only a media of type video can be edited'), 'Chapters' => $translator->trans('prod:edit: chapters'), - 'No hover to chapter' => $translator->trans('prod:edit: no hover to chapters') + 'No hover to chapter' => $translator->trans('prod:edit: no overlaps for chapters') ]); } } diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index 5bdf3d04df..df8f61332c 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -10,6 +10,8 @@ {% endfor %} {% endif %} +{% set overlapChapters = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'overlapChapters') %} +
{# jquery Tabs #} @@ -204,7 +206,10 @@ {% endif %} }{% if not loop.last %},{% endif %} {% endfor %} - ] + ], + preferences: { + overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %}, + } };