From c365862797d1c334f99d816edd68c8c6a1a5eba3 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sat, 4 Mar 2023 01:28:12 +0100 Subject: [PATCH 1/2] Internal: Improve inline documentation to import users as DRH through CSV/XML - refs #4612 --- main/session/session_import_drh.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/session/session_import_drh.php b/main/session/session_import_drh.php index cc1fc9d575..708685f820 100644 --- a/main/session/session_import_drh.php +++ b/main/session/session_import_drh.php @@ -27,7 +27,7 @@ $form = new FormValidator( ); $form->addElement('file', 'import_file', get_lang('ImportFileLocation')); -$form->addElement('checkbox', 'remove_old_relationships', null, get_lang('RemoveOldRelationships')); +$form->addCheckbox('remove_old_relationships', [get_lang('RemoveOldRelationships'), get_lang('RemoveOldRelationshipsHelp')]); $form->addButtonImport(get_lang('ImportSession')); if ($form->validate()) { From be0467274dea4c88205287c0500e1d3fe20dcf3e Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sat, 4 Mar 2023 01:32:06 +0100 Subject: [PATCH 2/2] Update language terms --- main/lang/english/trad4all.inc.php | 1 + main/lang/french/trad4all.inc.php | 1 + main/lang/spanish/trad4all.inc.php | 1 + 3 files changed, 3 insertions(+) diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php index 5622f3e6a9..d58c7af298 100644 --- a/main/lang/english/trad4all.inc.php +++ b/main/lang/english/trad4all.inc.php @@ -9005,4 +9005,5 @@ $EndOfLearningPath = "Conclusion"; $UnableToDeleteTempFile = "Unable to access temp file"; $DuplicatedUsers = "Duplicated users"; $ThisReportOnlyListsUsersThatHaveTheSameFirstnameAndLastname = "This report only lists users that have the same firstname and lastname."; +$RemoveOldRelationshipsHelp = "By checking this box, you authorize the platform to remove all relationships that are *not* contained in the file you are importing. It will then use your file as the exclusive relationships and will remove all current relationships that are not in the file."; ?> \ No newline at end of file diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index 7d9913858b..da4a009f1c 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -8939,4 +8939,5 @@ $EndOfLearningPath = "Conclusion"; $UnableToDeleteTempFile = "Impossible d'accéder au fichier temporaire"; $DuplicatedUsers = "Utilisateurs en double"; $ThisReportOnlyListsUsersThatHaveTheSameFirstnameAndLastname = "Ce rapport ne liste que les utilisateurs qui ont les mêmes nom et prénom."; +$RemoveOldRelationshipsHelp = "En cochant cette case, vous donnez votre approbation pour que le système élimine toutes les relations qui ne sont *pas* dans votre fichier et utilise votre fichier comme une liste exclusive des relations (ce qui n'existe pas dans le fichier est éliminé du système)."; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index a103292fad..fd602c8f34 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -9030,4 +9030,5 @@ $EndOfLearningPath = "Conclusión"; $UnableToDeleteTempFile = "No se puede acceder al archivo temporal"; $DuplicatedUsers = "Usuarios duplicados"; $ThisReportOnlyListsUsersThatHaveTheSameFirstnameAndLastname = "Este reporte solo lista usuarios que tienen el mismo nombre y apellido."; +$RemoveOldRelationshipsHelp = "Marcando esta casilla, dará aprobación al sistema para eliminar todas las relaciones que *no* estén en el archivo. Usa el archivo como la lista exclusiva de relaciones (lo que no existe en el archivo es eliminado del sistema en general)."; ?> \ No newline at end of file