diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php index b7b3eae64be9eda1f3b6940accc5a89f9c6c6ce2..d9c9d57a787e09a3966daba9d092de8456355347 100755 --- a/apps/maarch_entreprise/class/class_lists_Abstract.php +++ b/apps/maarch_entreprise/class/class_lists_Abstract.php @@ -1625,7 +1625,7 @@ abstract class lists_Abstract extends Database if ($resultTheLine[1]['value'] > 1) { $isVersion = 'true'; } - $return .= 'onclick="setAttachmentInSignatureBook('.$resultTheLine[0]['value'].', '.$isVersion.');"/>Intégrer au parapheur'; + $return .= 'onclick="setAttachmentInSignatureBook('.$resultTheLine[0]['value'].', '.$isVersion.');"/>'._PUT_IN_SIGNATORY_BOOK; return $return; } diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php index dee2796c1977fc5a784243b2ed8bb4a4d594e678..82ab4510f2eb1974cc63a22c9b3a1f86d77e50a6 100755 --- a/apps/maarch_entreprise/indexing_searching/details.php +++ b/apps/maarch_entreprise/indexing_searching/details.php @@ -390,7 +390,7 @@ if ($stmt->rowCount() == 0) { <?php if ($info_mail->filename) { ?> <a href="../../rest/res/<?php functions::xecho($s_id); ?>/content" target="_blank"> - Voir le document + <?php echo _VIEW_DOC;?> <i class="tooltip visaPjUp tooltipstered fa fa-download fa-2x" style="height: 16px; width: 16px;font-size: 19px;padding-bottom: 11px;padding-left: 9px;margin-right:6px;padding-top:7px;margin-top: -9px;" title="<?php echo _VIEW_DOC; ?>"></i> </a> <?php diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php index 2a3d39a1d6a87ae993ed1e7ad3c49e0017abc79b..54e079b7e4a6032bc03eece4cb7237ba2d86d88d 100755 --- a/apps/maarch_entreprise/lang/en.php +++ b/apps/maarch_entreprise/lang/en.php @@ -20,7 +20,7 @@ */ if (!defined('_MEP_VERSION')) { - define('_MEP_VERSION', 'Maarch v17.06'); + define('_MEP_VERSION', 'Maarch v18.10'); } //if (!defined("_ID_TO_DISPAY")) define("_ID_TO_DISPAY", "res_id"); // value res_id || chrono_number @@ -3026,7 +3026,7 @@ if (!defined('_FULLTEXT_HELP')) { define('_FULLTEXT_HELP', 'Search in the mails content'); } if (!defined('_FULLTEXT_ERROR')) { - define('_FULLTEXT_ERROR', 'Invalid enters for the full text search. If you put the sign ' * ", it has to be three characters at least before ans no signs like ,':!+"); + define('_FULLTEXT_ERROR', 'Invalid enters for the full text search. If you put the sign " * ", it has to be three characters at least before ans no signs like ,\':!+'); } if (!defined('_FILE_NOT_SEND')) { define('_FILE_NOT_SEND', "The file wasn't sent"); @@ -5063,4 +5063,13 @@ if (!defined('_DOCUMENT_WITH_NOTES')) { } if (!defined('_USE_MODEL_MAILING')) { define('_USE_MODEL_MAILING', 'Use model mailing'); -} \ No newline at end of file +} +if (!defined('_PUT_IN_SIGNATORY_BOOK')) { + define('_PUT_IN_SIGNATORY_BOOK', 'Put in signatory book'); +} +if (!defined('_MAIN_DOCUMENT')) { + define('_MAIN_DOCUMENT', 'Main document'); +} +if (!defined('_DOWNLOAD_MAIN_DOCUMENT')) { + define('_DOWNLOAD_MAIN_DOCUMENT', 'Download main document'); +} diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php index ae0cb91d95b6d8cb39115f5826a46b43cf8a2d2b..65d7a61f1cbd009f08e3bc082aeb462567c30ec3 100755 --- a/apps/maarch_entreprise/lang/fr.php +++ b/apps/maarch_entreprise/lang/fr.php @@ -11,7 +11,7 @@ * @ingroup lang */ if (!defined('_MEP_VERSION')) { - define('_MEP_VERSION', 'Maarch v18.04'); + define('_MEP_VERSION', 'Maarch v18.10'); } if (!defined('_ID_TO_DISPLAY')) { // value res_id || chrono_number @@ -5225,4 +5225,13 @@ if (!defined('_DOCUMENT_WITH_NOTES')) { } if (!defined('_USE_MODEL_MAILING')) { define('_USE_MODEL_MAILING', 'Utiliser un modèle d\'enregistrement'); -} \ No newline at end of file +} +if (!defined('_PUT_IN_SIGNATORY_BOOK')) { + define('_PUT_IN_SIGNATORY_BOOK', 'Intégrer au parapheur'); +} +if (!defined('_MAIN_DOCUMENT')) { + define('_MAIN_DOCUMENT', 'Document principal'); +} +if (!defined('_DOWNLOAD_MAIN_DOCUMENT')) { + define('_DOWNLOAD_MAIN_DOCUMENT', 'Télécharger le document original'); +} diff --git a/apps/maarch_entreprise/lang/nl.php b/apps/maarch_entreprise/lang/nl.php index 5dd0e12cf5d7e17a9022dcae5d014e98441fbf21..a7a3763fc9c746d065e05c578060d07e98b79279 100755 --- a/apps/maarch_entreprise/lang/nl.php +++ b/apps/maarch_entreprise/lang/nl.php @@ -10,7 +10,7 @@ * @author dev <dev@maarch.org> * @ingroup lang */ -if (!defined('_MEP_VERSION')) { define('_MEP_VERSION', 'Maarch v18.04');} +if (!defined('_MEP_VERSION')) { define('_MEP_VERSION', 'Maarch v18.10');} if (!defined('_ID_TO_DISPLAY')) { define('_ID_TO_DISPLAY', 'chrono_number');} if (!defined('_SVR')) { define('_SVR', 'Stilzwijgende weigering');} if (!defined('_SVA')) { define('_SVA', 'Stilzwijgende aanvaarding');} @@ -1704,4 +1704,13 @@ if (!defined('_CONTACTS_USERS_SEARCH')) { define('_CONTACTS_USERS_SEARCH', 'Een if (!defined('_CONTACTS_USERS_GROUPS_SEARCH')) { define('_CONTACTS_USERS_GROUPS_SEARCH', 'Een contact / gebruiker / contactgroepering zoeken');} if (!defined('_USER_MAARCH_PARAPHEUR')) { define('_USER_MAARCH_PARAPHEUR', 'Maarch vloeiboek gebruiker');} if (!defined('_DOCUMENT_WITH_NOTES')) { define('_DOCUMENT_WITH_NOTES', 'Document met opmerkingen');} -if (!defined('_USE_MODEL_MAILING')) { define('_USE_MODEL_MAILING', 'Gebruik een registratiesjabloon');} \ No newline at end of file +if (!defined('_USE_MODEL_MAILING')) { define('_USE_MODEL_MAILING', 'Gebruik een registratiesjabloon');} +if (!defined('_PUT_IN_SIGNATORY_BOOK')) { + define('_PUT_IN_SIGNATORY_BOOK', 'integreren in de elektronische handtekening'); +} +if (!defined('_MAIN_DOCUMENT')) { + define('_MAIN_DOCUMENT', 'Hoofddocument'); +} +if (!defined('_DOWNLOAD_MAIN_DOCUMENT')) { + define('_DOWNLOAD_MAIN_DOCUMENT', 'Download het hoofddocument'); +} diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php index 95fa9e2d1c2f91c6fc3aaf1748586829317e377f..c92389465b4955de30c5d151d1f1ba34876e5ddb 100755 --- a/modules/attachments/attachments_content.php +++ b/modules/attachments/attachments_content.php @@ -1454,7 +1454,7 @@ $content .= '<div style="float: right; width: 65%">'; //TABS $content .= '<div id="menuOnglet">'; $content .= '<ul id="ongletAttachement" style="cursor:pointer;width:auto;">'; - $content .= '<li id="MainDocument" onclick="activePjTab(this)"><span> Document principal </span></li>'; + $content .= '<li id="MainDocument" onclick="activePjTab(this)"><span> '._MAIN_DOCUMENT.' </span></li>'; if ($mode == 'edit') { $content .= '<li id="PjDocument_0" onclick="activePjTab(this)"><span> PJ n°1 </span></li>'; } diff --git a/modules/templates/select_templates.php b/modules/templates/select_templates.php index 8fb5481b88f48954bfd0b6429ef8b14005a01a35..0c0cb5bcddd1fca734a51556656e97c7f073f456 100755 --- a/modules/templates/select_templates.php +++ b/modules/templates/select_templates.php @@ -16,7 +16,7 @@ if (isset($_SESSION['destination_entity']) && !empty($_SESSION['destination_enti $templates = $templatesControler->getAllTemplatesForProcess($destination_entity); } $frmStr =""; -$frmStr .= '<option value="">Sélectionnez le modèle</option>'; +$frmStr .= '<option value="">'._CHOOSE_MODEL.'</option>'; for ($i=0;$i<count($templates);$i++) { if (!file_exists($templates[$i]['FILE'])) { $disabled = 'disabled="disabled"'; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 7f5f2546152f85a2f86e567a8791096d3637493f..c381d6e546190704ba7b5c7518a1d6fe27b05971 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -336,6 +336,7 @@ export const LANG_NL = { "records" : "resultaten", "recordsPerPage" : "resultaten per pagina", "redirectBasket" : "Het bakje doorsturen", + "redirectBaskets" : "De bakjes doorsturen", "redirectConfidentialInfo" : "Deze gebruiker heeft <b>vertrouwelijke brieven</b> die aan deze dienst gekoppeld zijn.<br/>Het is beter om deze aan een andere gebruiker van de dienst toe te wijzen.", "redirectedTo" : "Doorgestuurd aan", "redirectModelInfo" : "Deze gebruiker is aanwezig in het <b>verdelingsmodel</b> van de eenheid.",