This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit d720088bd35ff7c6fa168f8ee32dde2d16184a0f Author: dcosse <cosse@codelutin.com> Date: Fri Sep 11 16:44:30 2015 +0200 refs #1241 Ajout de traductions --- lima-business/src/main/resources/i18n/lima-business_en_GB.properties | 2 ++ lima-business/src/main/resources/i18n/lima-business_fr_FR.properties | 2 ++ .../src/main/java/org/chorem/lima/server/HttpServerService.java | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties index 2fd01cb..89e4c1a 100644 --- a/lima-business/src/main/resources/i18n/lima-business_en_GB.properties +++ b/lima-business/src/main/resources/i18n/lima-business_en_GB.properties @@ -46,10 +46,12 @@ lima-business.document.entrybook.lastPageColumnDescription=Total for selected en lima-business.document.entrybooks=Entry books lima-business.document.financialstatement=FinancialStatement lima-business.document.forMonthText=%s +lima-business.document.generalBalanceReport.choice=General balance lima-business.document.generalBalanceReport.title=GENERAL BALANCE lima-business.document.generalEntryBookReport.title=PROVISIONAL GENERAL ENTRY BOOK lima-business.document.generalEntrybook.lastPageColumnDescription=Provisional general entry book total lima-business.document.generalentrybook=General EntryBook +lima-business.document.globalBalanceReport.choice=global balance lima-business.document.globalBalanceReport.title=GLOBALE BALANCE lima-business.document.grossamount=Gross Amount lima-business.document.headerCurrencyLabel=Currency\: diff --git a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties index 558a0db..64845a1 100644 --- a/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties +++ b/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties @@ -44,10 +44,12 @@ lima-business.document.entrybook.lastPageColumnDescription=Total pour les journa lima-business.document.entrybooks=Journaux lima-business.document.financialstatement=Bilan et compte de résultat lima-business.document.forMonthText=Mois de\:%s +lima-business.document.generalBalanceReport.choice=Balance générale lima-business.document.generalBalanceReport.title=BALANCE GÉNÉRALE lima-business.document.generalEntryBookReport.title=JOURNAL GÉNÉRAL PROVISOIRE lima-business.document.generalEntrybook.lastPageColumnDescription=Total du Journal Général lima-business.document.generalentrybook=Journal Général +lima-business.document.globalBalanceReport.choice=Balance globale lima-business.document.globalBalanceReport.title=BALANCE GLOBALE lima-business.document.grossamount=Brut lima-business.document.headerCurrencyLabel=Devise\: diff --git a/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java index eaa9a13..1022869 100644 --- a/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java +++ b/lima-server/src/main/java/org/chorem/lima/server/HttpServerService.java @@ -296,9 +296,9 @@ public class HttpServerService { + optionAccounts.toString() + "</select></div>" + "<div id='balanceType'>" - + " <input type=\"radio\" name=\"isGeneral\" value=\"true\" checked>Balance Générale\n" + + " <input type=\"radio\" name=\"isGeneral\" value=\"true\" checked>" + t("lima-business.document.generalBalanceReport.choice") + "\n" + " <br>\n" - + " <input type=\"radio\" name=\"isGeneral\" value=\"false\">Balance Globale" + + " <input type=\"radio\" name=\"isGeneral\" value=\"false\">" + t("lima-business.document.globalBalanceReport.choice") + "</div>" + "<input type=\"submit\">\n" + "</form></td>" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.