From 6ac72ec6c179d53019f378b545aa3490c7cbe7e5 Mon Sep 17 00:00:00 2001 From: Aina Sitraka <35221835+aynsix@users.noreply.github.com> Date: Thu, 25 May 2023 12:59:56 +0300 Subject: [PATCH] PHRAS-3848 prod - order manager - cancel an order (#4320) * cancel order * bump version * some fix --- .env | 2 +- Phraseanet-production-client/config/config.js | 2 +- .../dist/authenticate.js | 2 +- .../dist/authenticate.min.js | 2 +- Phraseanet-production-client/dist/commons.js | 2 +- .../dist/commons.min.js | 2 +- .../dist/production.js | 16 ++ .../dist/production.min.js | 16 ++ .../src/components/order/orderItem.js | 16 ++ .../Phrasea/ControllerProvider/Prod/Order.php | 5 + lib/Alchemy/Phrasea/Core/Version.php | 2 +- lib/Alchemy/Phrasea/Model/Entities/Order.php | 63 ++++++ .../Order/Controller/ProdOrderController.php | 21 ++ .../Phrasea/Twig/PhraseanetExtension.php | 12 +- resources/locales/messages.de.xlf | 200 ++++++++++-------- resources/locales/messages.en.xlf | 200 ++++++++++-------- resources/locales/messages.fr.xlf | 200 ++++++++++-------- resources/locales/messages.nl.xlf | 186 +++++++++------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- ..._CG__AlchemyPhraseaModelEntitiesBasket.php | 11 + ...AlchemyPhraseaModelEntitiesLazaretFile.php | 11 + ...__CG__AlchemyPhraseaModelEntitiesOrder.php | 70 +++++- templates/web/prod/orders/order_box.html.twig | 8 + .../web/prod/orders/order_item.html.twig | 11 + 27 files changed, 705 insertions(+), 363 deletions(-) diff --git a/.env b/.env index 7240dd3686..c30e242d09 100644 --- a/.env +++ b/.env @@ -133,7 +133,7 @@ PHRASEANET_DOCKER_REGISTRY=local # Docker images tag. # @run -PHRASEANET_DOCKER_TAG=4.1.7 +PHRASEANET_DOCKER_TAG=4.1.8-rc1 # Stack Name # An optionnal Name for the stack diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js index 1b0f517d3f..d19f8be8df 100644 --- a/Phraseanet-production-client/config/config.js +++ b/Phraseanet-production-client/config/config.js @@ -13,5 +13,5 @@ module.exports = { setupDir: _root + 'tests/setup/node.js', karmaConf: _root + 'config/karma.conf.js', // change this version when you change JS file for lazy loading - assetFileVersion: 86 + assetFileVersion: 87 }; diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js index e01363c207..37ad6f1893 100644 --- a/Phraseanet-production-client/dist/authenticate.js +++ b/Phraseanet-production-client/dist/authenticate.js @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=86"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=87"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js index d931e7fa46..94a73c5e46 100644 --- a/Phraseanet-production-client/dist/authenticate.min.js +++ b/Phraseanet-production-client/dist/authenticate.min.js @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=86"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=87"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js index b87597df2a..f80b19bf7a 100644 --- a/Phraseanet-production-client/dist/commons.js +++ b/Phraseanet-production-client/dist/commons.js @@ -91,7 +91,7 @@ /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=86"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=87"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js index fadd8fc4a7..6bf26f8695 100644 --- a/Phraseanet-production-client/dist/commons.min.js +++ b/Phraseanet-production-client/dist/commons.min.js @@ -91,7 +91,7 @@ /******/ if (__webpack_require__.nc) { /******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ } -/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=86"; +/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=87"; /******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ script.onerror = script.onload = onScriptComplete; /******/ function onScriptComplete() { diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index 7e14af3fdd..67b10bd1fa 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -65950,6 +65950,22 @@ var orderItem = function orderItem(services) { //deny_documents(order_id); }); + (0, _jquery2.default)('button.cancel_order', $dialog.getDomElement()).bind('click', function (event) { + var order_id = (0, _jquery2.default)(this).data('order-id'); + + _jquery2.default.ajax({ + type: 'POST', + url: '../prod/order/' + order_id + '/cancel/', + success: function success(data) { + var url = '../prod/order/' + order_id + '/'; + + reloadDialog(url); + } + }); + + return false; + }); + (0, _jquery2.default)('button.reset', $dialog.getDomElement()).bind('click', function () { var itemsToBeReset = []; (0, _jquery2.default)('.order_list .order_row.selected.waitingForValidation', $dialog.getDomElement()).each(function (i, n) { diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js index 7e14af3fdd..67b10bd1fa 100644 --- a/Phraseanet-production-client/dist/production.min.js +++ b/Phraseanet-production-client/dist/production.min.js @@ -65950,6 +65950,22 @@ var orderItem = function orderItem(services) { //deny_documents(order_id); }); + (0, _jquery2.default)('button.cancel_order', $dialog.getDomElement()).bind('click', function (event) { + var order_id = (0, _jquery2.default)(this).data('order-id'); + + _jquery2.default.ajax({ + type: 'POST', + url: '../prod/order/' + order_id + '/cancel/', + success: function success(data) { + var url = '../prod/order/' + order_id + '/'; + + reloadDialog(url); + } + }); + + return false; + }); + (0, _jquery2.default)('button.reset', $dialog.getDomElement()).bind('click', function () { var itemsToBeReset = []; (0, _jquery2.default)('.order_list .order_row.selected.waitingForValidation', $dialog.getDomElement()).each(function (i, n) { diff --git a/Phraseanet-production-client/src/components/order/orderItem.js b/Phraseanet-production-client/src/components/order/orderItem.js index 66a33a4d1a..1631af7501 100644 --- a/Phraseanet-production-client/src/components/order/orderItem.js +++ b/Phraseanet-production-client/src/components/order/orderItem.js @@ -188,6 +188,22 @@ const orderItem = services => { //deny_documents(order_id); }); + $('button.cancel_order', $dialog.getDomElement()).bind('click', function (event) { + let order_id = $(this).data('order-id'); + + $.ajax({ + type: 'POST', + url: '../prod/order/' + order_id + '/cancel/', + success: function (data) { + let url = '../prod/order/' + order_id + '/'; + + reloadDialog(url); + } + }); + + return false; + }); + $('button.reset', $dialog.getDomElement()).bind('click',function(){ var itemsToBeReset = []; $('.order_list .order_row.selected.waitingForValidation', $dialog.getDomElement()).each(function(i,n){ diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Order.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Order.php index 302fa471fa..ae3ffd3e61 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Order.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Order.php @@ -102,6 +102,11 @@ class Order implements ControllerProviderInterface, ServiceProviderInterface ->bind('prod_order_validate') ->assert('order_id', '\d+'); + $controllers->post('/{order_id}/cancel/', 'controller.prod.order:cancelOrder') + ->before($ensureOrdersAdmin) + ->bind('prod_order_cancel') + ->assert('order_id', '\d+'); + return $controllers; } } diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 7fbf97f9e8..b5963eeac1 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -17,7 +17,7 @@ class Version * @var string */ - private $number = '4.1.7'; + private $number = '4.1.8-rc1'; /** * @var string diff --git a/lib/Alchemy/Phrasea/Model/Entities/Order.php b/lib/Alchemy/Phrasea/Model/Entities/Order.php index 7d89141381..ce3d119304 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/Order.php +++ b/lib/Alchemy/Phrasea/Model/Entities/Order.php @@ -86,6 +86,21 @@ class Order */ private $notificationMethod; + /** + * @ORM\Column(name="canceled_on", type="datetime", nullable=true) + */ + private $canceledOn; + + /** + * @ORM\Column(name="canceled_by", type="integer", nullable=true) + */ + private $canceledBy; + + /** + * @ORM\Column(name="canceled_todo", type="integer", nullable=true) + */ + private $canceledTodo; + /** * Constructor */ @@ -335,4 +350,52 @@ class Order $this->notificationMethod = $methodName; } + + /** + * @param \DateTime $canceledOn + * @return $this + */ + public function setCanceledOn($canceledOn) + { + $this->canceledOn = $canceledOn; + + return $this; + } + + public function getCanceledOn() + { + return $this->canceledOn; + } + + /** + * @param $canceledBy + * @return $this + */ + public function setCanceledBy($canceledBy) + { + $this->canceledBy = $canceledBy; + + return $this; + } + + public function getCanceledBy() + { + return $this->canceledBy; + } + + /** + * @param $canceledTodo + * @return $this + */ + public function setCanceledTodo($canceledTodo) + { + $this->canceledTodo = $canceledTodo; + + return $this; + } + + public function getCanceledTodo() + { + return $this->canceledTodo; + } } diff --git a/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php b/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php index 5cbc0e7986..ac176bab42 100644 --- a/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php +++ b/lib/Alchemy/Phrasea/Order/Controller/ProdOrderController.php @@ -260,4 +260,25 @@ class ProdOrderController extends BaseOrderController 'order_id' => $order_id, ]); } + + public function cancelOrder(Request $request, $order_id) + { + $order = $this->findOr404($order_id); + $oldTodo = $order->getTodo(); + + $order->setTodo(0); + $order->setCanceledOn(new \DateTime()); + $order->setCanceledBy($this->getAuthenticatedUser()->getId()); + $order->setCanceledTodo($oldTodo); + + $manager = $this->getEntityManager(); + $manager->persist($order); + $manager->flush(); + + return $this->app->json([ + 'success' => true, + 'msg' => $this->app->trans('Order has been canceled'), + 'order_id' => $order_id + ]); + } } diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php index c0c45e644b..601d0fe00c 100644 --- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php +++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php @@ -8,6 +8,7 @@ use Alchemy\Phrasea\Http\StaticFile\StaticMode; use Alchemy\Phrasea\Model\Entities\ElasticsearchRecord; use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\Model\RecordInterface; +use Alchemy\Phrasea\Model\Repositories\UserRepository; use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Flag; class PhraseanetExtension extends \Twig_Extension @@ -53,6 +54,7 @@ class PhraseanetExtension extends \Twig_Extension new \Twig_SimpleFunction('caption_field_order', array($this, 'getCaptionFieldOrder')), new \Twig_SimpleFunction('flag_slugify', array(Flag::class, 'normalizeName')), + new \Twig_SimpleFunction('user_display_name', array($this, 'getUserDisplayName')), ); } @@ -60,7 +62,7 @@ class PhraseanetExtension extends \Twig_Extension { return [ // change this version when you change JS file to force the navigation to reload js file - 'assetFileVersion' => 86 + 'assetFileVersion' => 87 ]; } @@ -410,6 +412,14 @@ class PhraseanetExtension extends \Twig_Extension return $this->app['border-manager']->getCheckerFromFQCN($checkerFQCN); } + public function getUserDisplayName($userId) + { + /** @var User $user */ + $user = $this->app['repo.users']->find($userId); + + return ($user == null) ? '' : $user->getDisplayName(); + } + public function getName() { return 'phraseanet'; diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 9b65719a0f..181236f43e 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 @@ -201,7 +201,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -858,7 +858,7 @@ Aggregation Aggregation - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aide @@ -1263,7 +1263,7 @@ Aucun Kein(e) - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aucun bridge disponible. Veuillez contacter un administrateur. @@ -1576,7 +1576,7 @@ Business Fields Geschäftsfelder - admin/fields/templates.html.twig + admin/fields/templates.html.twig By checking this box, you accept %beginning_link% Terms of Use %end_link% @@ -2148,7 +2148,7 @@ Current configuration contains some errors Die aktuelle Konfiguration enthält einige Fehler - admin/fields/templates.html.twig + admin/fields/templates.html.twig Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again @@ -2174,7 +2174,7 @@ DCES DCES - admin/fields/templates.html.twig + admin/fields/templates.html.twig DE @@ -2437,8 +2437,8 @@ Deny verweigern login/oauth/authorize-access.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Deplacement %n_element% elements @@ -2540,9 +2540,9 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen - admin/fields/templates.html.twig + admin/fields/templates.html.twig Display technical data @@ -2552,7 +2552,7 @@ Display thumbnails Vorschaubilder anschauen - admin/fields/templates.html.twig + admin/fields/templates.html.twig Do not display @@ -2598,7 +2598,7 @@ Document envoye par %name% Dokument wurde von %name% gesendet - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document has been successfully substitued @@ -2608,7 +2608,7 @@ Document refuse par %name% Dokument wurde von %name% abgelehnt - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document title @@ -3407,7 +3407,7 @@ Forcer l'envoi du document Senden des Dokumentes außer Kraft setzen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees @@ -3470,7 +3470,7 @@ Generate-cterms Kandidatenbegriffen erzeugen - admin/fields/templates.html.twig + admin/fields/templates.html.twig Generates a flexpaper flash file @@ -3613,12 +3613,12 @@ Gui-editable GUI editierbar - admin/fields/templates.html.twig + admin/fields/templates.html.twig Gui-visible GUI sichtbar - admin/fields/templates.html.twig + admin/fields/templates.html.twig Hello %username% @@ -3763,7 +3763,7 @@ Indexable indizierbar - admin/fields/templates.html.twig + admin/fields/templates.html.twig Indexation task @@ -4128,7 +4128,7 @@ Limited vocabulary begrenzter Wortschatz - admin/fields/templates.html.twig + admin/fields/templates.html.twig List %name% has been created @@ -4296,7 +4296,7 @@ Mandatory erforderlich - admin/fields/templates.html.twig + admin/fields/templates.html.twig Mandatory fields @@ -4472,7 +4472,7 @@ Multivalued mehrwertiges - admin/fields/templates.html.twig + admin/fields/templates.html.twig My application @@ -4552,8 +4552,8 @@ Next Weiter actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig No @@ -4716,7 +4716,7 @@ Not aggregated Nicht aggregiert admin/search-engine/general-aggregation.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Notification par email @@ -4857,6 +4857,11 @@ bestellen admin/fields/templates.html.twig + + Order has been canceled + Order has been canceled + Order/Controller/ProdOrderController.php + Order has been denied Angewandte Auswahl(en). @@ -5194,8 +5199,8 @@ Previous Zurück actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig Print @@ -5463,7 +5468,7 @@ Read-only schreibgeschützt - admin/fields/templates.html.twig + admin/fields/templates.html.twig Recaptcha private key @@ -5709,7 +5714,7 @@ Report Report - admin/fields/templates.html.twig + admin/fields/templates.html.twig Request access @@ -6064,8 +6069,8 @@ prod/actions/Push.html.twig prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig web/admin/dashboard.html.twig @@ -6104,7 +6109,7 @@ Separator Trennzeichen - admin/fields/templates.html.twig + admin/fields/templates.html.twig Service youtube introuvable. @@ -6279,7 +6284,7 @@ Quelle prod/Tooltip/DataboxField.html.twig admin/fields/templates.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Sous-titre @@ -6770,7 +6775,7 @@ Thesaurus branch Thesaurus Sprung - admin/fields/templates.html.twig + admin/fields/templates.html.twig Thesaurus ou CTerms invalide @@ -6921,7 +6926,7 @@ Tous Alle - admin/fields/templates.html.twig + admin/fields/templates.html.twig Tout type @@ -6969,7 +6974,7 @@ Type Typ - admin/fields/templates.html.twig + admin/fields/templates.html.twig Type d'application @@ -7318,7 +7323,7 @@ Utilisation prevue: Verwendungszweck: - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig VALIDATION @@ -7424,7 +7429,7 @@ Vocabulary type Wortschatz Typ - admin/fields/templates.html.twig + admin/fields/templates.html.twig Voici vos paniers @@ -9989,7 +9994,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -10560,7 +10565,7 @@ commande::utilisation prevue Verwendungszweck web/common/dialog_export.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig copyClipboardLabel @@ -10774,7 +10779,7 @@ document Dokument - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11104,7 +11109,7 @@ field-printable Gedrucktes Feld - admin/fields/templates.html.twig + admin/fields/templates.html.twig file is not valid @@ -11117,7 +11122,7 @@ flash Flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11262,7 +11267,7 @@ image Bild - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11784,15 +11789,32 @@ Oder Controller/Prod/LanguageController.php + + order-manager:: all document treated + order-manager:: all document treated + prod/orders/order_item.html.twig + + + order-manager:: cancel + order-manager:: cancel + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + + + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + order-manager::mail: your-order-of Ihre Bestellung von : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: accepted-item akzeptiert - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: address @@ -11802,12 +11824,12 @@ order-manager::order-item: already-validated Schon gesendet - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: by von - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: company @@ -11822,96 +11844,96 @@ order-manager::order-item: create OK - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: create-basket Neuer Sammelkorb - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: for-non-sent-items Für die Dokumente, die nicht gesendet wurden - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: information Information - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: item Dokument - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-already-sent Dokument(e) schon gesendet - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-waiting-validation Dokumente, die auf eine Bestätigung warten - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: less weniger sehen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: more mehr sehen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: number Nummer - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: of Von - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: refused-previously zuvor abgelehnt - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: rejected-item abgelehnt - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: reset zurücksetzen - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: select-all Alle auswählen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-item ausgewählt - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-records ausgewählte Datensätze - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: submit Senden - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: tel @@ -11921,47 +11943,47 @@ order-manager::order-item: validate Die Auswahl bestätigen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: warning-message-close Ausstenhende Auswahl abbrechen? - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-denied-items Mit der abgelehnten Datensätzen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-selected-items Mit der Auswahl - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-validated-items Mit gesendete(r) Dokument(en) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-denied Dokument(e) abgelehnt - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-validated Dokument(e) gesendet - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Create-Basket Sammelkorb erstellen - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Validation Bestellübersicht - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: after @@ -11992,13 +12014,13 @@ order-manager::order-list: no-filter Kein Filter prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: no-result Keine Bestellung im Moment sichtbar prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: order-id @@ -12006,7 +12028,7 @@ prod/orders/order_box.html.twig prod/orders/order_box.html.twig prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: pending @@ -12351,7 +12373,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 @@ -14961,8 +14983,8 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben reportage Bericht - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15472,7 +15494,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 diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index fd6bb91dea..03b000e152 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 @@ -201,7 +201,7 @@ Bridge/Dailymotion/element_informations.html.twig
- %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -859,7 +859,7 @@ Aggregation Aggregation - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aide @@ -1264,7 +1264,7 @@ Aucun None - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aucun bridge disponible. Veuillez contacter un administrateur. @@ -1577,7 +1577,7 @@ Business Fields Business field - admin/fields/templates.html.twig + admin/fields/templates.html.twig By checking this box, you accept %beginning_link% Terms of Use %end_link% @@ -2151,7 +2151,7 @@ Current configuration contains some errors Current configuration contains some errors - admin/fields/templates.html.twig + admin/fields/templates.html.twig Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again @@ -2177,7 +2177,7 @@ DCES Dublin Core Input/Output - admin/fields/templates.html.twig + admin/fields/templates.html.twig DE @@ -2440,8 +2440,8 @@ Deny Deny login/oauth/authorize-access.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Deplacement %n_element% elements @@ -2543,9 +2543,9 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings - admin/fields/templates.html.twig + admin/fields/templates.html.twig Display technical data @@ -2555,7 +2555,7 @@ Display thumbnails Display as title - admin/fields/templates.html.twig + admin/fields/templates.html.twig Do not display @@ -2601,7 +2601,7 @@ Document envoye par %name% Document sent by - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document has been successfully substitued @@ -2611,7 +2611,7 @@ Document refuse par %name% Document denied by %name% - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document title @@ -3410,7 +3410,7 @@ Forcer l'envoi du document Force document delivery - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees @@ -3473,7 +3473,7 @@ Generate-cterms Generate candidate terms - admin/fields/templates.html.twig + admin/fields/templates.html.twig Generates a flexpaper flash file @@ -3616,12 +3616,12 @@ Gui-editable Editable in Graphical interface (prod) - admin/fields/templates.html.twig + admin/fields/templates.html.twig Gui-visible Displayed in Graphical Interface - admin/fields/templates.html.twig + admin/fields/templates.html.twig Hello %username% @@ -3766,7 +3766,7 @@ Indexable Indexable - admin/fields/templates.html.twig + admin/fields/templates.html.twig Indexation task @@ -4131,7 +4131,7 @@ Limited vocabulary Controlled vocabulary - admin/fields/templates.html.twig + admin/fields/templates.html.twig List %name% has been created @@ -4299,7 +4299,7 @@ Mandatory Mandatory - admin/fields/templates.html.twig + admin/fields/templates.html.twig Mandatory fields @@ -4475,7 +4475,7 @@ Multivalued Multivalued - admin/fields/templates.html.twig + admin/fields/templates.html.twig My application @@ -4555,8 +4555,8 @@ Next Next actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig No @@ -4719,7 +4719,7 @@ Not aggregated Not aggregated admin/search-engine/general-aggregation.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Notification par email @@ -4860,6 +4860,11 @@ Order admin/fields/templates.html.twig + + Order has been canceled + Order has been canceled + Order/Controller/ProdOrderController.php + Order has been denied Choice(s) applied. @@ -5197,8 +5202,8 @@ Previous Previous actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig Print @@ -5466,7 +5471,7 @@ Read-only Read-only - admin/fields/templates.html.twig + admin/fields/templates.html.twig Recaptcha private key @@ -5712,7 +5717,7 @@ Report Report - admin/fields/templates.html.twig + admin/fields/templates.html.twig Request access @@ -6067,8 +6072,8 @@ prod/actions/Push.html.twig prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig web/admin/dashboard.html.twig @@ -6107,7 +6112,7 @@ Separator Separator - admin/fields/templates.html.twig + admin/fields/templates.html.twig Service youtube introuvable. @@ -6282,7 +6287,7 @@ Source prod/Tooltip/DataboxField.html.twig admin/fields/templates.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Sous-titre @@ -6773,7 +6778,7 @@ Thesaurus branch Thesaurus branch - admin/fields/templates.html.twig + admin/fields/templates.html.twig Thesaurus ou CTerms invalide @@ -6924,7 +6929,7 @@ Tous All - admin/fields/templates.html.twig + admin/fields/templates.html.twig Tout type @@ -6972,7 +6977,7 @@ Type Type - admin/fields/templates.html.twig + admin/fields/templates.html.twig Type d'application @@ -7321,7 +7326,7 @@ Utilisation prevue: Intended use: - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig VALIDATION @@ -7427,7 +7432,7 @@ Vocabulary type Vocabulary type - admin/fields/templates.html.twig + admin/fields/templates.html.twig Voici vos paniers @@ -9992,7 +9997,7 @@ audio audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -10563,7 +10568,7 @@ commande::utilisation prevue Intended use web/common/dialog_export.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig copyClipboardLabel @@ -10777,7 +10782,7 @@ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11107,7 +11112,7 @@ field-printable Printed field - admin/fields/templates.html.twig + admin/fields/templates.html.twig file is not valid @@ -11120,7 +11125,7 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11265,7 +11270,7 @@ image Image - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11787,15 +11792,32 @@ or Controller/Prod/LanguageController.php + + order-manager:: all document treated + order-manager:: all document treated + prod/orders/order_item.html.twig + + + order-manager:: cancel + order-manager:: cancel + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + + + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + order-manager::mail: your-order-of Your Order Of : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: accepted-item Accepted item(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: address @@ -11805,12 +11827,12 @@ order-manager::order-item: already-validated Already sent - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: by by - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: company @@ -11825,96 +11847,96 @@ order-manager::order-item: create OK - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: create-basket Create a basket - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: for-non-sent-items For no sent documents: - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: information Informations about the media: - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: item Document - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-already-sent Sent Document(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-waiting-validation Documents waiting for validation - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: less less - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: more More - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: number Number - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: of of - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: refused-previously Previously denied - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: rejected-item Rejected item(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: reset Cancel - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: select-all Select All - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-item Selected item(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-records Selected document(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: submit Submit - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: tel @@ -11924,47 +11946,47 @@ order-manager::order-item: validate Validate choices - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: warning-message-close Cancel pending choices? - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-denied-items With denied document(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-selected-items With selected document(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-validated-items With validated document(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-denied Documents you have denied - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-validated Documents you have sent - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Create-Basket Create Basket - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Validation Order review - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: after @@ -11995,13 +12017,13 @@ order-manager::order-list: no-filter No filter prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: no-result No pending order to view (change the filter to view more orders) prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: order-id @@ -12009,7 +12031,7 @@ prod/orders/order_box.html.twig prod/orders/order_box.html.twig prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: pending @@ -12354,7 +12376,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 @@ -14969,8 +14991,8 @@ It is possible to place several search areas reportage Feature - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15480,7 +15502,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 diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index ad1c66c4b9..82ab588271 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 @@ -201,7 +201,7 @@ Bridge/Dailymotion/element_informations.html.twig
- %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -858,7 +858,7 @@ Aggregation Agrégation - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aide @@ -1263,7 +1263,7 @@ Aucun Aucun - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aucun bridge disponible. Veuillez contacter un administrateur. @@ -1576,7 +1576,7 @@ Business Fields Champ métier - admin/fields/templates.html.twig + admin/fields/templates.html.twig By checking this box, you accept %beginning_link% Terms of Use %end_link% @@ -2148,7 +2148,7 @@ Current configuration contains some errors La configuration contient des erreurs - admin/fields/templates.html.twig + admin/fields/templates.html.twig Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again @@ -2174,7 +2174,7 @@ DCES Entrée/Sortie Dublin Core - admin/fields/templates.html.twig + admin/fields/templates.html.twig DE @@ -2437,8 +2437,8 @@ Deny Refuser login/oauth/authorize-access.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Deplacement %n_element% elements @@ -2540,9 +2540,9 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action - admin/fields/templates.html.twig + admin/fields/templates.html.twig Display technical data @@ -2552,7 +2552,7 @@ Display thumbnails Afficher comme titre - admin/fields/templates.html.twig + admin/fields/templates.html.twig Do not display @@ -2598,7 +2598,7 @@ Document envoye par %name% Document envoyé par %name% - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document has been successfully substitued @@ -2608,7 +2608,7 @@ Document refuse par %name% Document refusé par %name% - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document title @@ -3407,7 +3407,7 @@ Forcer l'envoi du document Forcer l'envoi du document - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees @@ -3470,7 +3470,7 @@ Generate-cterms Générer les termes candidats - admin/fields/templates.html.twig + admin/fields/templates.html.twig Generates a flexpaper flash file @@ -3613,12 +3613,12 @@ Gui-editable Editable dans l'interface Graphique (Prod) - admin/fields/templates.html.twig + admin/fields/templates.html.twig Gui-visible Visible dans l'interface graphique - admin/fields/templates.html.twig + admin/fields/templates.html.twig Hello %username% @@ -3763,7 +3763,7 @@ Indexable Indexable - admin/fields/templates.html.twig + admin/fields/templates.html.twig Indexation task @@ -4128,7 +4128,7 @@ Limited vocabulary Vocabulaire limité - admin/fields/templates.html.twig + admin/fields/templates.html.twig List %name% has been created @@ -4296,7 +4296,7 @@ Mandatory Obligatoire - admin/fields/templates.html.twig + admin/fields/templates.html.twig Mandatory fields @@ -4472,7 +4472,7 @@ Multivalued Multivalué - admin/fields/templates.html.twig + admin/fields/templates.html.twig My application @@ -4552,8 +4552,8 @@ Next Suivants actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig No @@ -4716,7 +4716,7 @@ Not aggregated Non agrégé admin/search-engine/general-aggregation.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Notification par email @@ -4857,6 +4857,11 @@ Ordre d'affichage admin/fields/templates.html.twig + + Order has been canceled + Order has been canceled + Order/Controller/ProdOrderController.php + Order has been denied Choix appliqué(s). @@ -5194,8 +5199,8 @@ Previous Précédent actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig Print @@ -5463,7 +5468,7 @@ Read-only Lecture seule - admin/fields/templates.html.twig + admin/fields/templates.html.twig Recaptcha private key @@ -5709,7 +5714,7 @@ Report Afficher dans Phraseanet Report - admin/fields/templates.html.twig + admin/fields/templates.html.twig Request access @@ -6064,8 +6069,8 @@ prod/actions/Push.html.twig prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig web/admin/dashboard.html.twig @@ -6104,7 +6109,7 @@ Separator Séparateur de valeurs - admin/fields/templates.html.twig + admin/fields/templates.html.twig Service youtube introuvable. @@ -6279,7 +6284,7 @@ Source prod/Tooltip/DataboxField.html.twig admin/fields/templates.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Sous-titre @@ -6770,7 +6775,7 @@ Thesaurus branch Branche de thésaurus - admin/fields/templates.html.twig + admin/fields/templates.html.twig Thesaurus ou CTerms invalide @@ -6921,7 +6926,7 @@ Tous Tous - admin/fields/templates.html.twig + admin/fields/templates.html.twig Tout type @@ -6969,7 +6974,7 @@ Type Type - admin/fields/templates.html.twig + admin/fields/templates.html.twig Type d'application @@ -7318,7 +7323,7 @@ Utilisation prevue: Utilisation prévue : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig VALIDATION @@ -7424,7 +7429,7 @@ Vocabulary type Liste de vocabulaire - admin/fields/templates.html.twig + admin/fields/templates.html.twig Voici vos paniers @@ -9990,7 +9995,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le audio audios - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -10561,7 +10566,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le commande::utilisation prevue Utilisation prévue web/common/dialog_export.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig copyClipboardLabel @@ -10775,7 +10780,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le document documents - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11105,7 +11110,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le field-printable Champ imprimé - admin/fields/templates.html.twig + admin/fields/templates.html.twig file is not valid @@ -11118,7 +11123,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le flash Flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11263,7 +11268,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le image images - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11785,15 +11790,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le ou bien Controller/Prod/LanguageController.php + + order-manager:: all document treated + order-manager:: all document treated + prod/orders/order_item.html.twig + + + order-manager:: cancel + order-manager:: cancel + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + + + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + order-manager::mail: your-order-of Votre commande du : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: accepted-item Média délivré - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: address @@ -11803,12 +11825,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le order-manager::order-item: already-validated Envoyé - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: by par - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: company @@ -11823,96 +11845,96 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le order-manager::order-item: create Valider - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: create-basket Créer un Panier - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: for-non-sent-items Pour le(s) document(s) non envoyé(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: information Informations sur le média : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: item Document - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-already-sent Document(s) déjà envoyé(s) : - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-waiting-validation Document(s) en attente de validation - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: less Voir moins - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: more Voir plus - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: number Numéro - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: of du - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: refused-previously Précédemment refusé - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: rejected-item Média non délivré - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: reset Annuler - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: select-all Tout sélectionner - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-item Média sélectionné - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-records Document(s) sélectionné(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: submit Envoyer - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: tel @@ -11922,47 +11944,47 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le order-manager::order-item: validate Valider les choix - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: warning-message-close Annuler les choix en attente? - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-denied-items Avec le(s) document(s) refusé(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-selected-items Avec la sélection - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-validated-items Avec le(s) document(s) envoyé(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-denied Document(s) refusé(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-validated Document(s) envoyé(s) - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Create-Basket Créer un panier - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Validation Récapitulatif de la commande - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: after @@ -11993,13 +12015,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le order-manager::order-list: no-filter Aucun filtre prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: no-result Pas de commande visible en attente (vous pouvez modifier le filtre pour voir plus de commandes) prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: order-id @@ -12007,7 +12029,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod/orders/order_box.html.twig prod/orders/order_box.html.twig prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: pending @@ -12352,7 +12374,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 @@ -14970,8 +14992,8 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15481,7 +15503,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 diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 794ac47e66..8816049712 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. @@ -860,7 +860,7 @@ Aggregation Aggregation - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aide @@ -1265,7 +1265,7 @@ Aucun Geen enkele - admin/fields/templates.html.twig + admin/fields/templates.html.twig Aucun bridge disponible. Veuillez contacter un administrateur. @@ -1578,7 +1578,7 @@ Business Fields Zakelijke velden - admin/fields/templates.html.twig + admin/fields/templates.html.twig By checking this box, you accept %beginning_link% Terms of Use %end_link% @@ -2152,7 +2152,7 @@ Current configuration contains some errors Current configuration contains some errors - admin/fields/templates.html.twig + admin/fields/templates.html.twig Current operations cannot be executed because the site is temporarily in maintenance mode. Wait a few minutes and try your request again @@ -2178,7 +2178,7 @@ DCES DCES - admin/fields/templates.html.twig + admin/fields/templates.html.twig DE @@ -2441,8 +2441,8 @@ Deny Weiger login/oauth/authorize-access.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Deplacement %n_element% elements @@ -2546,7 +2546,7 @@ - admin/fields/templates.html.twig + admin/fields/templates.html.twig Display technical data @@ -2556,7 +2556,7 @@ Display thumbnails Toon thumbnails - admin/fields/templates.html.twig + admin/fields/templates.html.twig Do not display @@ -2602,7 +2602,7 @@ Document envoye par %name% Document verstuurd door %name% - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document has been successfully substitued @@ -2612,7 +2612,7 @@ Document refuse par %name% Document geweigerd door %name% - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Document title @@ -3414,7 +3414,7 @@ Forcer l'envoi du document Forceer het versturen van het document - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig Forcer la reconstruction sur les enregistrements ayant des thumbnails substituees @@ -3477,7 +3477,7 @@ Generate-cterms Generate-cterms - admin/fields/templates.html.twig + admin/fields/templates.html.twig Generates a flexpaper flash file @@ -3620,12 +3620,12 @@ Gui-editable Gui-editable - admin/fields/templates.html.twig + admin/fields/templates.html.twig Gui-visible Gui-visible - admin/fields/templates.html.twig + admin/fields/templates.html.twig Hello %username% @@ -3770,7 +3770,7 @@ Indexable Indexeerbaar - admin/fields/templates.html.twig + admin/fields/templates.html.twig Indexation task @@ -4135,7 +4135,7 @@ Limited vocabulary Beperkte vocabulair - admin/fields/templates.html.twig + admin/fields/templates.html.twig List %name% has been created @@ -4303,7 +4303,7 @@ Mandatory Verplicht - admin/fields/templates.html.twig + admin/fields/templates.html.twig Mandatory fields @@ -4479,7 +4479,7 @@ Multivalued Meerde waarden - admin/fields/templates.html.twig + admin/fields/templates.html.twig My application @@ -4559,8 +4559,8 @@ Next Volgende actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig No @@ -4723,7 +4723,7 @@ Not aggregated Not aggregated admin/search-engine/general-aggregation.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Notification par email @@ -4864,6 +4864,11 @@ Opdracht admin/fields/templates.html.twig + + Order has been canceled + Order has been canceled + Order/Controller/ProdOrderController.php + Order has been denied Bestelling werd geweigerd @@ -5201,8 +5206,8 @@ Previous Vorige actions/Feedback/ListsMacros.html.twig - prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig + prod/orders/order_box.html.twig Print @@ -5470,7 +5475,7 @@ Read-only Alleen lezen - admin/fields/templates.html.twig + admin/fields/templates.html.twig Recaptcha private key @@ -5716,7 +5721,7 @@ Report Overzicht - admin/fields/templates.html.twig + admin/fields/templates.html.twig Request access @@ -6071,8 +6076,8 @@ prod/actions/Push.html.twig prod/upload/upload.html.twig prod/upload/upload-flash.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig web/admin/dashboard.html.twig @@ -6111,7 +6116,7 @@ Separator Scheidingsteken - admin/fields/templates.html.twig + admin/fields/templates.html.twig Service youtube introuvable. @@ -6286,7 +6291,7 @@ Bron prod/Tooltip/DataboxField.html.twig admin/fields/templates.html.twig - admin/fields/templates.html.twig + admin/fields/templates.html.twig Sous-titre @@ -6777,7 +6782,7 @@ Thesaurus branch Thesaurus tak - admin/fields/templates.html.twig + admin/fields/templates.html.twig Thesaurus ou CTerms invalide @@ -6928,7 +6933,7 @@ Tous Alle - admin/fields/templates.html.twig + admin/fields/templates.html.twig Tout type @@ -6976,7 +6981,7 @@ Type Type - admin/fields/templates.html.twig + admin/fields/templates.html.twig Type d'application @@ -7325,7 +7330,7 @@ Utilisation prevue: Utilisation prevue: - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig VALIDATION @@ -7431,7 +7436,7 @@ Vocabulary type Type van de vocabulair - admin/fields/templates.html.twig + admin/fields/templates.html.twig Voici vos paniers @@ -9996,7 +10001,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -10567,7 +10572,7 @@ commande::utilisation prevue Utilisation gepland web/common/dialog_export.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig copyClipboardLabel @@ -10781,7 +10786,7 @@ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11111,7 +11116,7 @@ field-printable field-printable - admin/fields/templates.html.twig + admin/fields/templates.html.twig file is not valid @@ -11124,7 +11129,7 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11269,7 +11274,7 @@ image Beeld - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11791,15 +11796,32 @@ of Controller/Prod/LanguageController.php + + order-manager:: all document treated + order-manager:: all document treated + prod/orders/order_item.html.twig + + + order-manager:: cancel + order-manager:: cancel + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + + + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated + prod/orders/order_box.html.twig + prod/orders/order_item.html.twig + order-manager::mail: your-order-of order-manager::mail: your-order-of - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: accepted-item order-manager::order-item: accepted-item - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: address @@ -11809,12 +11831,12 @@ order-manager::order-item: already-validated order-manager::order-item: already-validated - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: by order-manager::order-item: by - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: company @@ -11829,96 +11851,96 @@ order-manager::order-item: create order-manager::order-item: create - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: create-basket order-manager::order-item: create-basket - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: for-non-sent-items order-manager::order-item: for-non-sent-items - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: information order-manager::order-item: information - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: item order-manager::order-item: item - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-already-sent order-manager::order-item: items-already-sent - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: items-waiting-validation order-manager::order-item: items-waiting-validation - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: less order-manager::order-item: less - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: more order-manager::order-item: more - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: number order-manager::order-item: number - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: of order-manager::order-item: of - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: refused-previously order-manager::order-item: refused-previously - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: rejected-item order-manager::order-item: rejected-item - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: reset order-manager::order-item: reset - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: select-all order-manager::order-item: select-all - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-item order-manager::order-item: selected-item - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: selected-records order-manager::order-item: selected-records - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: submit order-manager::order-item: submit - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: tel @@ -11928,47 +11950,47 @@ order-manager::order-item: validate order-manager::order-item: validate - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: warning-message-close order-manager::order-item: warning-message-close - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-denied-items order-manager::order-item: with-denied-items - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-selected-items order-manager::order-item: with-selected-items - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: with-validated-items order-manager::order-item: with-validated-items - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-denied order-manager::order-item: you-have-denied - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item: you-have-validated order-manager::order-item: you-have-validated - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Create-Basket order-manager::order-item:Create-Basket - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-item:Validation order-manager::order-item:Validation - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: after @@ -11999,13 +12021,13 @@ order-manager::order-list: no-filter order-manager::order-list: no-filter prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: no-result order-manager::order-list: no-result prod/orders/order_box.html.twig - prod/orders/order_box.html.twig + prod/orders/order_box.html.twig order-manager::order-list: order-id @@ -12013,7 +12035,7 @@ prod/orders/order_box.html.twig prod/orders/order_box.html.twig prod/orders/order_item.html.twig - prod/orders/order_item.html.twig + prod/orders/order_item.html.twig order-manager::order-list: pending @@ -14967,8 +14989,8 @@ reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 64bc888bbe..5fcea95382 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 f635154cc4..20a512a6ef 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 80ca35a8ae..2c8d3ef2c3 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 f14619036c..d5ddf03443 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/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php index e6419726f4..458b690558 100644 --- a/resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php +++ b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesBasket.php @@ -716,6 +716,17 @@ class Basket extends \Alchemy\Phrasea\Model\Entities\Basket implements \Doctrine return parent::isVoteFinished(); } + /** + * {@inheritDoc} + */ + public function isShareExpires() + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'isShareExpires', []); + + return parent::isShareExpires(); + } + /** * {@inheritDoc} */ diff --git a/resources/proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php index 57cb4cd042..ca73f0e6db 100644 --- a/resources/proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php +++ b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesLazaretFile.php @@ -474,6 +474,17 @@ class LazaretFile extends \Alchemy\Phrasea\Model\Entities\LazaretFile implements return parent::getChecks(); } + /** + * {@inheritDoc} + */ + public function getEligibleChecks(\Alchemy\Phrasea\Application $app) + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'getEligibleChecks', [$app]); + + return parent::getEligibleChecks($app); + } + /** * {@inheritDoc} */ diff --git a/resources/proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php index fb1bc56456..8652ae9696 100644 --- a/resources/proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php +++ b/resources/proxies/__CG__AlchemyPhraseaModelEntitiesOrder.php @@ -64,10 +64,10 @@ class Order extends \Alchemy\Phrasea\Model\Entities\Order implements \Doctrine\O public function __sleep() { if ($this->__isInitialized__) { - return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod']; + return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledBy', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledTodo']; } - return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod']; + return ['__isInitialized__', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'id', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'user', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'orderUsage', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'todo', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'deadline', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'createdOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'elements', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'basket', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'notificationMethod', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledOn', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledBy', '' . "\0" . 'Alchemy\\Phrasea\\Model\\Entities\\Order' . "\0" . 'canceledTodo']; } /** @@ -408,4 +408,70 @@ class Order extends \Alchemy\Phrasea\Model\Entities\Order implements \Doctrine\O return parent::setNotificationMethod($methodName); } + /** + * {@inheritDoc} + */ + public function setCanceledOn($canceledOn) + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanceledOn', [$canceledOn]); + + return parent::setCanceledOn($canceledOn); + } + + /** + * {@inheritDoc} + */ + public function getCanceledOn() + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanceledOn', []); + + return parent::getCanceledOn(); + } + + /** + * {@inheritDoc} + */ + public function setCanceledBy($canceledBy) + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanceledBy', [$canceledBy]); + + return parent::setCanceledBy($canceledBy); + } + + /** + * {@inheritDoc} + */ + public function getCanceledBy() + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanceledBy', []); + + return parent::getCanceledBy(); + } + + /** + * {@inheritDoc} + */ + public function setCanceledTodo($canceledTodo) + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'setCanceledTodo', [$canceledTodo]); + + return parent::setCanceledTodo($canceledTodo); + } + + /** + * {@inheritDoc} + */ + public function getCanceledTodo() + { + + $this->__initializer__ && $this->__initializer__->__invoke($this, 'getCanceledTodo', []); + + return parent::getCanceledTodo(); + } + } diff --git a/templates/web/prod/orders/order_box.html.twig b/templates/web/prod/orders/order_box.html.twig index 77ae79b8ec..a376d3856c 100644 --- a/templates/web/prod/orders/order_box.html.twig +++ b/templates/web/prod/orders/order_box.html.twig @@ -168,6 +168,14 @@ {{ 'order-manager::order-list: treated-documents' | trans }} {{ order.getTotalTreatedItems() }}/{{ order.getTotal() }} + + {% if order.getTodo() == 0 and order.getCanceledOn() is not empty %} + {{ 'order-manager:: cancel' | trans }} + + {{ 'order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated' | trans({'%canceled_on%' : order.getCanceledOn() | date('d/m/Y'), '%canceled_by%' : user_display_name(order.getCanceledBy()), '%n%' : order.getCanceledTodo()}) }} + + {% endif %} + {% endfor %} {% else %} diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig index 50335c14a8..9bf04ce33b 100644 --- a/templates/web/prod/orders/order_item.html.twig +++ b/templates/web/prod/orders/order_item.html.twig @@ -110,6 +110,17 @@ {{ 'order-manager::order-list: treated-documents' | trans }} {{ order.getTotalTreatedItems() }}/{{ order.getTotal() }} + + {% if order.getTodo() == 0 and order.getCanceledOn() is empty %} + {{ 'order-manager:: all document treated' | trans }} + {% elseif order.getTodo() != 0 and order.getCanceledOn() is empty %} + + {% elseif order.getTodo() == 0 and order.getCanceledOn() is not empty %} + {{ 'order-manager:: canceled on %canceled_on% by %canceled_by%, with %n% items not treated' | trans({'%canceled_on%' : order.getCanceledOn() | date('d/m/Y'), '%canceled_by%' : user_display_name(order.getCanceledBy()), '%n%' : order.getCanceledTodo()}) }} + {% endif %} +