This is an automated email from the git hooks/post-receive script. New commit to branch feature/1377-Amélioration_import_export_tous in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 54b56bfccb5ffb89255365f39727250baeb8b2f3 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:58:51 2016 +0100 refs #1377 affichage correcte du retour du résultat d'un import --- .../main/java/org/chorem/lima/ui/importexport/ImportExport.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index 2b1f0b1..48a1ff6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -395,12 +395,15 @@ public class ImportExport { protected void ComputeImportResultMessage(List<ImportResult> resultList) { StringBuilder message = new StringBuilder(); - message.append(t("lima.import.terminated") + "\n"); + String importTerminatedMessage = t("lima.import.terminated") + "\n"; + String noErrorFoundMessage = t("lima.import.report.noErrorFound"); + String someErrorFoundMessage = t("lima.import.report.someErrorFound"); + message.append(importTerminatedMessage); for (ImportResult result : resultList) { Class fromSource = result.getFromSource(); message.append("Import "); message.append(getFromSourceMessage(fromSource)); - message.append(result.getAllExceptionsByLine().isEmpty() ? "Aucune erreur rencontrée\n" : "Des erreurs sont survenues lors de l'import, veuillez regarder le fichier de log pour plus de détails.\n"); + message.append(result.getAllExceptionsByLine().isEmpty() ? noErrorFoundMessage : someErrorFoundMessage); message.append(t("lima.import.report", result.getNbCreated(), result.getNbIgnored(), result.getNbUpdated())); logErrorMessage(result, fromSource); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.