Author: tchemit Date: 2008-12-15 02:11:01 +0000 (Mon, 15 Dec 2008) New Revision: 1287 Modified: maven-i18n-plugin/trunk/changelog.txt maven-i18n-plugin/trunk/pom.xml maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java Log: modify ParserValidation (message can by suffix by ## to delimite args) Modified: maven-i18n-plugin/trunk/changelog.txt =================================================================== --- maven-i18n-plugin/trunk/changelog.txt 2008-12-10 11:07:25 UTC (rev 1286) +++ maven-i18n-plugin/trunk/changelog.txt 2008-12-15 02:11:01 UTC (rev 1287) @@ -1,4 +1,7 @@ -0.7 chemit 200812?? +0.8 chemit 200812?? + * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) + +0.7 chemit 20081117 * 20081205 [chemit] use lutinpluginproject 3.2 ver-0-7 chemit 20081117 * 20081118 [chemit] use lutinpluginproject 3.1 Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2008-12-10 11:07:25 UTC (rev 1286) +++ maven-i18n-plugin/trunk/pom.xml 2008-12-15 02:11:01 UTC (rev 1287) @@ -64,10 +64,8 @@ <packaging>maven-plugin</packaging> - <build> - <plugins> - - </plugins> + <build> + <defaultGoal>install</defaultGoal> </build> <properties> Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java 2008-12-10 11:07:25 UTC (rev 1286) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/impl/ParserValidation.java 2008-12-15 02:11:01 UTC (rev 1287) @@ -116,7 +116,15 @@ * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) */ public String extract(String i18nString) { - String s = i18nString.length() == 0 ? null : i18nString; + String s = null; + if (!i18nString.trim().isEmpty()) { + s = i18nString.trim(); + int end = s.indexOf("##"); + if (end >0) { + // remove params from key + s = s.substring(0,end); + } + } if (getLog().isDebugEnabled()) { getLog().debug(i18nString + " = " + s); }