Author: dcosse Date: 2014-08-05 16:49:54 +0200 (Tue, 05 Aug 2014) New Revision: 3896 Url: http://forge.chorem.org/projects/lima/repository/revisions/3896 Log: refs #1032 correction des traductions Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-08-05 14:07:42 UTC (rev 3895) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2014-08-05 14:49:54 UTC (rev 3896) @@ -170,7 +170,7 @@ @Override public ImportExportResults importEntryBooksAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(EntryBook.class); InputStream contentStream = IOUtils.toInputStream(contents); @@ -195,7 +195,7 @@ @Override public ImportExportResults importFiscalPeriodsAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(FiscalPeriod.class); InputStream contentStream = IOUtils.toInputStream(contents); try { @@ -221,7 +221,7 @@ protected ImportExportResults importFinancialTransactionsAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(FinancialTransaction.class); // import and save FinancialTransactions InputStream contentStream = IOUtils.toInputStream(contents); @@ -248,7 +248,7 @@ @Override public ImportExportResults importEntriesAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(Entry.class); // import and save entries InputStream contentStream = IOUtils.toInputStream(contents); @@ -267,7 +267,7 @@ public ImportExportResults importIdentityAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(Identity.class); // import and save identity if (StringUtils.isNotBlank(contents)){ @@ -329,7 +329,7 @@ @Override public ImportExportResults importFinancialStatementsAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(FinancialStatement.class); // import and save FinancialTransactions InputStream contentStream = IOUtils.toInputStream(contents); @@ -472,7 +472,7 @@ @Override public ImportExportResults importVATStatementsAsCSV(String contents) { ImportExportResults results = new ImportExportResults(); - ImportResult result = results.createAddAndGetImportResult(Account.class); + ImportResult result = results.createAddAndGetImportResult(VatStatement.class); // import and save VATStatements InputStream contentStream = IOUtils.toInputStream(contents); Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java 2014-08-05 14:07:42 UTC (rev 3895) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/ImportResult.java 2014-08-05 14:49:54 UTC (rev 3896) @@ -41,7 +41,7 @@ protected Class fromSource; - protected Map<Integer, LimaException> allExceptions = new HashMap<>(); + protected Map<Integer, LimaException> allExceptions; public ImportResult(Class fromSource) { nbCreated = 0; @@ -79,6 +79,7 @@ } public void addException(LimaException e) { + allExceptions = allExceptions == null ? new HashMap<Integer, LimaException>() : allExceptions; allExceptions.put(this.lineIndex, e); lineIndex++; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-08-05 14:07:42 UTC (rev 3895) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2014-08-05 14:49:54 UTC (rev 3896) @@ -272,10 +272,10 @@ log.debug("import.terminated"); } - String message = "Import"; + String message = ""; for (ImportResult result : resultList) { Class fromSource = result.getFromSource(); - message += getFromSourceMessage(fromSource)+"\n"; + message += "Import " + getFromSourceMessage(fromSource)+"\n"; message += t("lima.ui.importexport.import.nbCreated", result.getNbCreated())+"\n"; message += t("lima.ui.importexport.import.nbUpdated", result.getNbUpdated())+"\n"; message += t("lima.ui.importexport.import.nbIgnored", result.getNbIgnored())+"\n"; @@ -305,10 +305,10 @@ log.debug("export.terminated"); } - String message = "Export"; + String message =""; for (ExportResult result : exportResults) { Class fromSource = result.getFromSource(); - message += getFromSourceMessage(fromSource); + message += "Export " + getFromSourceMessage(fromSource); List<ExportException> exportExceptions = result.getExportExceptions(); if (exportExceptions != null && !exportExceptions.isEmpty()) { message += t("lima.ui.importexport.export.exception")+"\n"; @@ -350,9 +350,11 @@ String message; if (fromSource.equals(Account.class)){ message = t("lima.ui.importexport.account")+"\n"; + } else if (fromSource.equals(EntryBook.class)) { + message = t("lima.ui.importexport.entrybook")+"\n"; } else if (fromSource.equals(Entry.class)) { message = t("lima.ui.importexport.entry")+"\n"; - }else if (fromSource.equals(FinancialStatement.class)) { + } else if (fromSource.equals(FinancialStatement.class)) { message = t("lima.ui.importexport.financialStatement")+"\n"; } else if (fromSource.equals(FinancialTransaction.class)) { message = t("lima.ui.importexport.financialTransaction")+"\n"; Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-08-05 14:07:42 UTC (rev 3895) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-08-05 14:49:54 UTC (rev 3896) @@ -39,7 +39,7 @@ lima.charts.fiscalperiod.block=Block fiscalperiod lima.charts.fiscalperiod.create=Create fiscalperiod lima.charts.fiscalperiod.delete=Delete fiscalperiod -lima.charts.fiscalperiod.update= +lima.charts.fiscalperiod.update=Updated fiscal lima.charts.fiscalyear=Fiscal Years lima.charts.vatpdf=PDF structure lima.charts.vatstatement=VAT statement chart @@ -579,6 +579,8 @@ lima.ui.importexport.ebp=Import/Export EBP lima.ui.importexport.entries=Entries lima.ui.importexport.entry=Entries import completed. +lima.ui.importexport.entryBook= +lima.ui.importexport.entrybook=Entry books import completed. lima.ui.importexport.entrybooks=Entry books lima.ui.importexport.export=Export lima.ui.importexport.export.exception= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-08-05 14:07:42 UTC (rev 3895) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-08-05 14:49:54 UTC (rev 3896) @@ -501,14 +501,15 @@ lima.ui.importexport.account=des comptes terminé. lima.ui.importexport.defaultentrybooks=Journaux par défaut lima.ui.importexport.entry=des entrées terminé. +lima.ui.importexport.entrybook=des journaux terminé. lima.ui.importexport.entrybooks=Journaux lima.ui.importexport.export=Exporter lima.ui.importexport.export.action=Export lima.ui.importexport.export.exception= lima.ui.importexport.export.exceptions=Echec de l'export. lima.ui.importexport.export.terminated=Export terminé -lima.ui.importexport.financialStatement=des transaction financière terminé. -lima.ui.importexport.financialTransaction= +lima.ui.importexport.financialStatement=des déclaration financière terminé. +lima.ui.importexport.financialTransaction=des transaction financière terminé. lima.ui.importexport.fiscalPeriod=des periodes fiscales terminé. lima.ui.importexport.identity=de l'identité terminé. lima.ui.importexport.import=Importer @@ -573,6 +574,3 @@ lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers limma.config.thousandseparator.label=Séparateur de milliers -org.chorem.lima.LimaConfig.NumberSeparator.COMMA= -org.chorem.lima.LimaConfig.NumberSeparator.DOT= -org.chorem.lima.LimaConfig.NumberSeparator.SPACE=