diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/WebhookSubdefEventSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/WebhookSubdefEventSubscriber.php index 63e639e2b9..6ba2387a89 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/WebhookSubdefEventSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/WebhookSubdefEventSubscriber.php @@ -30,12 +30,35 @@ class WebhookSubdefEventSubscriber implements EventSubscriberInterface { $record = $this->convertToRecordAdapter($event->getRecord()); + if ($record->has_subdef($event->getSubDefinitionName())) { + $subdef = $record->get_subdef($event->getSubDefinitionName()); + + try { + $url = $subdef->get_permalink()->get_url()->__toString(); + } catch (\Exception $e) { + $url = ''; + } catch (\Throwable $e) { + $url = ''; + } + + $size = $subdef->get_size(); + $type = $subdef->get_mime(); + } else { + $url = ''; + $size = 0; + $type = ''; + } + $eventData = [ 'databox_id' => $record->getDataboxId(), 'record_id' => $record->getRecordId(), 'collection_name' => $record->getCollection()->get_name(), 'base_id' => $record->getBaseId(), - 'subdef_name' => $event->getSubDefinitionName() + 'subdef_name' => $event->getSubDefinitionName(), + 'permalink' => $url, + 'original_name' => $record->getOriginalName(), + 'size' => $size, + 'type' => $type, ]; $this->app['manipulator.webhook-event']->create( diff --git a/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php index eca131b79b..b640fc90c9 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php @@ -92,5 +92,19 @@ class PhraseanetServiceProvider implements ServiceProviderInterface public function boot(SilexApplication $app) { + if ($app['configuration.store']->isSetup()) { + if (php_sapi_name() == 'cli') { + $servername = $app['conf']->get('servername'); + if (preg_match('#^http(s)?://#', $servername)) { + $t = explode('://', $servername); + if (count($t) == 2) { + $app['url_generator']->getContext()->setHost($t[1]); + $app['url_generator']->getContext()->setScheme($t[0]); + } + } else { + $app['url_generator']->getContext()->setHost($servername); + } + } + } } } diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php index d8a0d8442b..1734c9b202 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php @@ -35,7 +35,11 @@ class PSExposeController extends Controller } $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['auth_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['auth_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; $oauthClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -199,7 +203,11 @@ class PSExposeController extends Controller } $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; $exposeClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -259,7 +267,11 @@ class PSExposeController extends Controller $exposeConfiguration = $exposeConfiguration[$request->get('exposeName')]; $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; $exposeClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -356,7 +368,12 @@ class PSExposeController extends Controller $exposeConfiguration = $exposeConfiguration[$request->get('exposeName')]; $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; + $exposeClient = $proxyConfig->getClientWithOptions($clientOptions); $accessToken = $this->getAndSaveToken($request->get('exposeName')); @@ -500,7 +517,11 @@ class PSExposeController extends Controller $exposeConfiguration = $exposeConfiguration[$exposeName]; $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; $exposeClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -1230,7 +1251,11 @@ class PSExposeController extends Controller } $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; return $proxyConfig->getClientWithOptions($clientOptions); } diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConfigurationType.php b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConfigurationType.php index a0413173b2..8e5271c4f5 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConfigurationType.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConfigurationType.php @@ -48,12 +48,15 @@ class PSExposeConfigurationType extends AbstractType implements DataMapperInterf /** @var FormInterface[] $forms */ $forms = iterator_to_array($forms); - foreach ($data['exposes'] as $key => $config) { - $data['exposes'][$key]['expose_name'] = $key; + if (isset($data['exposes'] )) { + foreach ($data['exposes'] as $key => $config) { + $data['exposes'][$key]['expose_name'] = $key; + } + + $forms['exposes']->setData(array_values($data['exposes'])); } $forms['activated']->setData($data['activated']); - $forms['exposes']->setData(array_values($data['exposes'])); } /** diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConnectionType.php b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConnectionType.php index f4bf0801f3..7e1b88b158 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConnectionType.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Form/PSExposeConnectionType.php @@ -21,6 +21,10 @@ class PSExposeConnectionType extends AbstractType 'label' => 'admin:phrasea-service-setting:tab:expose:: Activate this expose', 'required' => false ]) + ->add('verify_ssl', CheckboxType::class, [ + 'label' => 'admin:phrasea-service-setting:tab:expose:: verify ssl', + 'required' => false + ]) ->add('connection_kind', ChoiceType::class, [ 'label' => 'admin:phrasea-service-setting:tab:expose:: Connection Kind', 'required' => true, diff --git a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php index 579a3d06b4..fed453802c 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Form/WorkerPullAssetsType.php @@ -3,6 +3,7 @@ namespace Alchemy\Phrasea\WorkerManager\Form; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\TextType; @@ -36,10 +37,15 @@ class WorkerPullAssetsType extends AbstractType ]) ->add('pullInterval', TextType::class, [ 'label' => 'admin::workermanager:tab:pullassets: Fetching interval in second' - ]); + ]) + ->add('verify_ssl', CheckboxType::class, [ + 'label' => 'admin::workermanager:tab:pullassets: verify ssl', + 'required' => false + ]) + ; $builder - ->add("boutton::appliquer", SubmitType::class, [ + ->add("apply", SubmitType::class, [ 'label' => "boutton::appliquer", 'attr' => ['value' => 'save'] ]); diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php index 26f4a54820..82e6102632 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php @@ -38,14 +38,19 @@ class AssetsIngestWorker implements WorkerInterface $this->saveAssetsList($payload['commit_id'], $assets, $payload['published'], $payload['type']); + $verifySsl = isset($payload['verify_ssl']) ? $payload['verify_ssl'] : true ; + $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $payload['base_url']]; + $clientOptions = [ + 'base_uri' => $payload['base_url'], + 'verify' => $verifySsl + ]; $uploaderClient = $proxyConfig->getClientWithOptions($clientOptions); //get first asset informations to check if it's a story try { - $body = $uploaderClient->get('/assets/'.$assets[0], [ + $body = $uploaderClient->get('assets/'.$assets[0], [ 'headers' => [ 'Authorization' => 'AssetToken '.$payload['token'] ] @@ -80,7 +85,8 @@ class AssetsIngestWorker implements WorkerInterface 'assetToken' => $payload['token'], 'storyId' => $storyId, 'base_url' => $payload['base_url'], - 'commit_id' => $payload['commit_id'] + 'commit_id' => $payload['commit_id'], + 'verify_ssl' => $verifySsl ]; $this->messagePublisher->publishMessage($createRecordMessage, MessagePublisher::CREATE_RECORD_TYPE); diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php index 2d7a7f0152..8bb08ea413 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php @@ -60,13 +60,16 @@ class CreateRecordWorker implements WorkerInterface $em = $this->repoWorkerJob->getEntityManager(); $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $payload['base_url']]; + $clientOptions = [ + 'base_uri' => $payload['base_url'], + 'verify' => $payload['verify_ssl'] + ]; // add proxy in each request if defined in configuration $uploaderClient = $proxyConfig->getClientWithOptions($clientOptions); //get asset informations - $body = $uploaderClient->get('/assets/'.$payload['asset'], [ + $body = $uploaderClient->get('assets/'.$payload['asset'], [ 'headers' => [ 'Authorization' => 'AssetToken '.$payload['assetToken'] ] @@ -90,7 +93,7 @@ class CreateRecordWorker implements WorkerInterface $em->flush(); //download the asset - $client = $proxyConfig->getClientWithOptions(); + $client = $proxyConfig->getClientWithOptions(['verify' => $payload['verify_ssl']]); $tempfile = $this->getTemporaryFilesystem()->createTemporaryFile('download_', null, pathinfo($body['originalName'], PATHINFO_EXTENSION)); try { @@ -154,7 +157,7 @@ class CreateRecordWorker implements WorkerInterface // if all assets in the commit are downloaded , send ack to the uploader if ($canAck) { // post ack to the uploader - $uploaderClient->post('/commits/' . $payload['commit_id'] . '/ack', [ + $uploaderClient->post('commits/' . $payload['commit_id'] . '/ack', [ 'headers' => [ 'Authorization' => 'AssetToken '.$payload['assetToken'] ], diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php index c0363cc4be..8cc72def12 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/ExposeUploadWorker.php @@ -88,7 +88,11 @@ class ExposeUploadWorker implements WorkerInterface $exposeConfiguration = $exposeConfiguration[$payload['exposeName']]; $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $clientOptions = ['base_uri' => $exposeConfiguration['expose_base_uri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $exposeConfiguration['expose_base_uri'], + 'http_errors' => false, + 'verify' => $exposeConfiguration['verify_ssl'] + ]; // add proxy in each request if defined in configuration $exposeClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -252,7 +256,7 @@ class ExposeUploadWorker implements WorkerInterface $assetsResponse = json_decode($response->getBody(),true); - $uploadUrl = $proxyConfig->getClientWithOptions(); + $uploadUrl = $proxyConfig->getClientWithOptions(['verify' => $exposeConfiguration['verify_ssl']]); $uploadUrl->put($assetsResponse['uploadURL'], [ 'headers' => [ 'Content-Type' => 'application/binary' @@ -391,7 +395,8 @@ class ExposeUploadWorker implements WorkerInterface $proxyConfig = new NetworkProxiesConfiguration($this->app['conf']); - $uploadUrl = $proxyConfig->getClientWithOptions(); + $verifySsl = $exposeClient->getConfig('verify') ? true : false; + $uploadUrl = $proxyConfig->getClientWithOptions(['verify' => $verifySsl]); $res = $uploadUrl->put($subDefResponse['uploadURL'], [ 'headers' => [ diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php index 77a951212b..9e5899742f 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Worker/PullAssetsWorker.php @@ -34,8 +34,14 @@ class PullAssetsWorker implements WorkerInterface return; } + $verifySsl = isset($config['verify_ssl']) ? $config['verify_ssl'] : true ; + $proxyConfig = new NetworkProxiesConfiguration($this->conf); - $clientOptions = ['base_uri' => $config['UploaderApiBaseUri'], 'http_errors' => false]; + $clientOptions = [ + 'base_uri' => $config['UploaderApiBaseUri'], + 'http_errors' => false, + 'verify' => $verifySsl + ]; // add proxy in each request if defined in configuration $uploaderClient = $proxyConfig->getClientWithOptions($clientOptions); @@ -83,7 +89,8 @@ class PullAssetsWorker implements WorkerInterface 'commit_id' => $commit['id'], 'token' => $commit['token'], 'base_url' => $config['UploaderApiBaseUri'], - 'type' => WorkerRunningJob::TYPE_PULL + 'type' => WorkerRunningJob::TYPE_PULL, + 'verify_ssl'=> $verifySsl ] ]; diff --git a/lib/classes/media/subdef.php b/lib/classes/media/subdef.php index 544f838504..2d91d16e1b 100644 --- a/lib/classes/media/subdef.php +++ b/lib/classes/media/subdef.php @@ -684,6 +684,9 @@ class media_subdef extends media_abstract implements cache_cacheableInterface $symlinker->symlink($subdef->getRealPath()); } + // delete from cache the list of available subdef for the record to taken account the new subdef + $subdef->get_record()->delete_data_from_cache(record_adapter::CACHE_SUBDEFS); + return $subdef; } diff --git a/lib/conf.d/json_schema/assets_enqueue.json b/lib/conf.d/json_schema/assets_enqueue.json index 416f321fb6..1329988d73 100644 --- a/lib/conf.d/json_schema/assets_enqueue.json +++ b/lib/conf.d/json_schema/assets_enqueue.json @@ -18,6 +18,10 @@ }, "commit_id": { "type": "string" + }, + "verify_ssl": { + "type": "boolean", + "default": true } }, "required": [ diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index fd0d69d03a..75b661e786 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -237,13 +237,13 @@ %quantity% records added %quantity% Datensätze hinzugefügt - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/StoryController.php %quantity% records moved %quantity% Datensätze bewegt - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php %quantity% selected files @@ -603,8 +603,8 @@ Accuse de reception Empfangsbestätigung Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Accuse de reception indisponible, vous n'avez pas declare d'adresse email @@ -967,7 +967,7 @@ Model/Manipulator/LazaretManipulator.php Controller/Prod/MoveCollectionController.php Controller/Prod/LazaretController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php @@ -1038,7 +1038,7 @@ An error occurred Ein Fehler ist aufgetreten Order/Controller/ProdOrderController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php @@ -1456,27 +1456,27 @@ Basket created Sammelkorb wurde erstellt - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been archived Sammelkorb wurde archiviert - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been deleted Sammelkorb wurde gelöscht - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been unarchived Sammelkorb wurde nicht mehr archiviert - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been updated Sammelkorb wurde aktualisiert - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket is not found @@ -1496,7 +1496,7 @@ Basket updated Sammelkorb wurde aktualisiert - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Binary data @@ -2512,7 +2512,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -3349,14 +3349,14 @@ Force authentication Benutzer müssen sich mit einem Login und Passwort anmelden - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force authentication : info Wenn das Kästchen nicht markiert ist, einen Login Authentifizierungslink wird in der Email beinhaltet - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force sending of the document ? @@ -4313,7 +4313,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Reminder.html.twig prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig Message automatique de Phraseanet @@ -4460,7 +4460,7 @@ Controller/Prod/LanguageController.php Bridge/Dailymotion/playlist_createcontainer.html.twig actions/Download/prepare.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig admin/fields/templates.html.twig @@ -5539,7 +5539,7 @@ Record removed from basket Datensatz wurde aus dem Sammelkorb gelöscht - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Record removed from story @@ -6132,7 +6132,7 @@ Share has been extended Die Dauer der Teilung wurde verlängert - prod/actions/Push.html.twig + prod/actions/Push.html.twig Share my list @@ -6268,7 +6268,7 @@ Start Start - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6321,7 +6321,7 @@ Stop prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6686,7 +6686,7 @@ The requested basket does not exist Der erforderte Sammelkorb existiert nicht - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php The task status @@ -6835,7 +6835,7 @@ Time for feedback (days) Zeit für Feedback (Tage) Controller/Prod/LanguageController.php - prod/templates/push.html.twig + prod/templates/push.html.twig Titre @@ -7098,7 +7098,7 @@ Unknown user %usr_id% Unbekannter Benutzer %usr_id% WorkerManager/Worker/ShareBasketWorker.php - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php Unreachable server @@ -7230,8 +7230,8 @@ User can download HD Benutzer darf HD herunterladen Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig User can see others choices @@ -7743,7 +7743,7 @@ You do not have access to this basket Sie haben keinen Zugriff auf diesen Sammelkorb - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php You do not have enough rights to access quarantine @@ -9362,22 +9362,22 @@ admin::workermanager:tab:pullassets: Client ID Client ID - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Client secret Client secret - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Fetching interval in second Abrufintervall in Sekunden - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Uploader api base uri Uploader API base URI, zum Beispiel: https://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: description @@ -9389,6 +9389,11 @@ Uploader admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: verify ssl + admin::workermanager:tab:pullassets: verify ssl + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:queueMonitor: Consumer count Worker Anzahl @@ -9700,32 +9705,32 @@ admin:phrasea-service-setting:tab:expose:: Add mapping Ein Phraseanet Mapping für die Medien und seine Beschreibung hinzufügen - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Add user Benutzer hinzufügen - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Auth Base Uri Auth Base Uri - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client ID Auth Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client secret Auth Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Connection Kind Verbindungsmethode - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Delete @@ -9735,42 +9740,47 @@ admin:phrasea-service-setting:tab:expose:: Expose Base Uri api Expose Base Uri API - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client ID Expose Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client secret Expose Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Front base uri Expose Front base URI - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose setting Einstellungen für Expose Service - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Name Expose Name - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: New expose interconnection name Expose unbennant admin/phraseanet-service/expose.html.twig + + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin/phraseanet-service/expose.html.twig + admin:phrasea-service-setting:tab:expose:: Save Speichern - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: activate Phraseanet-service expose @@ -9780,17 +9790,22 @@ admin:phrasea-service-setting:tab:expose:: add Mapping Ein Phraseanet Mapping für die Medien und die Beschreibungsfelder hinzufügen - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: add user Benutzer hinzufügen - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: connection test Verbindungstest mit Expose (nicht implementiert) - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig + + + admin:phrasea-service-setting:tab:expose:: verify ssl + admin:phrasea-service-setting:tab:expose:: verify ssl + PhraseanetService/Form/PSExposeConnectionType.php admin:searchengine:aggregates:New field, please confirm setting. @@ -9978,7 +9993,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php web/admin/users.html.twig @@ -10381,7 +10396,7 @@ client_credentials client_credentials - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php collection.label.unknown @@ -11442,7 +11457,7 @@ notification:: Basket %name% is shared Sammelkorb %name% wurde geteilt - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php notification:: Basket WIP @@ -11843,7 +11858,7 @@ password Passwort - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php personalize logo @@ -12066,7 +12081,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden. web/account/account.html.twig @@ -12585,12 +12600,12 @@ print_feedback:: Non Nein - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Ja - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : @@ -12605,32 +12620,32 @@ print_feedback:: base name: Datenbank : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Uuid Dokument : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté unausgedrückt - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Originale Dateiname : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titel : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -12941,12 +12956,12 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod::feedback:feedback_set_title Feedback Name - prod/templates/push.html.twig + prod/templates/push.html.twig prod::feedback:shared_set_title Sammelkorbtitel - prod/templates/push.html.twig + prod/templates/push.html.twig prod::listmanager Delete the list @@ -12981,13 +12996,13 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod::push: automatically send user reminder Eine automatische Mahnung programmieren, für die Benutzer, die ihre Abstimmungen nicht abgeschlossen haben - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig prod::push:push_set_title Name der Push Sammelkorb - prod/templates/push.html.twig + prod/templates/push.html.twig prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -15090,7 +15105,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15674,13 +15689,13 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben validation:: NON Nein - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig validation:: OUI Ja - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 6655cae6e9..ef3f7c22d9 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -237,13 +237,13 @@ %quantity% records added %quantity% records added - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/StoryController.php %quantity% records moved %quantity% records moved - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php %quantity% selected files @@ -603,8 +603,8 @@ Accuse de reception Acknowledge receipt Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Accuse de reception indisponible, vous n'avez pas declare d'adresse email @@ -968,7 +968,7 @@ Model/Manipulator/LazaretManipulator.php Controller/Prod/MoveCollectionController.php Controller/Prod/LazaretController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php @@ -1039,7 +1039,7 @@ An error occurred An error occurred Order/Controller/ProdOrderController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php @@ -1457,27 +1457,27 @@ Basket created Basket created - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been archived Basket has been archived - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been deleted Basket has been deleted - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been unarchived Basket has been unarchived - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been updated Basket has been updated - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket is not found @@ -1497,7 +1497,7 @@ Basket updated Basket updated - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Binary data @@ -2515,7 +2515,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -3352,14 +3352,14 @@ Force authentication Users must authenticate with a login and a password - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force authentication : info If box is unchecked, the user will receive an authentication link in the notification email - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force sending of the document ? @@ -4316,7 +4316,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Reminder.html.twig prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig Message automatique de Phraseanet @@ -4463,7 +4463,7 @@ Controller/Prod/LanguageController.php Bridge/Dailymotion/playlist_createcontainer.html.twig actions/Download/prepare.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig admin/fields/templates.html.twig @@ -5542,7 +5542,7 @@ Record removed from basket Record removed from basket - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Record removed from story @@ -6135,7 +6135,7 @@ Share has been extended Sharing expiration date has been extended - prod/actions/Push.html.twig + prod/actions/Push.html.twig Share my list @@ -6271,7 +6271,7 @@ Start Start - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6324,7 +6324,7 @@ Stop prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6689,7 +6689,7 @@ The requested basket does not exist The requested basket does not exist - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php The task status @@ -6838,7 +6838,7 @@ Time for feedback (days) Time for feedback (in days) Controller/Prod/LanguageController.php - prod/templates/push.html.twig + prod/templates/push.html.twig Titre @@ -7101,7 +7101,7 @@ Unknown user %usr_id% Unknown user %usr_id% WorkerManager/Worker/ShareBasketWorker.php - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php Unreachable server @@ -7233,8 +7233,8 @@ User can download HD User can download Documents Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig User can see others choices @@ -7746,7 +7746,7 @@ You do not have access to this basket You do not have access to this basket - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php You do not have enough rights to access quarantine @@ -9365,22 +9365,22 @@ admin::workermanager:tab:pullassets: Client ID Client ID - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Client secret Client secret - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Fetching interval in second Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Uploader api base uri Uploader API base URI, example : https://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: description @@ -9392,6 +9392,11 @@ Uploader admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: verify ssl + admin::workermanager:tab:pullassets: verify ssl + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:queueMonitor: Consumer count Number of worker(s) @@ -9703,32 +9708,32 @@ admin:phrasea-service-setting:tab:expose:: Add mapping Add mapping for the assets and the notice - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Add user Add user - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Auth Base Uri Auth Base Uri - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client ID Auth Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client secret Auth Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Connection Kind Interconnection method - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Delete @@ -9738,42 +9743,47 @@ admin:phrasea-service-setting:tab:expose:: Expose Base Uri api Expose Base Uri API - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client ID Expose Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client secret Expose Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Front base uri Expose Front base URI - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose setting Expose Service setting - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Name Expose Name - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: New expose interconnection name New Expose admin/phraseanet-service/expose.html.twig + + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin/phraseanet-service/expose.html.twig + admin:phrasea-service-setting:tab:expose:: Save Save - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: activate Phraseanet-service expose @@ -9783,17 +9793,22 @@ admin:phrasea-service-setting:tab:expose:: add Mapping Add Mapping for Phraseanet assets and descriptions - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: add user Add user - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: connection test Test connection with Expose (not implemented) - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig + + + admin:phrasea-service-setting:tab:expose:: verify ssl + admin:phrasea-service-setting:tab:expose:: verify ssl + PhraseanetService/Form/PSExposeConnectionType.php admin:searchengine:aggregates:New field, please confirm setting. @@ -9981,7 +9996,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php web/admin/users.html.twig @@ -10384,7 +10399,7 @@ client_credentials client_credentials - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php collection.label.unknown @@ -11445,7 +11460,7 @@ notification:: Basket %name% is shared Basket " %name% " has been shared - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php notification:: Basket WIP @@ -11846,7 +11861,7 @@ password Password - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php personalize logo @@ -12069,7 +12084,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface. web/account/account.html.twig @@ -12588,12 +12603,12 @@ print_feedback:: Non No - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Yes - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : @@ -12608,32 +12623,32 @@ print_feedback:: base name: Base Name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Document Unique Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Unexpressed - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Original file name : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Record Title : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -12946,12 +12961,12 @@ Warning: The current values will be overwritten by these new values prod::feedback:feedback_set_title Feedback Title : - prod/templates/push.html.twig + prod/templates/push.html.twig prod::feedback:shared_set_title Basket title - prod/templates/push.html.twig + prod/templates/push.html.twig prod::listmanager Delete the list @@ -12986,13 +13001,13 @@ Warning: The current values will be overwritten by these new values prod::push: automatically send user reminder Schedule an automatic reminder to users who didn't send their feedback - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig prod::push:push_set_title Name of Push Basket - prod/templates/push.html.twig + prod/templates/push.html.twig prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -15100,7 +15115,7 @@ It is possible to place several search areas web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15684,13 +15699,13 @@ It is possible to place several search areas validation:: NON NO - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig validation:: OUI YES - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index b3874d5304..1259ebe3ed 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
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.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -237,13 +237,13 @@ %quantity% records added %quantity% enregistrements ajoutés - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/StoryController.php %quantity% records moved %quantity% enregistrements déplacés - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php %quantity% selected files @@ -603,8 +603,8 @@ Accuse de reception Accusé de réception Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Accuse de reception indisponible, vous n'avez pas declare d'adresse email @@ -967,7 +967,7 @@ Model/Manipulator/LazaretManipulator.php Controller/Prod/MoveCollectionController.php Controller/Prod/LazaretController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php @@ -1038,7 +1038,7 @@ An error occurred Une erreur est survenue Order/Controller/ProdOrderController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php @@ -1456,27 +1456,27 @@ Basket created Panier créé - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been archived Le panier a été archivé - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been deleted Le panier a été supprimé - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been unarchived Le panier est disponible dans la fenêtre des paniers - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been updated Le panier a été mis à jour - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket is not found @@ -1496,7 +1496,7 @@ Basket updated Paniers mis à jour - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Binary data @@ -2512,7 +2512,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -3349,14 +3349,14 @@ Force authentication Les utilisateurs doivent s'authentifier à l'aide d'un identifiant et d'un mot de passe - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force authentication : info Si la case n'est pas cochée, un lien d'authentification sera inclus dans l'email reçu par l'utilisateur - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force sending of the document ? @@ -4313,7 +4313,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Reminder.html.twig prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig Message automatique de Phraseanet @@ -4460,7 +4460,7 @@ Controller/Prod/LanguageController.php Bridge/Dailymotion/playlist_createcontainer.html.twig actions/Download/prepare.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig admin/fields/templates.html.twig @@ -5539,7 +5539,7 @@ Record removed from basket L'enregistrement a été supprimé du panier - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Record removed from story @@ -6132,7 +6132,7 @@ Share has been extended La durée du partage a été étendue - prod/actions/Push.html.twig + prod/actions/Push.html.twig Share my list @@ -6268,7 +6268,7 @@ Start Démarrer - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6321,7 +6321,7 @@ Arrêter prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6686,7 +6686,7 @@ The requested basket does not exist La panier demandé n'existe pas - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php The task status @@ -6835,7 +6835,7 @@ Time for feedback (days) Durée de la validation (en jours) Controller/Prod/LanguageController.php - prod/templates/push.html.twig + prod/templates/push.html.twig Titre @@ -7098,7 +7098,7 @@ Unknown user %usr_id% Utilisateur inconnu %usr_id% WorkerManager/Worker/ShareBasketWorker.php - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php Unreachable server @@ -7230,8 +7230,8 @@ User can download HD L'utilisateur peut télécharger des documents HD Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig User can see others choices @@ -7743,7 +7743,7 @@ You do not have access to this basket Vous n'avez pas accès à ce panier - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php You do not have enough rights to access quarantine @@ -9363,22 +9363,22 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:pullassets: Client ID Client ID - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Client secret Client secret - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Fetching interval in second Intervalle de récupération, en secondes - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Uploader api base uri Uploader API base URI, URI de base de l'api uploader, exemple http://api-uploader.phrasea.io - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: description @@ -9390,6 +9390,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Uploader admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: verify ssl + admin::workermanager:tab:pullassets: verify ssl + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:queueMonitor: Consumer count Nombre de worker @@ -9701,32 +9706,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin:phrasea-service-setting:tab:expose:: Add mapping Ajouter un mapping Phraseanet pour les assets et la fiche d'indexation - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Add user Ajouter un utilisateur - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Auth Base Uri Auth Base Uri - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client ID Auth Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client secret Auth Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Connection Kind Méthode d'interconnexion - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Delete @@ -9736,42 +9741,47 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin:phrasea-service-setting:tab:expose:: Expose Base Uri api Expose Base Uri API - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client ID Expose Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client secret Expose Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Front base uri Expose Front base URI - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose setting Réglage d'Expose Service - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Name Nom de l'Expose - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: New expose interconnection name Expose sans nom admin/phraseanet-service/expose.html.twig + + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin/phraseanet-service/expose.html.twig + admin:phrasea-service-setting:tab:expose:: Save Sauvegarder - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: activate Phraseanet-service expose @@ -9781,17 +9791,22 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin:phrasea-service-setting:tab:expose:: add Mapping Ajouter un mapping Phraseanet pour les assets et les champs de description - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: add user Ajouter un utilisateur - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: connection test Test de connexion avec Expose (non implémenté) - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig + + + admin:phrasea-service-setting:tab:expose:: verify ssl + admin:phrasea-service-setting:tab:expose:: verify ssl + PhraseanetService/Form/PSExposeConnectionType.php admin:searchengine:aggregates:New field, please confirm setting. @@ -9979,7 +9994,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php web/admin/users.html.twig @@ -10382,7 +10397,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le client_credentials client_credentials - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php collection.label.unknown @@ -11443,7 +11458,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le notification:: Basket %name% is shared Le panier %name% a été partagé - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php notification:: Basket WIP @@ -11844,7 +11859,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le password Mot de passe - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php personalize logo @@ -12067,7 +12082,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration. web/account/account.html.twig @@ -12586,12 +12601,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print_feedback:: Non Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : @@ -12606,32 +12621,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le print_feedback:: base name: Base : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: Id unique de document : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté Non exprimé - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: Nom de fichier : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: Record Id : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: Titre : - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -12944,12 +12959,12 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod::feedback:feedback_set_title Nom de la validation - prod/templates/push.html.twig + prod/templates/push.html.twig prod::feedback:shared_set_title Titre du panier - prod/templates/push.html.twig + prod/templates/push.html.twig prod::listmanager Delete the list @@ -12984,13 +12999,13 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod::push: automatically send user reminder Programmer une relance automatique pour les utilisateurs n'ayant pas finalisé les votes - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig prod::push:push_set_title Nom du panier de Push - prod/templates/push.html.twig + prod/templates/push.html.twig prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -15099,7 +15114,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig @@ -15683,13 +15698,13 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles validation:: NON Non - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig validation:: OUI Oui - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 79e551e7fa..70d3184734 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. @@ -237,13 +237,13 @@ %quantity% records added %quantity% records added - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/StoryController.php %quantity% records moved %quantity% records moved - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php %quantity% selected files @@ -603,8 +603,8 @@ Accuse de reception Ontvangstbevestiging Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Accuse de reception indisponible, vous n'avez pas declare d'adresse email @@ -968,7 +968,7 @@ Model/Manipulator/LazaretManipulator.php Controller/Prod/MoveCollectionController.php Controller/Prod/LazaretController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php @@ -1039,7 +1039,7 @@ An error occurred Er is een fout opgetreden Order/Controller/ProdOrderController.php - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php @@ -1457,27 +1457,27 @@ Basket created Mandje werd aangemaakt - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been archived Mandje werd geachriveerd - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been deleted Mandje werd verwijderd - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been unarchived Mandje werd actief gezet - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket has been updated Mandje werd geüpdate - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Basket is not found @@ -1497,7 +1497,7 @@ Basket updated Mandje geüpdate - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Binary data @@ -3355,14 +3355,14 @@ Force authentication Force authentication - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force authentication : info Force authentication : info - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig Force sending of the document ? @@ -4319,7 +4319,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Reminder.html.twig prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig Message automatique de Phraseanet @@ -4466,7 +4466,7 @@ Controller/Prod/LanguageController.php Bridge/Dailymotion/playlist_createcontainer.html.twig actions/Download/prepare.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig admin/fields/templates.html.twig @@ -5545,7 +5545,7 @@ Record removed from basket Record uit het mandje verwijderd - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php Record removed from story @@ -6138,7 +6138,7 @@ Share has been extended Share has been extended - prod/actions/Push.html.twig + prod/actions/Push.html.twig Share my list @@ -6274,7 +6274,7 @@ Start Start - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6327,7 +6327,7 @@ Stop prod/upload/lazaret.html.twig prod/upload/lazaret.html.twig - admin/worker-manager/worker_pull_assets.html.twig + admin/worker-manager/worker_pull_assets.html.twig admin/worker-manager/worker_records_actions.html.twig admin/worker-manager/worker_validation_reminder.html.twig admin/task-manager/templates.html.twig @@ -6692,7 +6692,7 @@ The requested basket does not exist Het gevraagde mandje bestaat niet - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php The task status @@ -6841,7 +6841,7 @@ Time for feedback (days) Tijd voor feedback (dagen) Controller/Prod/LanguageController.php - prod/templates/push.html.twig + prod/templates/push.html.twig Titre @@ -7104,7 +7104,7 @@ Unknown user %usr_id% Unknown user %usr_id% WorkerManager/Worker/ShareBasketWorker.php - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php Unreachable server @@ -7236,8 +7236,8 @@ User can download HD Gebruiker kan HD downloaden Controller/Prod/LanguageController.php - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig User can see others choices @@ -7749,7 +7749,7 @@ You do not have access to this basket U hebt geen toegang tot dit mandje - Controller/Prod/BasketController.php + Controller/Prod/BasketController.php You do not have enough rights to access quarantine @@ -9368,22 +9368,22 @@ admin::workermanager:tab:pullassets: Client ID admin::workermanager:tab:pullassets: Client ID - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Client secret admin::workermanager:tab:pullassets: Client secret - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Fetching interval in second admin::workermanager:tab:pullassets: Fetching interval in second - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: Uploader api base uri admin::workermanager:tab:pullassets: Uploader api base uri - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php admin::workermanager:tab:pullassets: description @@ -9395,6 +9395,11 @@ admin::workermanager:tab:pullassets: title admin/worker-manager/index.html.twig + + admin::workermanager:tab:pullassets: verify ssl + admin::workermanager:tab:pullassets: verify ssl + WorkerManager/Form/WorkerPullAssetsType.php + admin::workermanager:tab:queueMonitor: Consumer count admin::workermanager:tab:queueMonitor: Consumer count @@ -9706,32 +9711,32 @@ admin:phrasea-service-setting:tab:expose:: Add mapping admin:phrasea-service-setting:tab:expose:: Add mapping - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Add user admin:phrasea-service-setting:tab:expose:: Add user - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Auth Base Uri admin:phrasea-service-setting:tab:expose:: Auth Base Uri - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client ID admin:phrasea-service-setting:tab:expose:: Auth Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Auth Client secret admin:phrasea-service-setting:tab:expose:: Auth Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Connection Kind admin:phrasea-service-setting:tab:expose:: Connection Kind - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Delete @@ -9741,42 +9746,47 @@ admin:phrasea-service-setting:tab:expose:: Expose Base Uri api admin:phrasea-service-setting:tab:expose:: Expose Base Uri api - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client ID admin:phrasea-service-setting:tab:expose:: Expose Client ID - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Client secret admin:phrasea-service-setting:tab:expose:: Expose Client secret - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose Front base uri admin:phrasea-service-setting:tab:expose:: Expose Front base uri - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: Expose setting admin:phrasea-service-setting:tab:expose:: Expose setting - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: Name admin:phrasea-service-setting:tab:expose:: Name - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php admin:phrasea-service-setting:tab:expose:: New expose interconnection name admin:phrasea-service-setting:tab:expose:: New expose interconnection name admin/phraseanet-service/expose.html.twig + + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin:phrasea-service-setting:tab:expose:: New expose interconnection name + admin/phraseanet-service/expose.html.twig + admin:phrasea-service-setting:tab:expose:: Save admin:phrasea-service-setting:tab:expose:: Save - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: activate Phraseanet-service expose @@ -9786,17 +9796,22 @@ admin:phrasea-service-setting:tab:expose:: add Mapping admin:phrasea-service-setting:tab:expose:: add Mapping - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: add user admin:phrasea-service-setting:tab:expose:: add user - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig admin:phrasea-service-setting:tab:expose:: connection test admin:phrasea-service-setting:tab:expose:: connection test - admin/phraseanet-service/expose.html.twig + admin/phraseanet-service/expose.html.twig + + + admin:phrasea-service-setting:tab:expose:: verify ssl + admin:phrasea-service-setting:tab:expose:: verify ssl + PhraseanetService/Form/PSExposeConnectionType.php admin:searchengine:aggregates:New field, please confirm setting. @@ -9984,7 +9999,7 @@ WorkerManager/Form/WorkerValidationReminderType.php WorkerManager/Form/WorkerConfigurationType.php WorkerManager/Form/WorkerRecordsActionsType.php - WorkerManager/Form/WorkerPullAssetsType.php + WorkerManager/Form/WorkerPullAssetsType.php web/admin/users.html.twig @@ -10387,7 +10402,7 @@ client_credentials client_credentials - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php collection.label.unknown @@ -11448,7 +11463,7 @@ notification:: Basket %name% is shared notification:: Basket %name% is shared - WorkerManager/Worker/ShareBasketWorker.php + WorkerManager/Worker/ShareBasketWorker.php notification:: Basket WIP @@ -11849,7 +11864,7 @@ password password - PhraseanetService/Form/PSExposeConnectionType.php + PhraseanetService/Form/PSExposeConnectionType.php personalize logo @@ -12591,12 +12606,12 @@ print_feedback:: Non print_feedback:: Non - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Oui print_feedback:: Oui - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: Participants : @@ -12611,32 +12626,32 @@ print_feedback:: base name: print_feedback:: base name: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: document Uuid: print_feedback:: document Uuid: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: non voté print_feedback:: non voté - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: originale filename: print_feedback:: originale filename: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record id: print_feedback:: record id: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php print_feedback:: record title: print_feedback:: record title: - Out/Module/PDFRecords.php + Out/Module/PDFRecords.php prive @@ -12946,12 +12961,12 @@ prod::feedback:feedback_set_title prod::feedback:feedback_set_title - prod/templates/push.html.twig + prod/templates/push.html.twig prod::feedback:shared_set_title prod::feedback:shared_set_title - prod/templates/push.html.twig + prod/templates/push.html.twig prod::listmanager Delete the list @@ -12986,13 +13001,13 @@ prod::push: automatically send user reminder prod::push: automatically send user reminder - prod/templates/push.html.twig - prod/templates/push.html.twig + prod/templates/push.html.twig + prod/templates/push.html.twig prod::push:push_set_title prod::push:push_set_title - prod/templates/push.html.twig + prod/templates/push.html.twig prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -15679,13 +15694,13 @@ validation:: NON NEE - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig validation:: OUI JA - web/lightbox/agreement_box.html.twig + web/lightbox/agreement_box.html.twig mobile/lightbox/basket_element.html.twig diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index f7311c8b31..e3c5138acb 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 0f2b494c22..ac4134458e 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 f5d92a917f..58870b6c22 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 e4bdf0cb08..a0997ebaea 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/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 6723380066..5fa55aa1e7 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -1128,6 +1128,14 @@ span.simplecolorpicker.picker { } } +/***Uploader tab***/ +#worker-pull-assets { + input[type=checkbox] { + float: left; + margin-right: 10px; + } +} + @import './databases'; @import './fields'; @import './tables'; diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig index f77751b1d2..c6aaa98371 100644 --- a/templates/web/admin/phraseanet-service/expose.html.twig +++ b/templates/web/admin/phraseanet-service/expose.html.twig @@ -22,6 +22,11 @@ {{ form_row(form.expose_name) }} +
+ {{ form_widget(form.verify_ssl) }} + {{ form_label(form.verify_ssl) }} +
+
{{ form_row(form.expose_front_uri) }}
@@ -84,7 +89,7 @@
+ value="{{ 'admin:phrasea-service-setting:tab:expose:: New expose interconnection name' | trans }}">
{{ 'admin::workermanager:tab:pullassets: description' |trans }} {{ form_start(form, {'action': path('worker_admin_pullAssets')}) }} -{{ form_widget(form) }} + +
+ {{ form_row(form.UploaderApiBaseUri) }} +
+ +
+ {{ form_row(form.clientSecret) }} +
+ +
+ {{ form_row(form.clientId) }} +
+ +
+ {{ form_row(form.pullInterval) }} +
+ +
+ {{ form_widget(form.verify_ssl) }} + {{ form_label(form.verify_ssl) }} +
+ +
+ {{ form_row(form.apply) }} +
+