hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3236 merge master into branch

Browse Source
This commit is contained in:
aina esokia
2020-11-18 18:25:04 +03:00
parent 11777445f9 40de8e3327
commit 5da6ff8a2b
23 changed files with 553 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Phraseanet-production-client/dist/production.js vendored
View File

@@ -2588,7 +2588,7 @@ var leafletMap = function leafletMap(services) {
if (editable) {
$noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox);
@@ -2628,7 +2628,7 @@ var leafletMap = function leafletMap(services) {
if (drawable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs);
@@ -2637,7 +2637,7 @@ var leafletMap = function leafletMap(services) {
if (editable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs);
@@ -50602,8 +50602,20 @@ var markerGLCollection = function markerGLCollection(services) {
};
var setPoint = function setPoint(marker) {
var markerId = marker.properties.recordIndex;
var markerElement = getMarker(marker.properties._rid);
if (marker.properties._rid !== undefined) {
markerId = marker.properties._rid;
}
var markerElement = getMarker(markerId);
if (markerElement === undefined) {
var el = document.createElement('div');
el.className = 'mapboxGl-phrasea-marker';
markerElement = markerGl[markerId] = new mapboxgl.Marker(el);
}
markerElement.feature = {
properties: {
@@ -50682,7 +50694,6 @@ var markerGLCollection = function markerGLCollection(services) {
markerSelected.togglePopup();
cachedGeoJson.features[0].geometry.coordinates = [marker._originalPosition.lng, marker._originalPosition.lat];
resetMarkerPosition($content, markerSelected);
});
};

21
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -2588,7 +2588,7 @@ var leafletMap = function leafletMap(services) {
if (editable) {
$noticeButton = (0, _jquery2.default)('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBox = (0, _jquery2.default)('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox);
@@ -2628,7 +2628,7 @@ var leafletMap = function leafletMap(services) {
if (drawable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBoxJs = (0, _jquery2.default)('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs);
@@ -2637,7 +2637,7 @@ var leafletMap = function leafletMap(services) {
if (editable) {
$noticeButtonJs = (0, _jquery2.default)('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
$noticeBoxJs = (0, _jquery2.default)('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' + localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs);
@@ -50602,8 +50602,20 @@ var markerGLCollection = function markerGLCollection(services) {
};
var setPoint = function setPoint(marker) {
var markerId = marker.properties.recordIndex;
var markerElement = getMarker(marker.properties._rid);
if (marker.properties._rid !== undefined) {
markerId = marker.properties._rid;
}
var markerElement = getMarker(markerId);
if (markerElement === undefined) {
var el = document.createElement('div');
el.className = 'mapboxGl-phrasea-marker';
markerElement = markerGl[markerId] = new mapboxgl.Marker(el);
}
markerElement.feature = {
properties: {
@@ -50682,7 +50694,6 @@ var markerGLCollection = function markerGLCollection(services) {
markerSelected.togglePopup();
cachedGeoJson.features[0].geometry.coordinates = [marker._originalPosition.lng, marker._originalPosition.lat];
resetMarkerPosition($content, markerSelected);
});
};

6
Phraseanet-production-client/src/components/geolocalisation/providers/mapbox.js
View File

@@ -454,7 +454,7 @@ const leafletMap = (services) => {
$noticeButton = $('<button id="map-info-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBox = $('<div id="notice-info-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxgl: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxgl: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
localeService.t("mapboxgl title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxgl description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButton);
controlContainerEdit.append($noticeBox);
@@ -495,7 +495,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('<button id="map-noticeJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = $('<div id="noticeJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxjs: title notice") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
localeService.t("mapboxjs title notice") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description notice") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerSearch.append($noticeButtonJs);
controlContainerSearch.append($noticeBoxJs);
@@ -505,7 +505,7 @@ const leafletMap = (services) => {
$noticeButtonJs = $('<button id="map-infoJs-btn"><img src="/assets/common/images/icons/button-information-grey.png" width="34" height="34"/></button>');
$noticeBoxJs = $('<div id="notice-infoJs-box"><span class="notice-header"><img src="/assets/common/images/icons/information-grey.png" width="18" height="18" /><span class="notice-title">' +
localeService.t("prod:mapboxjs: title info") + '</span></span><span class="notice-desc">' + localeService.t("prod:mapboxjs: description info : right click to add position") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
localeService.t("mapboxjs title info") + '</span></span><span class="notice-desc">' + localeService.t("mapboxjs description info") + '</span><span class="notice-close-btn"><img src="/assets/common/images/icons/button-close-gray.png" /></span></div>');
controlContainerEdit.append($noticeButtonJs);
controlContainerEdit.append($noticeBoxJs);

15
Phraseanet-production-client/src/components/geolocalisation/providers/markerGLCollection.js
View File

@@ -39,8 +39,20 @@ const markerGLCollection = (services) => {
};
const setPoint = (marker) => {
let markerId = marker.properties.recordIndex;
let markerElement = getMarker(marker.properties._rid);
if (marker.properties._rid !== undefined) {
markerId = marker.properties._rid;
}
let markerElement = getMarker(markerId);
if (markerElement === undefined) {
let el = document.createElement('div');
el.className = 'mapboxGl-phrasea-marker';
markerElement = markerGl[markerId] = new mapboxgl.Marker(el);
}
markerElement.feature = {
properties : {
@@ -134,7 +146,6 @@ const markerGLCollection = (services) => {
markerSelected.togglePopup();
cachedGeoJson.features[0].geometry.coordinates = [marker._originalPosition.lng, marker._originalPosition.lat];
resetMarkerPosition($content, markerSelected);
});
}

12
lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php
View File

@@ -159,12 +159,12 @@ 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:mapboxjs: title notice' => $translator->trans('prod:mapboxjs: title notice'),
'prod:mapboxjs: description notice' => $translator->trans('prod:mapboxjs: description notice'),
'prod:mapboxjs: title info' => $translator->trans('prod:mapboxjs: title info'),
'prod:mapboxjs: description info : right click to add position' => $translator->trans('prod:mapboxjs: description info : right click to add position'),
'prod:mapboxgl: title info' => $translator->trans('prod:mapboxgl: title info'),
'prod:mapboxgl: description info : right click to add position' => $translator->trans('prod:mapboxgl: description info : right click to add position'),
'mapboxjs title notice' => $translator->trans('prod:mapboxjs: title notice'),
'mapboxjs description notice' => $translator->trans('prod:mapboxjs: description notice'),
'mapboxjs title info' => $translator->trans('prod:mapboxjs: title info'),
'mapboxjs description info' => $translator->trans('prod:mapboxjs: description info : right click to add position'),
'mapboxgl title info' => $translator->trans('prod:mapboxgl: title info'),
'mapboxgl description info' => $translator->trans('prod:mapboxgl: description info : right click to add position'),
'prod:videoeditor:subtitletab:message:: error' => $translator->trans('prod:videoeditor:subtitletab:message:: error'),
'prod:videoeditor:subtitletab:message:: success' => $translator->trans('prod:videoeditor:subtitletab:message:: success'),
'Edit expose title' => $translator->trans('prod:workzone:expose:modal:: title'),

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
View File

@@ -60,7 +60,7 @@ class ElasticsearchOptions
'replicas' => 0,
'minScore' => 4,
'highlight' => true,
'max_result_window' => 500000,
'maxResultWindow' => 500000,
'populate_order' => self::POPULATE_ORDER_RID,
'populate_direction' => self::POPULATE_DIRECTION_DESC,
'activeTab' => null,
@@ -76,7 +76,7 @@ class ElasticsearchOptions
$self->setReplicas($options['replicas']);
$self->setMinScore($options['minScore']);
$self->setHighlight($options['highlight']);
$self->setMaxResultWindow($options['max_result_window']);
$self->setMaxResultWindow($options['maxResultWindow']);
$self->setPopulateOrder($options['populate_order']);
$self->setPopulateDirection($options['populate_direction']);
$self->setActiveTab($options['activeTab']);

25
lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
View File

@@ -229,6 +229,29 @@ class AdminConfigurationController extends Controller
]);
}
public function validationReminderAction(PhraseaApplication $app, Request $request)
{
$interval = $app['conf']->get(['workers', 'validationReminder', 'interval'], 7200);
if ($request->getMethod() == 'POST') {
$reminderInterval = (int)$request->request->get('worker_reminder_interval');
// save the period interval in second
$app['conf']->set(['workers', 'validationReminder', 'interval'], $reminderInterval);
/** @var AMQPConnection $serverConnection */
$serverConnection = $this->app['alchemy_worker.amqp.connection'];
// reinitialize the validation reminder queues
$serverConnection->reinitializeQueue([MessagePublisher::VALIDATION_REMINDER_QUEUE]);
$this->app['alchemy_worker.message.publisher']->initializeLoopQueue(MessagePublisher::VALIDATION_REMINDER_TYPE);
return $app->redirectPath('worker_admin');
}
return $this->render('admin/worker-manager/worker_validation_reminder.html.twig', [
'interval' => $interval
]);
}
public function populateStatusAction(PhraseaApplication $app, Request $request)
{
$databoxIds = $request->get('sbasIds');
@@ -255,7 +278,7 @@ class AdminConfigurationController extends Controller
// reinitialize the pull queues
$serverConnection->reinitializeQueue([MessagePublisher::PULL_QUEUE]);
$this->app['alchemy_worker.message.publisher']->initializePullAssets();
$this->app['alchemy_worker.message.publisher']->initializeLoopQueue(MessagePublisher::PULL_ASSETS_TYPE);
return $app->redirectPath('worker_admin');
}

5
lib/Alchemy/Phrasea/WorkerManager/Provider/AlchemyWorkerServiceProvider.php
View File

@@ -20,6 +20,7 @@ use Alchemy\Phrasea\WorkerManager\Worker\PullAssetsWorker;
use Alchemy\Phrasea\WorkerManager\Worker\Resolver\TypeBasedWorkerResolver;
use Alchemy\Phrasea\WorkerManager\Worker\SubdefCreationWorker;
use Alchemy\Phrasea\WorkerManager\Worker\SubtitleWorker;
use Alchemy\Phrasea\WorkerManager\Worker\ValidationReminderWorker;
use Alchemy\Phrasea\WorkerManager\Worker\WebhookWorker;
use Alchemy\Phrasea\WorkerManager\Worker\WorkerInvoker;
use Alchemy\Phrasea\WorkerManager\Worker\WriteMetadatasWorker;
@@ -151,6 +152,10 @@ class AlchemyWorkerServiceProvider implements PluginProviderInterface
$app['alchemy_worker.type_based_worker_resolver']->addFactory(MessagePublisher::FTP_TYPE, new CallableWorkerFactory(function () use ($app) {
return new FtpWorker($app);
}));
$app['alchemy_worker.type_based_worker_resolver']->addFactory(MessagePublisher::VALIDATION_REMINDER_TYPE, new CallableWorkerFactory(function () use ($app) {
return new ValidationReminderWorker($app);
}));
}
/**

4
lib/Alchemy/Phrasea/WorkerManager/Provider/ControllerServiceProvider.php
View File

@@ -88,6 +88,10 @@ class ControllerServiceProvider implements ControllerProviderInterface, ServiceP
->method('GET|POST')
->bind('worker_admin_pullAssets');
$controllers->match('/validation-reminder', 'controller.worker.admin.configuration:validationReminderAction')
->method('GET|POST')
->bind('worker_admin_validationReminder');
$controllers->match('/queue-monitor', 'controller.worker.admin.configuration:queueMonitorAction')
->method('GET')
->bind('worker_admin_queue_monitor');

25
lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php
View File

@@ -27,13 +27,14 @@ class AMQPConnection
MessagePublisher::WEBHOOK_TYPE => MessagePublisher::WEBHOOK_QUEUE,
MessagePublisher::ASSETS_INGEST_TYPE => MessagePublisher::ASSETS_INGEST_QUEUE,
MessagePublisher::CREATE_RECORD_TYPE => MessagePublisher::CREATE_RECORD_QUEUE,
MessagePublisher::PULL_QUEUE => MessagePublisher::PULL_QUEUE,
MessagePublisher::PULL_ASSETS_TYPE => MessagePublisher::PULL_QUEUE,
MessagePublisher::POPULATE_INDEX_TYPE => MessagePublisher::POPULATE_INDEX_QUEUE,
MessagePublisher::DELETE_RECORD_TYPE => MessagePublisher::DELETE_RECORD_QUEUE,
MessagePublisher::MAIN_QUEUE_TYPE => MessagePublisher::MAIN_QUEUE,
MessagePublisher::SUBTITLE_TYPE => MessagePublisher::SUBTITLE_QUEUE,
MessagePublisher::EXPOSE_UPLOAD_TYPE => MessagePublisher::EXPOSE_UPLOAD_QUEUE,
MessagePublisher::FTP_TYPE => MessagePublisher::FTP_QUEUE
MessagePublisher::FTP_TYPE => MessagePublisher::FTP_QUEUE,
MessagePublisher::VALIDATION_REMINDER_TYPE => MessagePublisher::VALIDATION_REMINDER_QUEUE,
];
// the corresponding worker queues and retry queues, loop queue
@@ -46,7 +47,8 @@ class AMQPConnection
MessagePublisher::CREATE_RECORD_QUEUE => MessagePublisher::RETRY_CREATE_RECORD_QUEUE,
MessagePublisher::POPULATE_INDEX_QUEUE => MessagePublisher::RETRY_POPULATE_INDEX_QUEUE,
MessagePublisher::PULL_QUEUE => MessagePublisher::LOOP_PULL_QUEUE,
MessagePublisher::FTP_QUEUE => MessagePublisher::RETRY_FTP_QUEUE
MessagePublisher::FTP_QUEUE => MessagePublisher::RETRY_FTP_QUEUE,
MessagePublisher::VALIDATION_REMINDER_QUEUE => MessagePublisher::LOOP_VALIDATION_REMINDER_QUEUE
];
public static $defaultFailedQueues = [
@@ -65,6 +67,11 @@ class AMQPConnection
MessagePublisher::SUBDEF_QUEUE => MessagePublisher::DELAYED_SUBDEF_QUEUE
];
public static $defaultLoopTypes = [
MessagePublisher::PULL_ASSETS_TYPE,
MessagePublisher::VALIDATION_REMINDER_TYPE
];
// default message TTL in retry queue in millisecond
const RETRY_DELAY = 10000;
@@ -271,6 +278,18 @@ class AMQPConnection
isset($config['pull_assets']['pullInterval']) ) {
// convert in milli second
return (int)($config['pull_assets']['pullInterval']) * 1000;
} elseif ($routing == MessagePublisher::VALIDATION_REMINDER_QUEUE) {
if (isset($config['validationReminder']) &&
isset($config['validationReminder']['interval'])) {
// convert in milli second
return (int)($config['validationReminder']['interval']) * 1000;
}
// default value to 2 hour if not set
return (int) 7200 * 1000;
} elseif (isset($config['retry_queue']) &&
isset($config['retry_queue'][array_search($routing, AMQPConnection::$defaultQueues)])) {

34
lib/Alchemy/Phrasea/WorkerManager/Queue/MessageHandler.php
View File

@@ -4,6 +4,7 @@ namespace Alchemy\Phrasea\WorkerManager\Queue;
use Alchemy\Phrasea\WorkerManager\Worker\ProcessPool;
use Alchemy\Phrasea\WorkerManager\Worker\WorkerInvoker;
use PhpAmqpLib\Channel\AMQPChannel;
use PhpAmqpLib\Message\AMQPMessage;
use PhpAmqpLib\Wire\AMQPTable;
use Ramsey\Uuid\Uuid;
@@ -61,7 +62,7 @@ class MessageHandler
}
// if message is yet executed 3 times, save the unprocessed message in the corresponding failed queues
if ($count > self::MAX_OF_TRY && $data['message_type'] != MessagePublisher::PULL_ASSETS_TYPE) {
if ($count > self::MAX_OF_TRY && !in_array($data['message_type'], AMQPConnection::$defaultLoopTypes)) {
$this->messagePublisher->publishFailedMessage($data['payload'], $headers, AMQPConnection::$defaultFailedQueues[$data['message_type']]);
$logMessage = sprintf("Rabbit message executed 3 times, it's to be saved in %s , payload >>> %s",
@@ -75,8 +76,8 @@ class MessageHandler
try {
$workerInvoker->invokeWorker($data['message_type'], json_encode($data['payload']));
if ($data['message_type'] == MessagePublisher::PULL_ASSETS_TYPE) {
// make a loop for the pull assets
if (in_array($data['message_type'], AMQPConnection::$defaultLoopTypes)) {
// make a loop for the loop type
$channel->basic_nack($message->delivery_info['delivery_tag']);
} else {
$channel->basic_ack($message->delivery_info['delivery_tag']);
@@ -101,19 +102,26 @@ class MessageHandler
foreach (AMQPConnection::$defaultQueues as $queueName) {
if ($argQueueName ) {
if (in_array($queueName, $argQueueName)) {
$serverConnection->setQueue($queueName);
// give prefetch message to a worker consumer at a time
$channel->basic_qos(null, $prefetchCount, null);
$channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
$this->runConsumer($queueName, $serverConnection, $channel, $prefetchCount, $callback);
}
} else {
$serverConnection->setQueue($queueName);
// give prefetch message to a worker consumer at a time
$channel->basic_qos(null, $prefetchCount, null);
$channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
$this->runConsumer($queueName, $serverConnection, $channel, $prefetchCount, $callback);
}
}
}
private function runConsumer($queueName, AMQPConnection $serverConnection, AMQPChannel $channel, $prefetchCount, $callback)
{
// initialize validation reminder when starting consumer
if ($queueName == MessagePublisher::VALIDATION_REMINDER_QUEUE) {
$serverConnection->reinitializeQueue([MessagePublisher::VALIDATION_REMINDER_QUEUE]);
$this->messagePublisher->initializeLoopQueue(MessagePublisher::VALIDATION_REMINDER_TYPE);
}
$serverConnection->setQueue($queueName);
// give prefetch message to a worker consumer at a time
$channel->basic_qos(null, $prefetchCount, null);
$channel->basic_consume($queueName, Uuid::uuid4(), false, false, false, false, $callback);
}
}

14
lib/Alchemy/Phrasea/WorkerManager/Queue/MessagePublisher.php
View File

@@ -18,6 +18,7 @@ class MessagePublisher
const POPULATE_INDEX_TYPE = 'populateIndex';
const PULL_ASSETS_TYPE = 'pullAssets';
const SUBDEF_CREATION_TYPE = 'subdefCreation';
const VALIDATION_REMINDER_TYPE = 'validationReminder';
const WRITE_METADATAS_TYPE = 'writeMetadatas';
const WEBHOOK_TYPE = 'webhook';
@@ -40,6 +41,7 @@ class MessagePublisher
const POPULATE_INDEX_QUEUE = 'populateindex-queue';
const PULL_QUEUE = 'pull-queue';
const SUBDEF_QUEUE = 'subdef-queue';
const VALIDATION_REMINDER_QUEUE = 'validationReminder-queue';
const WEBHOOK_QUEUE = 'webhook-queue';
// retry queue
@@ -53,8 +55,10 @@ class MessagePublisher
const RETRY_SUBDEF_QUEUE = 'retry-subdef-queue';
const RETRY_WEBHOOK_QUEUE = 'retry-webhook-queue';
// use this queue to make a loop on a consumer
const LOOP_PULL_QUEUE = 'loop-pull-queue';
// use those queue to make a loop on a consumer
const LOOP_PULL_QUEUE = 'loop-pull-queue';
const LOOP_VALIDATION_REMINDER_QUEUE = 'loop-validationReminder-queue';
// all failed queue, if message is treated over 3 times it goes to the failed queue
const FAILED_ASSETS_INGEST_QUEUE = 'failed-ingest-queue';
@@ -126,16 +130,16 @@ class MessagePublisher
return true;
}
public function initializePullAssets()
public function initializeLoopQueue($type)
{
$payload = [
'message_type' => self::PULL_ASSETS_TYPE,
'message_type' => $type,
'payload' => [
'initTimestamp' => new \DateTime('now', new \DateTimeZone('UTC'))
]
];
$this->publishMessage($payload, self::PULL_QUEUE);
$this->publishMessage($payload, AMQPConnection::$defaultQueues[$type]);
}
public function connectionClose()

193
lib/Alchemy/Phrasea/WorkerManager/Worker/ValidationReminderWorker.php Normal file
View File

@@ -0,0 +1,193 @@
<?php
namespace Alchemy\Phrasea\WorkerManager\Worker;
use Alchemy\Phrasea\Application as PhraseaApplication;
use Alchemy\Phrasea\Application\Helper\NotifierAware;
use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
use Alchemy\Phrasea\Core\LazyLocator;
use Alchemy\Phrasea\Model\Entities\Basket;
use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Model\Entities\ValidationParticipant;
use Alchemy\Phrasea\Model\Repositories\TokenRepository;
use Alchemy\Phrasea\Model\Repositories\ValidationParticipantRepository;
use Alchemy\Phrasea\Model\Repositories\WorkerRunningJobRepository;
use Alchemy\Phrasea\Notification\Emitter;
use Alchemy\Phrasea\Notification\Mail\MailInfoValidationReminder;
use Alchemy\Phrasea\Notification\Receiver;
use Alchemy\Phrasea\WorkerManager\Queue\MessagePublisher;
use DateTime;
use DateInterval;
use Doctrine\ORM\EntityManagerInterface;
class ValidationReminderWorker implements WorkerInterface
{
use NotifierAware;
private $app;
private $logger;
/** @var MessagePublisher $messagePublisher */
private $messagePublisher;
/** @var WorkerRunningJobRepository $repoWorkerJob */
private $repoWorkerJob;
public function __construct(PhraseaApplication $app)
{
$this->app = $app;
$this->messagePublisher = $this->app['alchemy_worker.message.publisher'];
$this->logger = $this->app['alchemy_worker.logger'];
}
public function process(array $payload)
{
$this->setDelivererLocator(new LazyLocator($this->app, 'notification.deliverer'));
$days = (int)$this->getConf()->get(['registry', 'actions', 'validation-reminder-days']);
$interval = sprintf('P%dD', $days);
$now = new DateTime();
$dateTo = clone($now);
try {
$dateTo->add(new DateInterval($interval));
} catch(\Exception $e) {
$this->logger->error(sprintf('<error>Bad interval "%s" ?</error>', $interval));
return ;
}
foreach ($this->getValidationParticipantRepository()->findNotConfirmedAndNotRemindedParticipantsByExpireDate($dateTo, $now) as $participant) {
$validationSession = $participant->getSession();
$basket = $validationSession->getBasket();
$canSend = true;
$user = $participant->getUser(); // always ok !
try {
$str_email = $user->getEmail(); // force to hydrate
} catch (\Exception $e) {
$this->logger->error('user not found!');
$canSend = false;
}
$emails[] =
// find the token if exists
// nb : a validation may have not generated tokens if forcing auth was required upon creation
$token = null;
try {
$token = $this->getTokenRepository()->findValidationToken($basket, $user);
}
catch (\Exception $e) {
// not unique token ? should not happen
$canSend = false;
}
if(!$canSend) {
continue;
}
if(!is_null($token)) {
$url = $this->app->url('lightbox_validation', ['basket' => $basket->getId(), 'LOG' => $token->getValue()]);
} else {
$url = $this->app->url('lightbox_validation', ['basket' => $basket->getId()]);
}
$this->doRemind($participant, $basket, $url);
}
$this->getEntityManager()->flush();
}
private function doRemind(ValidationParticipant $participant, Basket $basket, $url)
{
$params = [
'from' => $basket->getValidation()->getInitiator()->getId(),
'to' => $participant->getUser()->getId(),
'ssel_id' => $basket->getId(),
'url' => $url,
];
$datas = json_encode($params);
$mailed = false;
$userFrom = $basket->getValidation()->getInitiator();
$userTo = $participant->getUser();
if ($this->shouldSendNotificationFor($participant->getUser(), 'eventsmanager_notify_validationreminder')) {
$readyToSend = false;
$title = $receiver = $emitter = null;
try {
$title = $basket->getName();
$receiver = Receiver::fromUser($userTo);
$emitter = Emitter::fromUser($userFrom);
$readyToSend = true;
}
catch (\Exception $e) {
// no-op
}
if ($readyToSend) {
$this->logger->info(sprintf(' -> remind "%s" from "%s" to "%s"', $title, $emitter->getEmail(), $receiver->getEmail()));
$mail = MailInfoValidationReminder::create($this->app, $receiver, $emitter);
$mail->setButtonUrl($params['url']);
$mail->setTitle($title);
$this->deliver($mail);
$mailed = true;
$participant->setReminded(new DateTime('now'));
$this->getEntityManager()->persist($participant);
}
}
return $this->app['events-manager']->notify($params['to'], 'eventsmanager_notify_validationreminder', $datas, $mailed);
}
/**
* @param User $user
* @param $type
* @return mixed
*/
private function shouldSendNotificationFor(User $user, $type)
{
return $this->app['settings']->getUserNotificationSetting($user, $type);
}
/**
* @return PropertyAccess
*/
private function getConf()
{
return $this->app['conf'];
}
/**
* @return EntityManagerInterface
*/
private function getEntityManager()
{
return $this->app['orm.em'];
}
/**
* @return ValidationParticipantRepository
*/
private function getValidationParticipantRepository()
{
return $this->app['repo.validation-participants'];
}
/**
* @return TokenRepository
*/
private function getTokenRepository()
{
return $this->app['repo.tokens'];
}
}

68
resources/locales/messages.de.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:21:26Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:21:24Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>
@@ -4460,7 +4460,7 @@
<trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
<source>My application </source>
<target state="translated">Meine Anwendung</target>
<jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="259">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
<source>My baskets</source>
@@ -4542,7 +4542,7 @@
<source>No</source>
<target state="translated">Nein</target>
<jms:reference-file line="32">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="290">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
@@ -4919,7 +4919,7 @@
<trans-unit id="fe42b90acc297644b70123354014701c49384489" resname="Paniers" approved="yes">
<source>Paniers</source>
<target state="translated">Sammelkörbe</target>
<jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="250">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
<jms:reference-file line="92">web/lightbox/index.html.twig</jms:reference-file>
<jms:reference-file line="173">web/lightbox/validate.html.twig</jms:reference-file>
@@ -7700,7 +7700,7 @@
<source>Yes</source>
<target state="translated">Ja</target>
<jms:reference-file line="33">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="291">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="284">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="13">user/import/view.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4de66b40cf0800d4a25cc75b4f3f593cfc44ef6c" resname="You are Admin" approved="yes">
@@ -8756,11 +8756,6 @@
<target state="translated">falsches Passwort</target>
<jms:reference-file line="100">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="9bf7a0391d97674b47027a4021a3fa438db12b2d" resname="admin::compte-utilisateur:ftp: Nombre d'essais max" approved="yes">
<source>admin::compte-utilisateur:ftp: Nombre d'essais max</source>
<target state="translated">maximale Anzahl von Versuchen</target>
<jms:reference-file line="225">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7353ab4d025765f9e75cf84168059ea043b71166" resname="admin::compte-utilisateur:ftp: Utiliser le mode passif" approved="yes">
<source>admin::compte-utilisateur:ftp: Utiliser le mode passif</source>
<target state="translated">Passiv Mode benutzen</target>
@@ -9133,7 +9128,27 @@
<trans-unit id="c9e74b67af82544af64171a88050f4a9a802e572" resname="admin::workermanager: Rabbit config error" approved="yes">
<source>admin::workermanager: Rabbit config error</source>
<target state="translated">Konfigurationsfehler des Nachrichten Managers</target>
<jms:reference-file line="101">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="107">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40b3163a21978717195a7ae687589ade1e0561c7" resname="admin::workermanager:tab:Reminder: Interval in second">
<source>admin::workermanager:tab:Reminder: Interval in second</source>
<target state="new">admin::workermanager:tab:Reminder: Interval in second</target>
<jms:reference-file line="6">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2595e37b2158ece0ddfb2640ced15109f959a811" resname="admin::workermanager:tab:Reminder: Start">
<source>admin::workermanager:tab:Reminder: Start</source>
<target state="new">admin::workermanager:tab:Reminder: Start</target>
<jms:reference-file line="12">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f1170f88a845b046b9a67610a9ca5cf16df5c206" resname="admin::workermanager:tab:Reminder: Stop">
<source>admin::workermanager:tab:Reminder: Stop</source>
<target state="new">admin::workermanager:tab:Reminder: Stop</target>
<jms:reference-file line="14">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="af1fc0b0c903fd4213684e7e7f3e374044a5b417" resname="admin::workermanager:tab:Reminder: description">
<source>admin::workermanager:tab:Reminder: description</source>
<target state="new">admin::workermanager:tab:Reminder: description</target>
<jms:reference-file line="1">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c137c6545a114ff1d71be2eb1f50c8414b411a41" resname="admin::workermanager:tab:configuration: title" approved="yes">
<source>admin::workermanager:tab:configuration: title</source>
@@ -9248,6 +9263,11 @@
<trans-unit id="36c6753b7d3078f881ee0f3436c50d1c1086aeff" resname="admin::workermanager:tab:queueMonitor: title" approved="yes">
<source>admin::workermanager:tab:queueMonitor: title</source>
<target state="translated">Warteschlange</target>
<jms:reference-file line="50">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15a2a28d354353ef62c87266c96a8586ea6d7f00" resname="admin::workermanager:tab:reminder: title">
<source>admin::workermanager:tab:reminder: title</source>
<target state="new">admin::workermanager:tab:reminder: title</target>
<jms:reference-file line="45">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c63a8b1bbfa2d0540ba6a71541aa941c1b8b62e6" resname="admin::workermanager:tab:searchengine: Databox to populate" approved="yes">
@@ -9629,7 +9649,7 @@
<trans-unit id="8f3cd845b8adbcdf064486cdd24733f53bce8bb3" resname="admin:worker Retrieve configuration error" approved="yes">
<source>admin:worker Retrieve configuration error</source>
<target state="translated">Worker Abruf Konfigurationsfehler</target>
<jms:reference-file line="94">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="100">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8f1dba76b561684930a25a984046b3b4149785ca" resname="alert" approved="yes">
<source>alert</source>
@@ -10012,7 +10032,7 @@
<jms:reference-file line="121">web/developers/application_form.html.twig</jms:reference-file>
<jms:reference-file line="75">web/account/access.html.twig</jms:reference-file>
<jms:reference-file line="48">web/account/reset-email.html.twig</jms:reference-file>
<jms:reference-file line="236">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="229">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="349">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="371">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="39">Bridge/Flickr/photo_modify.html.twig</jms:reference-file>
@@ -10820,7 +10840,7 @@
<trans-unit id="5cdbff50d2a3ae92720c5af32d4cd560d1351a91" resname="login::notification: Changements enregistres" approved="yes">
<source>login::notification: Changements enregistres</source>
<target state="translated">Veränderungen wurden bestätigt</target>
<jms:reference-file line="490">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="488">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="46f7a3bb71222626147c7e64c6a59a3f4c3d8e42" resname="login::notification: Mise a jour du mot de passe avec succes" approved="yes">
<source>login::notification: Mise a jour du mot de passe avec succes</source>
@@ -11522,12 +11542,12 @@
<trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted" approved="yes">
<source>phraseanet::account The account has been deleted</source>
<target state="translated">Ihr Benutzerkonto wurde gelöscht</target>
<jms:reference-file line="555">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="553">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
<source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
<target state="translated">Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden.</target>
<jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="289">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
<source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
@@ -11537,32 +11557,32 @@
<trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
<source>phraseanet::account: Are you sure you want to delete your account?</source>
<target state="translated">Möchten Sie Ihr Konto wirklich löschen?</target>
<jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="246">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
<source>phraseanet::account: Delete my account</source>
<target state="translated">Mein Benutzerkonto löschen</target>
<jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="237">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
<source>phraseanet::account: I am agree to delete my account</source>
<target state="translated">Ich bin damit einverstanden, mein Konto zu löschen</target>
<jms:reference-file line="285">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="278">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail" approved="yes">
<source>phraseanet::account: I am agree to delete my account, need confirmation on mail</source>
<target state="translated">Ich bin damit einverstanden, mein Konto zu löschen, und ich möchte eine E-Mail Bestätigung</target>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="276">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted" approved="yes">
<source>phraseanet::account: List of data to be deleted</source>
<target state="translated">Liste der zu löschenden Daten</target>
<jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="247">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
<source>phraseanet::account: My phraseanet account</source>
<target state="translated">Mein Phraseanet Benutzerkonto</target>
<jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="267">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
<source>phraseanet::chargement</source>
@@ -11596,12 +11616,12 @@
<target state="translated">Mailserver-Ausfall</target>
<jms:reference-file line="123">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="543">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="yes">
<source>phraseanet::error: failed to revoke some user access</source>
<target state="translated">Fehler beim Widerruf von Nutzerrechten</target>
<jms:reference-file line="532">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
<source>phraseanet::jours:: dimanche</source>

68
resources/locales/messages.en.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:22:13Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:22:11Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>
@@ -4463,7 +4463,7 @@
<trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
<source>My application </source>
<target state="translated">My application </target>
<jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="259">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
<source>My baskets</source>
@@ -4545,7 +4545,7 @@
<source>No</source>
<target state="translated">No</target>
<jms:reference-file line="32">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="290">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
@@ -4922,7 +4922,7 @@
<trans-unit id="fe42b90acc297644b70123354014701c49384489" resname="Paniers" approved="yes">
<source>Paniers</source>
<target state="translated">Baskets</target>
<jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="250">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
<jms:reference-file line="92">web/lightbox/index.html.twig</jms:reference-file>
<jms:reference-file line="173">web/lightbox/validate.html.twig</jms:reference-file>
@@ -7703,7 +7703,7 @@
<source>Yes</source>
<target state="translated">Yes</target>
<jms:reference-file line="33">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="291">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="284">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="13">user/import/view.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4de66b40cf0800d4a25cc75b4f3f593cfc44ef6c" resname="You are Admin" approved="yes">
@@ -8759,11 +8759,6 @@
<target state="translated">Wrong password</target>
<jms:reference-file line="100">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="9bf7a0391d97674b47027a4021a3fa438db12b2d" resname="admin::compte-utilisateur:ftp: Nombre d'essais max" approved="yes">
<source>admin::compte-utilisateur:ftp: Nombre d'essais max</source>
<target state="translated">Max. retry</target>
<jms:reference-file line="225">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7353ab4d025765f9e75cf84168059ea043b71166" resname="admin::compte-utilisateur:ftp: Utiliser le mode passif" approved="yes">
<source>admin::compte-utilisateur:ftp: Utiliser le mode passif</source>
<target state="translated">Use passive mode</target>
@@ -9136,7 +9131,27 @@
<trans-unit id="c9e74b67af82544af64171a88050f4a9a802e572" resname="admin::workermanager: Rabbit config error" approved="yes">
<source>admin::workermanager: Rabbit config error</source>
<target state="translated">Message Queue configuration error</target>
<jms:reference-file line="101">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="107">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40b3163a21978717195a7ae687589ade1e0561c7" resname="admin::workermanager:tab:Reminder: Interval in second">
<source>admin::workermanager:tab:Reminder: Interval in second</source>
<target state="new">admin::workermanager:tab:Reminder: Interval in second</target>
<jms:reference-file line="6">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2595e37b2158ece0ddfb2640ced15109f959a811" resname="admin::workermanager:tab:Reminder: Start">
<source>admin::workermanager:tab:Reminder: Start</source>
<target state="new">admin::workermanager:tab:Reminder: Start</target>
<jms:reference-file line="12">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f1170f88a845b046b9a67610a9ca5cf16df5c206" resname="admin::workermanager:tab:Reminder: Stop">
<source>admin::workermanager:tab:Reminder: Stop</source>
<target state="new">admin::workermanager:tab:Reminder: Stop</target>
<jms:reference-file line="14">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="af1fc0b0c903fd4213684e7e7f3e374044a5b417" resname="admin::workermanager:tab:Reminder: description">
<source>admin::workermanager:tab:Reminder: description</source>
<target state="new">admin::workermanager:tab:Reminder: description</target>
<jms:reference-file line="1">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c137c6545a114ff1d71be2eb1f50c8414b411a41" resname="admin::workermanager:tab:configuration: title" approved="yes">
<source>admin::workermanager:tab:configuration: title</source>
@@ -9251,6 +9266,11 @@
<trans-unit id="36c6753b7d3078f881ee0f3436c50d1c1086aeff" resname="admin::workermanager:tab:queueMonitor: title" approved="yes">
<source>admin::workermanager:tab:queueMonitor: title</source>
<target state="translated">Queues</target>
<jms:reference-file line="50">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15a2a28d354353ef62c87266c96a8586ea6d7f00" resname="admin::workermanager:tab:reminder: title">
<source>admin::workermanager:tab:reminder: title</source>
<target state="new">admin::workermanager:tab:reminder: title</target>
<jms:reference-file line="45">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c63a8b1bbfa2d0540ba6a71541aa941c1b8b62e6" resname="admin::workermanager:tab:searchengine: Databox to populate" approved="yes">
@@ -9632,7 +9652,7 @@
<trans-unit id="8f3cd845b8adbcdf064486cdd24733f53bce8bb3" resname="admin:worker Retrieve configuration error" approved="yes">
<source>admin:worker Retrieve configuration error</source>
<target state="translated">Worker Retrieve configuration error</target>
<jms:reference-file line="94">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="100">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8f1dba76b561684930a25a984046b3b4149785ca" resname="alert" approved="yes">
<source>alert</source>
@@ -10015,7 +10035,7 @@
<jms:reference-file line="121">web/developers/application_form.html.twig</jms:reference-file>
<jms:reference-file line="75">web/account/access.html.twig</jms:reference-file>
<jms:reference-file line="48">web/account/reset-email.html.twig</jms:reference-file>
<jms:reference-file line="236">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="229">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="349">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="371">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="39">Bridge/Flickr/photo_modify.html.twig</jms:reference-file>
@@ -10823,7 +10843,7 @@
<trans-unit id="5cdbff50d2a3ae92720c5af32d4cd560d1351a91" resname="login::notification: Changements enregistres" approved="yes">
<source>login::notification: Changements enregistres</source>
<target state="translated">Changes saved</target>
<jms:reference-file line="490">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="488">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="46f7a3bb71222626147c7e64c6a59a3f4c3d8e42" resname="login::notification: Mise a jour du mot de passe avec succes" approved="yes">
<source>login::notification: Mise a jour du mot de passe avec succes</source>
@@ -11525,12 +11545,12 @@
<trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted" approved="yes">
<source>phraseanet::account The account has been deleted</source>
<target state="translated">The account has been deleted</target>
<jms:reference-file line="555">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="553">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
<source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
<target state="translated">Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface.</target>
<jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="289">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
<source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
@@ -11540,32 +11560,32 @@
<trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
<source>phraseanet::account: Are you sure you want to delete your account?</source>
<target state="translated">Are you sure you wish to delete your account?</target>
<jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="246">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
<source>phraseanet::account: Delete my account</source>
<target state="translated">Delete my account</target>
<jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="237">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
<source>phraseanet::account: I am agree to delete my account</source>
<target state="translated">I agree to delete my account</target>
<jms:reference-file line="285">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="278">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail" approved="yes">
<source>phraseanet::account: I am agree to delete my account, need confirmation on mail</source>
<target state="translated">I agree to delete my account and I need a confirmation by email</target>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="276">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted" approved="yes">
<source>phraseanet::account: List of data to be deleted</source>
<target state="translated">List of data to be deleted</target>
<jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="247">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
<source>phraseanet::account: My phraseanet account</source>
<target state="translated">My Phraseanet account</target>
<jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="267">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
<source>phraseanet::chargement</source>
@@ -11599,12 +11619,12 @@
<target state="translated">Mail-server error</target>
<jms:reference-file line="123">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="543">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="yes">
<source>phraseanet::error: failed to revoke some user access</source>
<target state="translated">Failed to revoke some user access</target>
<jms:reference-file line="532">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
<source>phraseanet::jours:: dimanche</source>

68
resources/locales/messages.fr.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:23:02Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:22:58Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>
@@ -4460,7 +4460,7 @@
<trans-unit id="1b369c4651e2b82200334fa587669b3828071192" resname="My application " approved="yes">
<source>My application </source>
<target state="translated">Mon application</target>
<jms:reference-file line="266">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="259">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9f36fd4dc42df8a92572afe51d887c5f33dda5b0" resname="My baskets" approved="yes">
<source>My baskets</source>
@@ -4542,7 +4542,7 @@
<source>No</source>
<target state="translated">Non</target>
<jms:reference-file line="32">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="290">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8c123d8ad43d08cc48c3d6a7676e65f71eea59df" resname="No URL available" approved="yes">
<source>No URL available</source>
@@ -4919,7 +4919,7 @@
<trans-unit id="fe42b90acc297644b70123354014701c49384489" resname="Paniers" approved="yes">
<source>Paniers</source>
<target state="translated">Paniers</target>
<jms:reference-file line="257">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="250">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="127">lightbox/IE6/validate.html.twig</jms:reference-file>
<jms:reference-file line="92">web/lightbox/index.html.twig</jms:reference-file>
<jms:reference-file line="173">web/lightbox/validate.html.twig</jms:reference-file>
@@ -7702,7 +7702,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis
<source>Yes</source>
<target state="translated">Oui</target>
<jms:reference-file line="33">web/developers/applications.html.twig</jms:reference-file>
<jms:reference-file line="291">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="284">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="13">user/import/view.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="4de66b40cf0800d4a25cc75b4f3f593cfc44ef6c" resname="You are Admin" approved="yes">
@@ -8759,11 +8759,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Le mot de passe est erroné</target>
<jms:reference-file line="100">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="9bf7a0391d97674b47027a4021a3fa438db12b2d" resname="admin::compte-utilisateur:ftp: Nombre d'essais max" approved="yes">
<source>admin::compte-utilisateur:ftp: Nombre d'essais max</source>
<target state="translated">Nombre d'essais</target>
<jms:reference-file line="225">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="7353ab4d025765f9e75cf84168059ea043b71166" resname="admin::compte-utilisateur:ftp: Utiliser le mode passif" approved="yes">
<source>admin::compte-utilisateur:ftp: Utiliser le mode passif</source>
<target state="translated">Utiliser le mode passif</target>
@@ -9136,7 +9131,27 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="c9e74b67af82544af64171a88050f4a9a802e572" resname="admin::workermanager: Rabbit config error" approved="yes">
<source>admin::workermanager: Rabbit config error</source>
<target state="translated">Erreur dans la configuration du gestionnaire de messages</target>
<jms:reference-file line="101">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="107">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40b3163a21978717195a7ae687589ade1e0561c7" resname="admin::workermanager:tab:Reminder: Interval in second">
<source>admin::workermanager:tab:Reminder: Interval in second</source>
<target state="new">admin::workermanager:tab:Reminder: Interval in second</target>
<jms:reference-file line="6">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2595e37b2158ece0ddfb2640ced15109f959a811" resname="admin::workermanager:tab:Reminder: Start">
<source>admin::workermanager:tab:Reminder: Start</source>
<target state="new">admin::workermanager:tab:Reminder: Start</target>
<jms:reference-file line="12">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f1170f88a845b046b9a67610a9ca5cf16df5c206" resname="admin::workermanager:tab:Reminder: Stop">
<source>admin::workermanager:tab:Reminder: Stop</source>
<target state="new">admin::workermanager:tab:Reminder: Stop</target>
<jms:reference-file line="14">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="af1fc0b0c903fd4213684e7e7f3e374044a5b417" resname="admin::workermanager:tab:Reminder: description">
<source>admin::workermanager:tab:Reminder: description</source>
<target state="new">admin::workermanager:tab:Reminder: description</target>
<jms:reference-file line="1">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c137c6545a114ff1d71be2eb1f50c8414b411a41" resname="admin::workermanager:tab:configuration: title" approved="yes">
<source>admin::workermanager:tab:configuration: title</source>
@@ -9251,6 +9266,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="36c6753b7d3078f881ee0f3436c50d1c1086aeff" resname="admin::workermanager:tab:queueMonitor: title" approved="yes">
<source>admin::workermanager:tab:queueMonitor: title</source>
<target state="translated">Files de message</target>
<jms:reference-file line="50">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15a2a28d354353ef62c87266c96a8586ea6d7f00" resname="admin::workermanager:tab:reminder: title">
<source>admin::workermanager:tab:reminder: title</source>
<target state="new">admin::workermanager:tab:reminder: title</target>
<jms:reference-file line="45">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c63a8b1bbfa2d0540ba6a71541aa941c1b8b62e6" resname="admin::workermanager:tab:searchengine: Databox to populate" approved="yes">
@@ -9632,7 +9652,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="8f3cd845b8adbcdf064486cdd24733f53bce8bb3" resname="admin:worker Retrieve configuration error" approved="yes">
<source>admin:worker Retrieve configuration error</source>
<target state="translated">Erreur lors de la récupération de la configuration des workers</target>
<jms:reference-file line="94">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="100">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8f1dba76b561684930a25a984046b3b4149785ca" resname="alert" approved="yes">
<source>alert</source>
@@ -10015,7 +10035,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<jms:reference-file line="121">web/developers/application_form.html.twig</jms:reference-file>
<jms:reference-file line="75">web/account/access.html.twig</jms:reference-file>
<jms:reference-file line="48">web/account/reset-email.html.twig</jms:reference-file>
<jms:reference-file line="236">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="229">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="349">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="371">prod/actions/edit_default.html.twig</jms:reference-file>
<jms:reference-file line="39">Bridge/Flickr/photo_modify.html.twig</jms:reference-file>
@@ -10823,7 +10843,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="5cdbff50d2a3ae92720c5af32d4cd560d1351a91" resname="login::notification: Changements enregistres" approved="yes">
<source>login::notification: Changements enregistres</source>
<target state="translated">Changements confirmés</target>
<jms:reference-file line="490">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="488">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="46f7a3bb71222626147c7e64c6a59a3f4c3d8e42" resname="login::notification: Mise a jour du mot de passe avec succes" approved="yes">
<source>login::notification: Mise a jour du mot de passe avec succes</source>
@@ -11525,12 +11545,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted" approved="yes">
<source>phraseanet::account The account has been deleted</source>
<target state="translated">Le compte a été supprimé</target>
<jms:reference-file line="555">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="553">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; " approved="yes">
<source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
<target state="translated">Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration.</target>
<jms:reference-file line="296">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="289">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="047b7994f5960aae108105ad5deadb5bbd72c8fc" resname="phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion" approved="yes">
<source>phraseanet::account: A confirmation e-mail has been sent. Please follow the instructions contained to continue account deletion</source>
@@ -11540,32 +11560,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<trans-unit id="d0ee9e2c90a05b113b00bf7accd590557bd78528" resname="phraseanet::account: Are you sure you want to delete your account?" approved="yes">
<source>phraseanet::account: Are you sure you want to delete your account?</source>
<target state="translated">Etes-vous sûr(e) de vouloir supprimer votre compte?</target>
<jms:reference-file line="253">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="246">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b98be91d0f8cadb22e52e6217584b7a11370fbb6" resname="phraseanet::account: Delete my account" approved="yes">
<source>phraseanet::account: Delete my account</source>
<target state="translated">Supprimer mon compte</target>
<jms:reference-file line="244">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="237">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="b7993903466c49139bfae4c34c63446ff24b1474" resname="phraseanet::account: I am agree to delete my account" approved="yes">
<source>phraseanet::account: I am agree to delete my account</source>
<target state="translated">Je suis d'accord pour supprimer mon compte</target>
<jms:reference-file line="285">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="278">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="1b836fda2a5c65abfd05c215d4c4dd66361e4f0f" resname="phraseanet::account: I am agree to delete my account, need confirmation on mail" approved="yes">
<source>phraseanet::account: I am agree to delete my account, need confirmation on mail</source>
<target state="translated">Je suis d'accord pour supprimer mon compte et j'ai besoin d'une confirmation par email</target>
<jms:reference-file line="283">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="276">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="121aa945bfcb3565989acc06a1ccda5b36be6bf0" resname="phraseanet::account: List of data to be deleted" approved="yes">
<source>phraseanet::account: List of data to be deleted</source>
<target state="translated">Liste des données à supprimer</target>
<jms:reference-file line="254">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="247">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8d168955d9cfb26df27fbdcb4f83bbfe78654703" resname="phraseanet::account: My phraseanet account" approved="yes">
<source>phraseanet::account: My phraseanet account</source>
<target state="translated">Mon compte Phraseanet</target>
<jms:reference-file line="274">web/account/account.html.twig</jms:reference-file>
<jms:reference-file line="267">web/account/account.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="9628f29074afd5c9bb42bb0b4c896f8bc32c192e" resname="phraseanet::chargement" approved="yes">
<source>phraseanet::chargement</source>
@@ -11599,12 +11619,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le
<target state="translated">Echec du serveur de mails</target>
<jms:reference-file line="123">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="543">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access" approved="yes">
<source>phraseanet::error: failed to revoke some user access</source>
<target state="translated">Erreur pendant la révocation de droits utilisateur</target>
<jms:reference-file line="532">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
<source>phraseanet::jours:: dimanche</source>

39
resources/locales/messages.nl.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:23:54Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:23:47Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>
@@ -9138,7 +9138,27 @@
<trans-unit id="c9e74b67af82544af64171a88050f4a9a802e572" resname="admin::workermanager: Rabbit config error">
<source>admin::workermanager: Rabbit config error</source>
<target state="new">admin::workermanager: Rabbit config error</target>
<jms:reference-file line="101">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="107">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="40b3163a21978717195a7ae687589ade1e0561c7" resname="admin::workermanager:tab:Reminder: Interval in second">
<source>admin::workermanager:tab:Reminder: Interval in second</source>
<target state="new">admin::workermanager:tab:Reminder: Interval in second</target>
<jms:reference-file line="6">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="2595e37b2158ece0ddfb2640ced15109f959a811" resname="admin::workermanager:tab:Reminder: Start">
<source>admin::workermanager:tab:Reminder: Start</source>
<target state="new">admin::workermanager:tab:Reminder: Start</target>
<jms:reference-file line="12">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="f1170f88a845b046b9a67610a9ca5cf16df5c206" resname="admin::workermanager:tab:Reminder: Stop">
<source>admin::workermanager:tab:Reminder: Stop</source>
<target state="new">admin::workermanager:tab:Reminder: Stop</target>
<jms:reference-file line="14">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="af1fc0b0c903fd4213684e7e7f3e374044a5b417" resname="admin::workermanager:tab:Reminder: description">
<source>admin::workermanager:tab:Reminder: description</source>
<target state="new">admin::workermanager:tab:Reminder: description</target>
<jms:reference-file line="1">admin/worker-manager/worker_validation_reminder.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c137c6545a114ff1d71be2eb1f50c8414b411a41" resname="admin::workermanager:tab:configuration: title">
<source>admin::workermanager:tab:configuration: title</source>
@@ -9253,6 +9273,11 @@
<trans-unit id="36c6753b7d3078f881ee0f3436c50d1c1086aeff" resname="admin::workermanager:tab:queueMonitor: title">
<source>admin::workermanager:tab:queueMonitor: title</source>
<target state="new">admin::workermanager:tab:queueMonitor: title</target>
<jms:reference-file line="50">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="15a2a28d354353ef62c87266c96a8586ea6d7f00" resname="admin::workermanager:tab:reminder: title">
<source>admin::workermanager:tab:reminder: title</source>
<target state="new">admin::workermanager:tab:reminder: title</target>
<jms:reference-file line="45">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="c63a8b1bbfa2d0540ba6a71541aa941c1b8b62e6" resname="admin::workermanager:tab:searchengine: Databox to populate">
@@ -9634,7 +9659,7 @@
<trans-unit id="8f3cd845b8adbcdf064486cdd24733f53bce8bb3" resname="admin:worker Retrieve configuration error">
<source>admin:worker Retrieve configuration error</source>
<target state="new">admin:worker Retrieve configuration error</target>
<jms:reference-file line="94">admin/worker-manager/index.html.twig</jms:reference-file>
<jms:reference-file line="100">admin/worker-manager/index.html.twig</jms:reference-file>
</trans-unit>
<trans-unit id="8f1dba76b561684930a25a984046b3b4149785ca" resname="alert">
<source>alert</source>
@@ -10825,7 +10850,7 @@
<trans-unit id="5cdbff50d2a3ae92720c5af32d4cd560d1351a91" resname="login::notification: Changements enregistres" approved="yes">
<source>login::notification: Changements enregistres</source>
<target state="translated">Veranderingen zijn bewaard</target>
<jms:reference-file line="490">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="488">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="46f7a3bb71222626147c7e64c6a59a3f4c3d8e42" resname="login::notification: Mise a jour du mot de passe avec succes" approved="yes">
<source>login::notification: Mise a jour du mot de passe avec succes</source>
@@ -11527,7 +11552,7 @@
<trans-unit id="245fd09d0518644a6580518f710add762804ca9a" resname="phraseanet::account The account has been deleted">
<source>phraseanet::account The account has been deleted</source>
<target state="new">phraseanet::account The account has been deleted</target>
<jms:reference-file line="555">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="553">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="bf7028b694aea3fc9ede5014a9f8b5d617b83b6f" resname="phraseanet::account: &lt;&lt; your account can be deleted via admin interface &gt;&gt; ">
<source><![CDATA[phraseanet::account: << your account can be deleted via admin interface >> ]]></source>
@@ -11601,12 +11626,12 @@
<target state="translated">De email server is mislukt</target>
<jms:reference-file line="123">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="344">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="543">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="541">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="60ae97c7ab0fb3923682a785ff0348958e308d4a" resname="phraseanet::error: failed to revoke some user access">
<source>phraseanet::error: failed to revoke some user access</source>
<target state="new">phraseanet::error: failed to revoke some user access</target>
<jms:reference-file line="532">Controller/Root/AccountController.php</jms:reference-file>
<jms:reference-file line="530">Controller/Root/AccountController.php</jms:reference-file>
</trans-unit>
<trans-unit id="2a5db6bf8928d23c54b13277fa7d5289a1f52744" resname="phraseanet::jours:: dimanche" approved="yes">
<source>phraseanet::jours:: dimanche</source>

2
resources/locales/validators.de.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:21:26Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:21:24Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>

2
resources/locales/validators.en.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:22:13Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:22:11Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>

2
resources/locales/validators.fr.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:23:02Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:22:58Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>

2
resources/locales/validators.nl.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-11-17T07:23:54Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2020-11-18T15:23:47Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>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.</note>

6
templates/web/admin/worker-manager/index.html.twig
View File

@@ -40,6 +40,11 @@
{{ 'admin::workermanager:tab:metadata: title' |trans }}
</a>
</li>
<li class="worker-reminder" role="presentation">
<a href="#worker-reminder" aria-controls="worker-reminder" role="tab" data-toggle="tab" data-url="/admin/worker-manager/validation-reminder">
{{ 'admin::workermanager:tab:reminder: title' |trans }}
</a>
</li>
<li class="worker-queue-monitor" role="presentation">
<a href="#worker-queue-monitor" aria-controls="worker-queue-monitor" role="tab" data-toggle="tab" data-url="/admin/worker-manager/queue-monitor">
{{ 'admin::workermanager:tab:queueMonitor: title' |trans }}
@@ -59,6 +64,7 @@
<div role="tabpanel" class="tab-pane fade" id="worker-ftp"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-subview"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-metadata"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-reminder"></div>
<div role="tabpanel" class="tab-pane fade" id="worker-queue-monitor"></div>
</div>
</div>

45
templates/web/admin/worker-manager/worker_validation_reminder.html.twig Normal file
View File

@@ -0,0 +1,45 @@
<h1>{{ 'admin::workermanager:tab:Reminder: description' |trans }}</h1>
<form name="worker_validation_reminder" method="post" action="/admin/worker-manager/validation-reminder">
<div class="control-group">
<div>
<label for="worker_reminder_interval" class="required">{{ "admin::workermanager:tab:Reminder: Interval in second"|trans }}</label>
<input type="text" id="worker_reminder_interval" name="worker_reminder_interval" required="required" value="{{ interval }}">
</div>
</div>
<div class="control-group">
<button class="btn btn-primary start-validation-reminder">{{ "admin::workermanager:tab:Reminder: Start"|trans }}</button>
<button class="btn btn-danger stop-validation-reminder">{{ 'admin::workermanager:tab:Reminder: Stop' | trans }}</button>
</div>
</form>
<script type="text/javascript">
$("#worker-reminder").on('click', '.stop-validation-reminder', function(e) {
e.preventDefault();
if (confirm("Warning! You are about to stop validation Reminder!")) {
$.ajax({
type: "POST",
url: "/admin/worker-manager/purge-queue",
dataType: 'json',
data : {
queueName : "validationReminder-queue"
},
success: function (data) {
$('#tree li.selected a').trigger('click');
console.log(data);
return false;
}
});
}
});
$("#worker-reminder").on('click', '.start-validation-reminder', function(e) {
e.preventDefault();
$('form[name="worker_validation_reminder"]').submit();
});
</script>