Author: tchemit Date: 2012-08-29 22:33:23 +0200 (Wed, 29 Aug 2012) New Revision: 1976 Url: http://nuiton.org/repositories/revision/i18n/1976 Log: fixes #2290: Introduce a simple struts2 jsp parser Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:20:51 UTC (rev 1975) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:33:23 UTC (rev 1976) @@ -134,7 +134,7 @@ * @since 2.5 */ protected final Pattern i18nPattern = - Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:text\\s*name='|key=')(.*?)'"); + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:%\\{getText\\('|text\\s*name='|key=')(.*?)'"); public Struts2JspFileParser(Log log, String encoding, Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 20:20:51 UTC (rev 1975) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 20:33:23 UTC (rev 1976) @@ -99,19 +99,16 @@ line = "key=\"key22\" label='%{getText(\"i18n.key2\")}'/> "; parseLine(file, line, "i18n.key2"); - } - @Test - public void getKeys2() throws IOException { - - String line; - File file = new File("getKeys2"); - line = "<s:text name=\"i18n.key3\"/>"; parseLine(file, line, "i18n.key3"); line = "<s:text key='i18n.key4'/>"; parseLine(file, line, "i18n.key4"); + + line = "key=\"key52\" label=\"%{getText('i18n.key5')}\"/> "; + parseLine(file, line, "i18n.key5"); + } protected void parseLine(File f, String line, String... expectedKeys) throws IOException {