diff --git a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php index 4d9244dd57cb8a995d3b43a5b652970ff1201755..bfaafe45a40c2792a5a33530e27ad324e1e572e6 100755 --- a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php +++ b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php @@ -57,7 +57,7 @@ class ReceiveMessageExchangeController $res = $receiveMessage->receive($tmpPath, $tmpName, 'ArchiveTransfer'); if ($res['status'] == 1) { - return $response->withStatus(400)->withJson(["errors" => _ERROR_RECEIVE_FAIL. ' ' . $res['content']]); + return $response->withStatus(400)->withJson(["errors" => 'Reception error : ' . $res['content']]); } self::$aComments[] = '['.date("d/m/Y H:i:s") . '] Pli numérique validé'; @@ -162,11 +162,11 @@ class ReceiveMessageExchangeController $tmpName = 'tmp_file_' .$GLOBALS['userId']. '_ArchiveTransfer_' .rand(). '.' . $ext; if (!in_array(strtolower($ext), ['zip', 'tar'])) { - return ["errors" => _WRONG_FILE_TYPE_M2M]; + return ["errors" => 'Only zip file is allowed']; } if ($mimeType != "application/x-tar" && $mimeType != "application/zip" && $mimeType != "application/tar" && $mimeType != "application/x-gzip") { - return ['errors' => _WRONG_FILE_TYPE]; + return ['errors' => 'Filetype is not allowed']; } $tmpPath = CoreConfigModel::getTmpPath(); @@ -337,7 +337,7 @@ class ReceiveMessageExchangeController 'recordId' => $aArgs['resId'], 'eventType' => 'ADD', 'eventId' => 'noteadd', - 'info' => _NOTES_ADDED + 'info' => _NOTE_ADDED ]); $countNote++; diff --git a/src/app/external/messageExchange/controllers/SendMessageExchangeController.php b/src/app/external/messageExchange/controllers/SendMessageExchangeController.php index a5d429ed5622f7311c2db653de86f67edc3794f3..4b16892b65af05bc2dcb762ed1a5602e8004bcb9 100755 --- a/src/app/external/messageExchange/controllers/SendMessageExchangeController.php +++ b/src/app/external/messageExchange/controllers/SendMessageExchangeController.php @@ -281,7 +281,7 @@ class SendMessageExchangeController } if (empty($aArgs['object'])) { - array_push($errors, _EMAIL_OBJECT . ' ' . _IS_EMPTY); + array_push($errors, 'Body object is empty'); } if (empty($aArgs['joinFile']) && empty($aArgs['joinAttachment']) && empty($aArgs['mainExchangeDoc'])) { @@ -289,11 +289,11 @@ class SendMessageExchangeController } if (empty($aArgs['contacts'])) { - array_push($errors, _NO_RECIPIENT); + array_push($errors, 'body contacts is empty'); } if (empty($aArgs['senderEmail'])) { - array_push($errors, _NO_SENDER); + array_push($errors, 'Body senderEmail is empty'); } return $errors; diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index a1f4740d8e6169e36a7af84b6eadcfb175394564..da47181f8bcc9ad3b3c545e9eb2302487f5f5def 100755 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -140,7 +140,7 @@ define('_GO_ON_VACATION', 'se met en absence'); define('_BACK_FROM_VACATION', 'de retour de son absence'); define('_DOC_DISPLAYING', 'Visualisation du document'); define('_DOC_ADDED', 'Courrier créé'); -define('_DOC_UPDATED', 'Métadonnées des courriers modifiées'); +define('_DOC_UPDATED', 'Métadonnées du courrier modifiées'); define('_ATTACHMENT_DELETED', 'Pièce-jointe supprimée'); define('_FILE_UPDATED', 'Fichier modifié'); define('_ATTACHMENT_ADDED', 'Pièce jointe ajoutée'); @@ -457,6 +457,10 @@ define("_AVIS_CIRCUIT_DELETED", "Circuit d'avis supprimé"); define("_COMMUNICATION_MEANS_VALIDATOR", "Le moyen de communication doit être une uri ou un courriel"); define("_EXTERNALID_M2M_VALIDATOR", "L'identifiant Maarch2Maarch doit être au format SIRET/entityId"); +define("_NUMERIC_PACKAGE_ADDED", "Pli numérique ajouté"); +define('_ON_DOC_NUM', ' sur le document n°'); +define("_NUMERIC_PACKAGE_IMPORTED", "Pli numérique importé"); + define("_ACKNOWLEDGEMENT_RECEIPT", "Accusé de réception"); define("_CREATED_BY", "Créé par"); define("_SENT_DATE", "Envoyé le");