Author: vsalaun Date: 2011-07-18 16:17:31 +0200 (Mon, 18 Jul 2011) New Revision: 3229 Url: http://chorem.org/repositories/revision/lima/3229 Log: add to i18n all ErrorHelper and JOption text from lima-swing and translate them to French Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.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/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -466,7 +466,7 @@ if (log.isErrorEnabled()) { log.error("Exception during query", cause); } - throw new LimaException(_("lima-business.common.queryerror", cause)); + throw new LimaException(_("lima-business.common.queryerror") + " " + cause); } @Override Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -322,6 +322,6 @@ if (log.isErrorEnabled()) { log.error("Exception during query", cause); } - throw new LimaException(_("lima-business.common.queryerror", cause)); + throw new LimaException(_("lima-business.common.queryerror") + " " + cause); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -66,7 +66,7 @@ if (log.isErrorEnabled()) { log.error("Exception during query", cause); } - throw new LimaException(_("lima-business.common.queryerror", cause)); + throw new LimaException(_("lima-business.common.queryerror") + " " + cause); } /** Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -288,7 +288,6 @@ transaction = beginTransaction(); if (fiscalPeriod.getLocked()){ - //throw new LimaBusinessException("Fiscal Period already blocked"); throw new LimaBusinessException(_("lima-business.fiscalperiod.fiscalperiodalreadyblocked")); } //check rules Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -119,7 +119,7 @@ if (log.isErrorEnabled()) { log.error("Can't add account", ex); } - ErrorHelper.showErrorDialog("Can't add account", ex); + ErrorHelper.showErrorDialog(_("lima.account.addaccounterror"), ex); } } }; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -112,7 +112,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get entries list", eee); + ErrorHelper.showErrorDialog(_("lima.accountsreports.listerror"), eee); } } return results; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -137,7 +137,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get entries list", eee); + ErrorHelper.showErrorDialog(_("lima.balance.listerror"), eee); } return results; } @@ -193,7 +193,7 @@ if (log.isErrorEnabled()) { log.debug("Enable to create document ", eee); } - ErrorHelper.showErrorDialog("Enable to create document ", eee); + ErrorHelper.showErrorDialog(_("lima.balance.documentcreationerror"), eee); } //tells if the fiscaPeriod as been found and is blocked @@ -211,7 +211,7 @@ if (error) { JOptionPane.showMessageDialog( view, - "Can't create document on an open fiscal year", + _("lima.balance.documentcreationfiscalerror"), _("lima.common.error"), JOptionPane.ERROR_MESSAGE); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -140,7 +140,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get entries list", eee); + ErrorHelper.showErrorDialog(_("lima.entrybooksreports.listerror"), eee); } } return results; @@ -198,7 +198,7 @@ if (log.isErrorEnabled()) { log.debug("Enable to create document ", eee); } - ErrorHelper.showErrorDialog("Enable to create document ", eee); + ErrorHelper.showErrorDialog(_("lima.entrybooksreports.documentcreationerror"), eee); } //tells if the fiscaPeriod as been found and is blocked @@ -216,7 +216,7 @@ if (error) { JOptionPane.showMessageDialog( view, - "Can't create document on an open fiscal year", + _("lima.entrybooksreports.documentcreationfiscalerror"), _("lima.common.error"), JOptionPane.ERROR_MESSAGE); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -122,7 +122,7 @@ if (log.isErrorEnabled()) { log.error("Can't add financialStatementHeader", ex); } - ErrorHelper.showErrorDialog("Can't add financialStatementHeader", ex); + ErrorHelper.showErrorDialog(_("lima.financialstatement.addfinancialStatementHeadererror"), ex); } } }; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -263,7 +263,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get entries list", eee); + ErrorHelper.showErrorDialog(_("lima.financialstatementreport.listerror"), eee); } } return results; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -98,7 +98,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get fiscal periods list", eee); + ErrorHelper.showErrorDialog(_("lima.fiscalperiod.listerror"), eee); } return results; } @@ -221,7 +221,7 @@ if (log.isErrorEnabled()) { log.debug("Can't create FiscalPeriod", eee); } - ErrorHelper.showErrorDialog("Can't create fiscal periods ", eee); + ErrorHelper.showErrorDialog(_("lima.fiscalperiod.creationerror"), eee); } } @@ -233,7 +233,7 @@ f.setIconImage(Resource.getIcon("icons/lima.png").getImage()); JOptionPane.showMessageDialog( f, - "Fiscal Period has unbalanced transactions", + _("lima.fiscalperiod.unbalancedtransactions"), _("lima.common.error"), JOptionPane.ERROR_MESSAGE); f.dispose(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -209,7 +209,7 @@ if (log.isErrorEnabled()) { log.debug("Enable to create document ", eee); } - ErrorHelper.showErrorDialog("Enable to create document ", eee); + ErrorHelper.showErrorDialog(_("lima.ledger.documentcreationerror"), eee); } //tells if the fiscaPeriod as been found and is blocked Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -136,7 +136,7 @@ if (log.isErrorEnabled()) { log.error("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get transaction list", eee); + ErrorHelper.showErrorDialog(_("lima.lettering.listerror"), eee); } } return results; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2011-07-18 14:17:31 UTC (rev 3229) @@ -111,7 +111,7 @@ if (log.isErrorEnabled()) { log.debug("Can't update model", eee); } - ErrorHelper.showErrorDialog("Can't get VAT list", eee); + ErrorHelper.showErrorDialog(_("lima.vatreport.listerror"), eee); } } return finalresults; 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 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2011-07-18 14:17:31 UTC (rev 3229) @@ -1,9 +1,14 @@ = +lima.account.addaccounterror=Can't add account +lima.accountsreports.listerror=Can't get entries list lima.action.commandline.help=Show help in console lima.action.fullscreen=Full screen lima.action.fullscreen.tip=Open ui in full screen lima.action.normalscreen=Normal screen lima.action.normalscreen.tip=Open ui in normal screen +lima.balance.documentcreationerror=Enable to create document +lima.balance.documentcreationfiscalerror=Can't create document on an open fiscal year +lima.balance.listerror=Can't get entries list lima.charts.account=Accounts chart lima.charts.account.addAccount=Add account lima.charts.account.addSubLedger=Add thirdpart account @@ -98,6 +103,9 @@ lima.entries.searchtransaction=Search transaction lima.entries.searchunbalancedtransaction=Incorrect transactions lima.entries.writetransaction=Write entries +lima.entrybooksreports.documentcreationerror=Enable to create document +lima.entrybooksreports.documentcreationfiscalerror=Can't create document on an open fiscal year +lima.entrybooksreports.listerror=Can't get entries list lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts @@ -121,6 +129,7 @@ lima.enum.comboboxperiod.period=Period lima.error.errorpane.htmlmessage=<html><body><b>An application error happened</b>\:<br/>%s</body></html> lima.financialstatement.accounts=Account list on debit and on credit +lima.financialstatement.addfinancialStatementHeadererror=Can't add financialStatementHeader lima.financialstatement.check=Check accounts passing to movement lima.financialstatement.creditaccounts=Account credit list lima.financialstatement.debitaccounts=Account debit list @@ -131,6 +140,10 @@ lima.financialstatement.movement.add=Add movement lima.financialstatement.provisiondeprecationaccounts=Provisions and deprecations accounts list lima.financialstatement.subamount=Calculate a subamount +lima.financialstatementreport.listerror=Can't get entries list +lima.fiscalperiod.creationerror=Can't create fiscal periods +lima.fiscalperiod.listerror=Can't get fiscal periods list +lima.fiscalperiod.unbalancedtransactions=Fiscal Period has unbalanced transactions lima.home.chartaccounts.create=Create accountschart lima.home.chartaccounts.modify=Modify accountschart lima.home.chartaccounts.nothing=No accountschart @@ -183,6 +196,8 @@ lima.importexport.wait=Job in progress… lima.init.closed=Lima closed at %1$s lima.init.errorclosing=Error during Lima close +lima.ledger.documentcreationerror=Enable to create document +lima.lettering.listerror=Can't get entries list lima.menu.file=File lima.menu.help=Help lima.menu.help.about=About @@ -255,6 +270,7 @@ lima.title.about.description=Open sources accounting software lima.tooltip.filter=<html>Regular expression \:<br/>- accounts interval i..j <br/>- accounts list i,j,k <br/>- Exclude an account -i</html> lima.tooltip.lettering=<html>Add a letter on many entries <br/>Select many rows with combination ctrl + click</html> +lima.vatreport.listerror=Can't get entries list lima.warning.nimbus.landf=Could not find Numbus Look&Feel limma.config.thousandseparator.description= nuitonutil.error.applicationconfig.save= 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 2011-07-18 09:49:01 UTC (rev 3228) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2011-07-18 14:17:31 UTC (rev 3229) @@ -1,9 +1,14 @@ = +lima.account.addaccounterror=Erreur lors l'ajout d'un compte +lima.accountsreports.listerror=Erreur lors de la récupération des données de la liste lima.action.commandline.help=Afficher l'aide en console lima.action.fullscreen=Plein Ecran lima.action.fullscreen.tip=Passer en mode plein écran lima.action.normalscreen=Ecran normal lima.action.normalscreen.tip=Revenir en écran normal +lima.balance.documentcreationerror=Erreur lors de la création du document +lima.balance.documentcreationfiscalerror=Impossible de créer le document quand la période fiscale est ouverte +lima.balance.listerror=Erreur lors de la récupération des données de la liste lima.charts.account=Plan comptable lima.charts.account.addAccount=Ajout Compte Général lima.charts.account.addSubLedger=Ajouter Compte Tiers @@ -98,6 +103,9 @@ lima.entries.searchtransaction=Rechercher des écritures lima.entries.searchunbalancedtransaction=Entrées incorrectes lima.entries.writetransaction=Saisir des écritures +lima.entrybooksreports.documentcreationerror=Erreur lors de la création du document +lima.entrybooksreports.documentcreationfiscalerror=Impossible de créedr un document quand la période fiscale est ouverte +lima.entrybooksreports.listerror=Erreur lors de la récupération des données de la liste lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes @@ -121,6 +129,7 @@ lima.enum.comboboxperiod.period=Période lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> lima.financialstatement.accounts=Liste de comptes au crédit et au débit +lima.financialstatement.addfinancialStatementHeadererror=Erreur lors de l'ajout de l'entête sur la déclaration financière lima.financialstatement.check=Vérification des comptes aux postes lima.financialstatement.creditaccounts=Liste de comptes au crédit lima.financialstatement.debitaccounts=Liste de comptes au débit @@ -131,6 +140,10 @@ lima.financialstatement.movement.add=Ajouter un regrouprement lima.financialstatement.provisiondeprecationaccounts=Liste de comptes d'amortissement et provisions lima.financialstatement.subamount=Calculer un sous-total +lima.financialstatementreport.listerror=Erreur lors de la récupération des données de la liste +lima.fiscalperiod.creationerror=Erreur lors de la création de la période fiscale +lima.fiscalperiod.listerror=Erreur lors de la récupération des données de la liste +lima.fiscalperiod.unbalancedtransactions=La période fiscale contient des transactions non équilibrées lima.home.chartaccounts.create=Créer le plan des comptes lima.home.chartaccounts.modify=Modifier le plan des comptes lima.home.chartaccounts.nothing=Aucun compte \! @@ -183,6 +196,8 @@ lima.importexport.wait=Traitement en cours … lima.init.closed=Lima fermé à %1$s lima.init.errorclosing=Erreur lors de la fermeture +lima.ledger.documentcreationerror=Erreur lors de la création du document +lima.lettering.listerror=Erreur lors de la récupération des données de la liste lima.menu.file=Fichier lima.menu.help=Aide lima.menu.help.about=À Propos @@ -255,6 +270,7 @@ lima.title.about.description=Logiciel de comptabilité Libre lima.tooltip.filter=<html>Expression régulière \:<br/>- intervalle de compte i..j <br/>- liste de compte i,j,k <br/>- Exclure un compte -i</html> lima.tooltip.lettering=<html>Pour ajouter une lettre à plusieurs écritures <br/>Sélectionner plusieurs lignes avec la combinaison ctrl + click</html> +lima.vatreport.listerror=Erreur lors de la récupération des données de la liste lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description= nuitonutil.error.applicationconfig.save=