Author: echatellier Date: 2012-01-12 16:29:21 +0100 (Thu, 12 Jan 2012) New Revision: 3317 Url: http://chorem.org/repositories/revision/lima/3317 Log: Fix i18n init Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:27:48 UTC (rev 3316) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 15:29:21 UTC (rev 3317) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,6 +40,7 @@ import java.io.File; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * Configuration pour le business. @@ -79,9 +80,11 @@ } /** - * instancie la bonne classe de nationalite en fonction du fichier de configuration + * Instancie la bonne classe de nationalite en fonction du fichier de configuration. * - * @return + * L'instance est conservée en cache. + * + * @return l'instance de rule */ public AccountingRules getAccountingRules() { @@ -103,6 +106,10 @@ return accountingRules; } + public void setAccountingRule(String accountingRule) { + setOption(Option.RULES_NATIONALTY.key, accountingRule); + } + public File getDataDir() { File datadir = getOptionAsFile(Option.DATA_DIR.getKey()); return datadir; @@ -170,14 +177,14 @@ */ public enum Option implements OptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima.properties", String.class, true, true), - DATA_DIR("lima.data.dir", _("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), - REPORTS_DIR("lima.reports.dir", _("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), - RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), - HTTP_PORT("lima.httpport", _("lima.config.httpport.description"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", _("lima.config.serveraddress.description"), "", String.class, false, false), - SCALE("lima.scale", _("lima.config.scale.description"), "2", String.class, false, false), - VAT_PDF_URL("lima.report.vatpdfurl", _("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); + CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.configFileName.description"), "lima.properties", String.class, true, true), + DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), + REPORTS_DIR("lima.reports.dir", n_("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), + RULES_NATIONALTY("lima.rules", n_("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), + HTTP_PORT("lima.httpport", n_("lima.config.httpport.description"), "5462", String.class, false, false), + SERVER_ADRESS("lima.serveraddress", n_("lima.config.serveraddress.description"), "", String.class, false, false), + SCALE("lima.scale", n_("lima.config.scale.description"), "2", String.class, false, false), + VAT_PDF_URL("lima.report.vatpdfurl", n_("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); private final String key; @@ -233,7 +240,7 @@ @Override public String getDescription() { - return description; + return _(description); } @Override