diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index 52e28e2db8..b331d91795 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -155,8 +155,8 @@ class LanguageController 'description notice' => $translator->trans('prod:mapboxgl: description notice'), 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), 'create new user' => $translator->trans('prod:push: create new user'), - 'prod:videoeditor:subtitletab:messsage:: error' => $translator->trans('prod:videoeditor:subtitletab:messsage:: error'), - 'prod:videoeditor:subtitletab:messsage:: success' => $translator->trans('prod:videoeditor:subtitletab:messsage:: success'), + 'prod:videoeditor:subtitletab:message:: error' => $translator->trans('prod:videoeditor:subtitletab:message:: error'), + 'prod:videoeditor:subtitletab:message:: success' => $translator->trans('prod:videoeditor:subtitletab:message:: success'), ]); } } diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php index 1bd06d83b2..b31ad7e8c2 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusController.php @@ -13,6 +13,9 @@ use Alchemy\Phrasea\Application\Helper\DispatcherAware; use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Core\Event\Thesaurus as ThesaurusEvent; use Alchemy\Phrasea\Core\Event\Thesaurus\ThesaurusEvents; +use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions; +use Alchemy\Phrasea\WorkerManager\Event\PopulateIndexEvent; +use Alchemy\Phrasea\WorkerManager\Event\WorkerEvents; use Doctrine\DBAL\Driver\Connection; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -1222,6 +1225,26 @@ class ThesaurusController extends Controller ]); } + /** + * Order to populate databox + * + * @param Request $request + * @return \Symfony\Component\HttpFoundation\JsonResponse + */ + public function populate(Request $request) + { + $options = $this->getElasticsearchOptions(); + + $data['host'] = $options->getHost(); + $data['port'] = $options->getPort(); + $data['indexName'] = $options->getIndexName(); + $data['databoxIds'] = [$request->get('databox_id')]; + + $this->getDispatcher()->dispatch(WorkerEvents::POPULATE_INDEX, new PopulateIndexEvent($data)); + + return $this->app->json($data); + } + /** * @param Request $request * @return Response @@ -3031,4 +3054,12 @@ class ThesaurusController extends Controller { return $this->app['locales.available']; } + + /** + * @return ElasticsearchOptions + */ + private function getElasticsearchOptions() + { + return $this->app['elasticsearch.options']; + } } diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Thesaurus.php b/lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Thesaurus.php index 039cb4b96f..d5119eede9 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Thesaurus.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/Thesaurus/Thesaurus.php @@ -60,6 +60,7 @@ class Thesaurus implements ControllerProviderInterface, ServiceProviderInterface $controllers->match('newterm.php', 'controller.thesaurus:newTerm'); $controllers->match('properties.php', 'controller.thesaurus:properties'); $controllers->match('thesaurus.php', 'controller.thesaurus:thesaurus')->bind('thesaurus_thesaurus'); + $controllers->match('populate', 'controller.thesaurus:populate')->bind('thesaurus_populate'); $controllers->match('xmlhttp/accept.x.php', 'controller.thesaurus:acceptXml'); $controllers->match('xmlhttp/acceptcandidates.x.php', 'controller.thesaurus:acceptCandidatesXml'); diff --git a/package.json b/package.json index c8f905f823..d352b8f412 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.237-d", + "phraseanet-production-client": "0.34.238-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 157f51d43d..a56196a754 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4607,7 +4607,6 @@ Keine Voransicht verfügbar actions/Tools/videoEditor.html.twig actions/Tools/videoEditor.html.twig - actions/Tools/videoEditor.html.twig No receivers specified @@ -4916,7 +4915,7 @@ mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig web/account/account.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -6462,7 +6461,7 @@ Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig web/admin/databases.html.twig @@ -7354,7 +7353,7 @@ Bestätigung mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -8036,8 +8035,8 @@ action : exporter Exportieren - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig prod/preview/tools.html.twig @@ -9423,7 +9422,7 @@ alert Vorsicht - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -9782,8 +9781,8 @@ boutton::telecharger tous les documents Alle Dokumente herunterladen - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig @@ -10476,6 +10475,7 @@ mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig + web/lightbox/feed.html.twig lightbox::see_less_basket @@ -10684,7 +10684,7 @@ no image selected Kein Bild wurde ausgewählt - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11705,7 +11705,7 @@ processing verarbeitend - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -12149,91 +12149,91 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod:videoeditor:subtitleRequestTab:: submit - Einreichen - actions/Tools/videoEditor.html.twig + Anfrage einreichen + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:: title Automatische Untertitel actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Kind Typ - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Language destination Zielsprache - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Provider Provider actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Source Audio language Audioquelle Sprache - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleTab:: title Automatische Untertitelung Anfrage actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: Caption placeholder - Beschriftung Platzhalter + Geben Sie einen Untertitel ein actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: End time Ende actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: No caption message Keine Untertitel für diese Sprache actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Show for Dauer actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Start time Start actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: add caption - Untertitel + Untertitel hinzufügen actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: copy to clipboard In die Zwischenablage kopieren actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: save Speichern actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: work on Untertitel Sprache auswählen actions/Tools/videoEditor.html.twig - - prod:videoeditor:subtitletab:messsage:: error - Fehler + + prod:videoeditor:subtitletab:message:: error + Fehler beim speichern des Untertitels Controller/Prod/LanguageController.php - - prod:videoeditor:subtitletab:messsage:: success + + prod:videoeditor:subtitletab:message:: success Erfolg Controller/Prod/LanguageController.php @@ -13881,7 +13881,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben thumbnail validation Miniaturansicht Bestätigung - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 073ad5cfb9..4fb4ca45fd 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4610,7 +4610,6 @@ No preview available actions/Tools/videoEditor.html.twig actions/Tools/videoEditor.html.twig - actions/Tools/videoEditor.html.twig No receivers specified @@ -4919,7 +4918,7 @@ mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig web/account/account.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -6465,7 +6464,7 @@ Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig web/admin/databases.html.twig @@ -7357,7 +7356,7 @@ Feedbacks mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -8039,8 +8038,8 @@ action : exporter Export - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig prod/preview/tools.html.twig @@ -9183,29 +9182,29 @@ Uploader admin/worker-manager/index.html.twig - + admin::workermanager:tab:queueMonitor: Consumer count - Number of worker(s) + Number of worker(s) admin/worker-manager/worker_queue_monitor.html.twig - + admin::workermanager:tab:queueMonitor: Message count - Message count + Message count admin/worker-manager/worker_queue_monitor.html.twig - + admin::workermanager:tab:queueMonitor: Refresh list - Refresh + Refresh admin/worker-manager/worker_queue_monitor.html.twig - + admin::workermanager:tab:queueMonitor: description - Message queues status + Message queues status admin/worker-manager/worker_queue_monitor.html.twig - + admin::workermanager:tab:queueMonitor: title - Queues + Queues admin/worker-manager/index.html.twig @@ -9373,9 +9372,9 @@ Started admin/worker-manager/worker_info.html.twig - + admin::workermanager:tab:workerinfo: databox_name - Databox + Databox admin/worker-manager/worker_info.html.twig @@ -9426,7 +9425,7 @@ alert Warning - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -9785,8 +9784,8 @@ boutton::telecharger tous les documents Download all - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig @@ -10479,6 +10478,7 @@ mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig + web/lightbox/feed.html.twig lightbox::see_less_basket @@ -10687,7 +10687,7 @@ no image selected No Document selected - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11708,7 +11708,7 @@ processing Processing... - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11808,9 +11808,11 @@ Warning: The current values will be overwritten by these new values Valid changes or Cancel prod/actions/edit_default.html.twig - + prod::editing::annulation: abandonner les modification ? - Cancelling editing will lose all edits. - Cancel : to go back to editing - OK : to close and lose edits + Cancelling editing will lose all edits. +- Cancel : to go back to editing +- OK : to close and lose edits Controller/Prod/LanguageController.php @@ -12155,91 +12157,91 @@ It is possible to place several search areas prod:videoeditor:subtitleRequestTab:: submit - Submit - actions/Tools/videoEditor.html.twig + Submit Subtitling Request + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:: title Auto Subtitling actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Kind Kind - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Language destination - Destination Language - actions/Tools/videoEditor.html.twig + Subtitles language destination + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Provider - Provider + Provider actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Source Audio language - Audio language Source - actions/Tools/videoEditor.html.twig + Audio language Source + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleTab:: title - Auto Subtitling request + Subtitle editing actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: Caption placeholder - Caption placeholder + Type a subtitle actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: End time End actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: No caption message No Subtitle set for this language actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Show for Duration actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Start time Start actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: add caption - Subtitle + Add a Subtitle actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: copy to clipboard Copy to clipboard actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: save Save actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: work on Select subtitling language actions/Tools/videoEditor.html.twig - - prod:videoeditor:subtitletab:messsage:: error - Error + + prod:videoeditor:subtitletab:message:: error + Error when saving subtitle Controller/Prod/LanguageController.php - - prod:videoeditor:subtitletab:messsage:: success + + prod:videoeditor:subtitletab:message:: success Success Controller/Prod/LanguageController.php @@ -13887,7 +13889,7 @@ It is possible to place several search areas thumbnail validation Confirm thumbnail - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 48b5645f14..52f22b762b 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4607,7 +4607,6 @@ Pas de prévisualisation disponible actions/Tools/videoEditor.html.twig actions/Tools/videoEditor.html.twig - actions/Tools/videoEditor.html.twig No receivers specified @@ -4916,7 +4915,7 @@ mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig web/account/account.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -6464,7 +6463,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig web/admin/databases.html.twig @@ -7356,7 +7355,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Validations mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -8038,8 +8037,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis action : exporter Exporter - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig prod/preview/tools.html.twig @@ -9203,9 +9202,9 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Etat des files de message admin/worker-manager/worker_queue_monitor.html.twig - + admin::workermanager:tab:queueMonitor: title - Files de message + Files de message admin/worker-manager/index.html.twig @@ -9426,7 +9425,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le alert Alerte - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -9785,8 +9784,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le boutton::telecharger tous les documents Tout télécharger - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig @@ -10479,6 +10478,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig + web/lightbox/feed.html.twig lightbox::see_less_basket @@ -10687,7 +10687,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le no image selected Aucune image sélectionnée - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11708,7 +11708,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le processing En cours... - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11808,11 +11808,11 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Valider ou annuler les modifications prod/actions/edit_default.html.twig - + prod::editing::annulation: abandonner les modification ? L'annulation de l'édition effacera toutes les modifications. -- Annuler: pour revenir à l'édition -- OK: pour fermer et perdre les modifications + - Annuler: pour revenir à l'édition + - OK: pour fermer et perdre les modifications Controller/Prod/LanguageController.php @@ -12160,92 +12160,92 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod:videoeditor:subtitleRequestTab:: submit - Sous-titrage automatique - actions/Tools/videoEditor.html.twig + Soumettre la demande + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:: title - Edition des sous-titres + Sous-titrage Automatique actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleRequestTab:label:: Kind Type - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Language destination - Langue de destination - actions/Tools/videoEditor.html.twig + Langue de destination des sous-titres + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Provider - Provider + Fournisseur actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Source Audio language - Langue de la source (audio) - actions/Tools/videoEditor.html.twig + Langue de la source audio + actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitleTab:: title Edition de sous-titres actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: Caption placeholder - Description + Sous-titre actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: End time Fin actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: No caption message Pas de sous-titres définis pour cette langue actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Show for Durée actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Start time Début actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: add caption - Sous-titre + Ajouter un sous-titre actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: copy to clipboard - Copier dans le presse papier + Copier dans le presse papier actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: save Sauvegarder actions/Tools/videoEditor.html.twig prod:videoeditor:subtitletab:: work on - Choisir une langue + Choisir une langue a éditer actions/Tools/videoEditor.html.twig - - prod:videoeditor:subtitletab:messsage:: error - Erreur + + prod:videoeditor:subtitletab:message:: error + Erreur lors de la sauvegarde des sous-titres Controller/Prod/LanguageController.php - - prod:videoeditor:subtitletab:messsage:: success - Succès + + prod:videoeditor:subtitletab:message:: success + Sous-titres sauvegardé Controller/Prod/LanguageController.php @@ -13892,7 +13892,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles thumbnail validation Validation de la vignette - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 6ceddf3158..f85fe4b037 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -4617,7 +4617,6 @@ Geen voorvertoning beschikbaar actions/Tools/videoEditor.html.twig actions/Tools/videoEditor.html.twig - actions/Tools/videoEditor.html.twig No receivers specified @@ -4926,7 +4925,7 @@ mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig web/account/account.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -6472,7 +6471,7 @@ Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig admin/collection/suggested_value.html.twig admin/collection/collection.html.twig web/admin/databases.html.twig @@ -7364,7 +7363,7 @@ Controles mobile/lightbox/index.html.twig mobile/lightbox/index.html.twig - web/lightbox/validate.html.twig + web/lightbox/validate.html.twig lightbox/IE6/validate.html.twig web/lightbox/index.html.twig @@ -8046,8 +8045,8 @@ action : exporter Exporteer - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig prod/preview/tools.html.twig @@ -9433,7 +9432,7 @@ alert alert - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -9792,8 +9791,8 @@ boutton::telecharger tous les documents Alle documenten downloaden - web/lightbox/validate.html.twig - web/lightbox/feed.html.twig + web/lightbox/validate.html.twig + web/lightbox/feed.html.twig lightbox/IE6/validate.html.twig lightbox/IE6/feed.html.twig @@ -10486,6 +10485,7 @@ mobile/lightbox/validate.html.twig web/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig + web/lightbox/feed.html.twig lightbox::see_less_basket @@ -10694,7 +10694,7 @@ no image selected geen beeld geselecteerd - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -11715,7 +11715,7 @@ processing verwerken - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig @@ -12159,7 +12159,7 @@ prod:videoeditor:subtitleRequestTab:: submit prod:videoeditor:subtitleRequestTab:: submit - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:: title @@ -12169,12 +12169,12 @@ prod:videoeditor:subtitleRequestTab:label:: Kind prod:videoeditor:subtitleRequestTab:label:: Kind - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Language destination prod:videoeditor:subtitleRequestTab:label:: Language destination - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleRequestTab:label:: Provider @@ -12184,7 +12184,7 @@ prod:videoeditor:subtitleRequestTab:label:: Source Audio language prod:videoeditor:subtitleRequestTab:label:: Source Audio language - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig prod:videoeditor:subtitleTab:: title @@ -12236,14 +12236,14 @@ prod:videoeditor:subtitletab:: work on actions/Tools/videoEditor.html.twig - - prod:videoeditor:subtitletab:messsage:: error - prod:videoeditor:subtitletab:messsage:: error + + prod:videoeditor:subtitletab:message:: error + prod:videoeditor:subtitletab:message:: error Controller/Prod/LanguageController.php - - prod:videoeditor:subtitletab:messsage:: success - prod:videoeditor:subtitletab:messsage:: success + + prod:videoeditor:subtitletab:message:: success + prod:videoeditor:subtitletab:message:: success Controller/Prod/LanguageController.php @@ -13890,7 +13890,7 @@ thumbnail validation thumbnail goedkeuring - actions/Tools/videoEditor.html.twig + actions/Tools/videoEditor.html.twig actions/Tools/index.html.twig diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index bf583db435..ab858ec412 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 6f14806b39..bf43246fc4 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 63bee0cabf..6df51248bb 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index 3c4662e71e..d58f85e3ee 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig index a5d3c4d87d..7e0c3d3109 100644 --- a/templates/web/prod/actions/Tools/videoEditor.html.twig +++ b/templates/web/prod/actions/Tools/videoEditor.html.twig @@ -213,7 +213,7 @@ -
+
@@ -265,12 +265,6 @@
-
diff --git a/yarn.lock b/yarn.lock index 34278f055d..0d7427bc1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5311,10 +5311,14 @@ jquery-simplecolorpicker@^0.3.1: resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= -"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": +"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": + version "1.4.2" + resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + +"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git": version "1.4.2" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" - resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" jquery-ui-datepicker-with-i18n@^1.10.4: version "1.10.4" @@ -7578,10 +7582,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.237-d: - version "0.34.237-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.237-d.tgz#0ec3bf5d6b1260e15148a794e43a7a3b2a7adbcf" - integrity sha512-jttbZLvKiWg7FaTzhN7RT3viVbS7CUO77cu4LNycWD7ZUsycwPUWPomGDGMT9a8uRtJ7X0uHJXnAhGTDtBDvEg== +phraseanet-production-client@0.34.238-d: + version "0.34.238-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.238-d.tgz#b2986f343cd8787fb5988a7d6bb6e395c7b79114" + integrity sha512-Gm5PNrTxwMsIMMJhkSjnKvijwmV2ubvFYrCA3S6LWdr2K4L0N9z/QxGzkz6AHKwwDk7mdKp6L8UK4Ap+vG8RHA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"