Author: fdesbois Date: 2011-05-06 14:51:09 +0200 (Fri, 06 May 2011) New Revision: 1905 Url: http://nuiton.org/repositories/revision/i18n/1905 Log: #1507 : Introduce BundleFormatConverter to apply conversion with bundle goal. Basic implementation of StringFormatToMessageFormat is provided. Added: trunk/maven-i18n-plugin/src/it/evo-formatter/ trunk/maven-i18n-plugin/src/it/evo-formatter/LICENSE.txt trunk/maven-i18n-plugin/src/it/evo-formatter/README.txt trunk/maven-i18n-plugin/src/it/evo-formatter/changelog.txt trunk/maven-i18n-plugin/src/it/evo-formatter/invoker.properties trunk/maven-i18n-plugin/src/it/evo-formatter/pom.xml trunk/maven-i18n-plugin/src/it/evo-formatter/src/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/java/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_en_GB.properties trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_fr_FR.properties trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_en_GB.properties trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_fr_FR.properties trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/resources/ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/resources/log4j.properties trunk/maven-i18n-plugin/src/it/evo-formatter/verify.groovy trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java Modified: trunk/maven-i18n-plugin/src/it/ano-encoding/iso-8859-1/README.txt trunk/maven-i18n-plugin/src/it/ano-encoding/migrate/README.txt trunk/maven-i18n-plugin/src/it/ano-encoding/utf-8/README.txt trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/maven-i18n-plugin/src/it/ano-encoding/iso-8859-1/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-encoding/iso-8859-1/README.txt 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/maven-i18n-plugin/src/it/ano-encoding/iso-8859-1/README.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -1,2 +1 @@ -To test parserJava on a new project (says a project with no i18n translations) -At the end we should have in target/generated-sources/i18n getters detected. +To test iso-8859-1 encoding with unicode chars escape. Modified: trunk/maven-i18n-plugin/src/it/ano-encoding/migrate/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-encoding/migrate/README.txt 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/maven-i18n-plugin/src/it/ano-encoding/migrate/README.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -1,2 +1,2 @@ -To test parserJava on a new project (says a project with no i18n translations) -At the end we should have in target/generated-sources/i18n getters detected. +To test migration from iso-8859-1 encoding (before 2.4) and new default +condiguration with utf-8 encoding (since 2.4) Modified: trunk/maven-i18n-plugin/src/it/ano-encoding/utf-8/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/ano-encoding/utf-8/README.txt 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/maven-i18n-plugin/src/it/ano-encoding/utf-8/README.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -1,2 +1 @@ -To test parserJava on a new project (says a project with no i18n translations) -At the end we should have in target/generated-sources/i18n getters detected. +To test utf-8 encoding. It becomes the default encoding since 2.4 Added: trunk/maven-i18n-plugin/src/it/evo-formatter/LICENSE.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/LICENSE.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/LICENSE.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/maven-i18n-plugin/src/it/evo-formatter/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/README.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/README.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,2 @@ +To test I18nFormatterMessageFormat and conversion from string.format syntax +using StringFormatToMessageFormat. Added: trunk/maven-i18n-plugin/src/it/evo-formatter/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/changelog.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/changelog.txt 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/evo-formatter/invoker.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/invoker.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/invoker.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,45 @@ +### +# #%L +# I18n :: Maven Plugin +# +# $Id: invoker.properties 1882 2011-02-14 15:54:14Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/it/parsers/newPro... $ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean test -Dlog4j.configuration=file:src/test/resources/log4j.properties + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/maven-i18n-plugin/src/it/evo-formatter/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/pom.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/pom.xml 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n :: Maven Plugin + + $Id: pom.xml 1882 2011-02-14 15:54:14Z tchemit $ + $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/it/parsers/newPro... $ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>@pom.version@</version> + </parent> + + <groupId>org.nuiton.i18n</groupId> + <artifactId>evo-formatter</artifactId> + + <name>I18n Test :: evo-formatter</name> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + <bundleFormatConverter>org.nuiton.i18n.plugin.bundle.StringFormatToMessageFormat</bundleFormatConverter> + <bundleOutputName>ResultBundle</bundleOutputName> + <bundleOutputPackage>org.nuiton</bundleOutputPackage> + </configuration> + <executions> + <execution> + <id>bundle</id> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_en_GB.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_en_GB.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_en_GB.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1 @@ +app.property=My application {0} \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_fr_FR.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/evo-formatter_fr_FR.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1 @@ +app.property=Mon application {0} \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_en_GB.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_en_GB.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_en_GB.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,2 @@ +lib.property.message1=Message that need conversion for %s and %s +lib.property.message2=Message that care about %$1s conversion \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_fr_FR.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/main/resources/i18n/other-lib-stringformat_fr_FR.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,2 @@ +lib.property.message1=Message qui a besoin de conversion pour %s et %s +lib.property.message2=Message qui fait attention à la conversion de %$1s \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,39 @@ +package org.nuiton.i18n; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +import java.util.Locale; + +/** + * Created: 06/05/11 + * + * @author fdesbois <desbois@codelutin.com> + * $Id$ + */ +public class ReadMessageFormatTest { + + @After + public void tearDown() { + I18n.close(); + I18n.setFormatter(I18nFormat.STRING_FORMAT); + } + + @Test + public void testMessageFormatFormatter() { + + DefaultI18nInitializer initializer = + new DefaultI18nInitializer("ResultBundle", null, "org/nuiton/"); + + I18n.init(initializer, Locale.FRANCE); + + I18n.setFormatter(I18nFormat.MESSAGE_FORMAT); + + String expected = "Message qui fait attention à la conversion de param"; + String actual = I18n._("lib.property.message2", "param"); + Assert.assertEquals(expected, actual); + } + +} Added: trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/resources/log4j.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/resources/log4j.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/src/test/resources/log4j.properties 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,34 @@ +### +# #%L +# I18n :: Maven Plugin +# +# $Id: log4j.properties 1882 2011-02-14 15:54:14Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/it/ano-672/src/te... $ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.nuiton.util=WARN +log4j.logger.org.nuiton.i18n=DEBUG Added: trunk/maven-i18n-plugin/src/it/evo-formatter/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-formatter/verify.groovy (rev 0) +++ trunk/maven-i18n-plugin/src/it/evo-formatter/verify.groovy 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,54 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id: verify.groovy 1882 2011-02-14 15:54:14Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/it/parsers/newPro... $ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +def fileExists(path) { + + file = new File(basedir, path); + return file.exists(); + +} + +def checkContent(path, values) { + + file = new File(basedir, path); + + content = file.text; + + for (value in values) { + if (!content.contains(value)) { + println("Could not find " + value + " in file " + file); + return false; + } + } + return true; +} + +assert fileExists('target/classes/org/nuiton/ResultBundle_fr_FR.properties'); + +assert checkContent('target/classes/org/nuiton/ResultBundle_fr_FR.properties', + ['lib.property.message1=Message qui a besoin de conversion pour {0} et {1}', + 'app.property=Mon application {0}', + 'lib.property.message2=Message qui fait attention à la conversion de {0}']); + +return true; Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,23 @@ +package org.nuiton.i18n.plugin.bundle; + +import org.nuiton.i18n.I18nFormatter; + +/** + * Used to convert from a {@link I18nFormatter} syntax to an other. + * <p/> + * Created: 05/05/11 + * + * @author fdesbois <desbois@codelutin.com> + * $Id$ + */ +public interface BundleFormatConverter { + + /** + * Convert format syntax to an other from {@code value}. + * + * @param value Message with some format placeholders to convert + * @return the message with other format syntax + */ + String convert(String value); + +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2011-05-06 12:51:09 UTC (rev 1905) @@ -42,6 +42,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; /** * Generate an aggregate i18n bundle for all dependencies of the project. @@ -78,6 +79,14 @@ */ protected boolean generateDefinitionFile; + /** + * Converter used to change format of bundles. + * + * @parameter expression="${i18n.bundleFormatConverter}" + * @since 2.4 + */ + protected String bundleFormatConverter; + @Override public void init() throws Exception { super.init(); @@ -95,11 +104,12 @@ version = PluginHelper.removeSnapshotSuffix(version); if (!silent) { - getLog().info("config - resources dir : " + bundleOutputDir); - getLog().info("config - package name : " + bundleOutputPackage); - getLog().info("config - bundle name : " + bundleOutputName); - getLog().info("config - locales : " + Arrays.toString(locales)); - getLog().info("config - version : " + version); + getLog().info("config - resources dir : " + bundleOutputDir); + getLog().info("config - package name : " + bundleOutputPackage); + getLog().info("config - bundle name : " + bundleOutputName); + getLog().info("config - format converter : " + bundleFormatConverter); + getLog().info("config - locales : " + Arrays.toString(locales)); + getLog().info("config - version : " + version); } Map<Locale, String> bundleDico = @@ -163,6 +173,12 @@ } } } + + // Apply conversion if necessary, depends on input bundleFormatConverter + if (bundleFormatConverter != null) { + applyConversion(propertiesOut, bundleFormatConverter); + } + propertiesOut.store(bundleOut); if (!silent && verbose) { getLog().info( @@ -232,4 +248,30 @@ URL[] urls = PluginHelper.getLinesAsURL(file); return urls; } + + /** + * Apply conversion over {@code properties} with converter named + * {@code converterName}. + * + * @param properties Properties to walk through + * @param converterName Name of the converter + * @throws ClassNotFoundException if converterName doesn't match any class + * @throws IllegalAccessException if no access could be done to converter + * @throws InstantiationException if no instance could be done from converter class + * @since 2.4 + */ + protected void applyConversion(Properties properties, String converterName) + throws ClassNotFoundException, IllegalAccessException, InstantiationException { + + // Instantiate the converter + BundleFormatConverter converter = + (BundleFormatConverter) Class.forName(converterName).newInstance(); + + // Apply conversion + for (Entry<Object, Object> entry : properties.entrySet()) { + String convertedValue = converter.convert((String) entry.getValue()); + properties.setProperty((String) entry.getKey(), convertedValue); + } + } + } Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,73 @@ +package org.nuiton.i18n.plugin.bundle; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.text.MessageFormat; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Converter used to change printf args syntax by {@link MessageFormat} syntax + * <p/> + * Created: 05/05/11 + * + * @author fdesbois <desbois@codelutin.com> + * $Id$ + */ +public class StringFormatToMessageFormat implements BundleFormatConverter { + + private static final Log log = LogFactory.getLog(StringFormatToMessageFormat.class); + + protected static Pattern PATTERN = Pattern.compile("%\\$?(\\d?)([^\\s])?[^\\s]+"); + + @Override + public String convert(String value) { + + String result; + + Matcher matcher = PATTERN.matcher(value); + boolean matches = matcher.find(); + + log.debug("> value : " + value + " _ matches ? " + matches); + + if (matches) { + + // Reset done, because of first find() + matcher.reset(); + + StringBuffer sb = new StringBuffer(); + for (int i = 0; matcher.find(); i++) { + + log.debug("> match group : " + matcher.group(0)); + log.debug("> match group for number : " + matcher.group(1)); + + int nb = i; + + // Group 1 is the arg number, for MessageFormat it starts from 0 + // compare to printf that starts from 1 + if (!"".equals(matcher.group(1))) { + nb = Integer.parseInt(matcher.group(1)) - 1; + } + + // Append replacement for current occurence + matcher.appendReplacement(sb, "\\{" + nb + "\\}"); + } + // Append last chars from input String + matcher.appendTail(sb); + result = sb.toString(); + + log.debug("Result : " + result); + + // Replace ' by '' + result = result.replaceAll("([^']+)'([^']+)", "$1''$2"); + + log.debug("Result with ' escape : " + result); + + } else { + result = value; + } + return result; + } + +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java =================================================================== --- trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java (rev 0) +++ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java 2011-05-06 12:51:09 UTC (rev 1905) @@ -0,0 +1,40 @@ +package org.nuiton.i18n.plugin.bundle; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Created: 05/05/11 + * + * @author fdesbois <desbois@codelutin.com> + * $Id$ + */ +public class StringFormatToMessageFormatTest { + + @Test + public void testConvert() throws Exception { + + BundleFormatConverter converter = new StringFormatToMessageFormat(); + + String expected = "Salut à tous pour l'ouverture"; + String actual = converter.convert("Salut à tous pour l'ouverture"); + Assert.assertEquals(expected, actual); + + expected = "Salut à tous pour l''ouverture de {0}"; + actual = converter.convert("Salut à tous pour l'ouverture de %s"); + Assert.assertEquals(expected, actual); + + expected = "Salut à tous pour l''ouverture de {0}"; + actual = converter.convert("Salut à tous pour l'ouverture de %$1s"); + Assert.assertEquals(expected, actual); + + expected = "Salut à tous pour l''ouverture de {1} le {0}"; + actual = converter.convert("Salut à tous pour l'ouverture de %$2s le %$1t"); + Assert.assertEquals(expected, actual); + + expected = "Salut à tous pour l''ouverture de {1} le {0} à l''heure {0}"; + actual = converter.convert("Salut à tous pour l''ouverture de %$2s le %$1td à l'heure %1tH"); + Assert.assertEquals(expected, actual); + } + +} Property changes on: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/src/site/apt/index.apt 2011-05-06 12:51:09 UTC (rev 1905) @@ -55,9 +55,15 @@ La version 2.4 gère désormais les fichiers properties en UTF-8 par défaut. Il est cependant possible de modifier cet encoding dans le plugin et via - le {{{/i18n/nuiton-i18n/apidocs/org/nuiton/i18n/init/I18nInitializer.html}I18nInitializer}} + le {{{./nuiton-i18n/apidocs/org/nuiton/i18n/init/I18nInitializer.html}I18nInitializer}} pour l'api runtime. + Il est aussi possible d'utiliser un autre formattage que celui de <String.format> + en utilisant l'interface {{{./nuiton-i18n/apidocs/org/nuiton/i18n/I18nFormatter.html}I18nFormatter}}. + Le plugin maven permet d'appliquer une conversion si différents formattages + sont utilisés en utilisant le paramètre <<bundleFormatConverter>> du goal <<bundle>>. + Ce converter implante le contrat {{{./nuiton-i18n/apidocs/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.html}BundleFormatConverter}}. + Quoi de neuf dans la version 2.3 La version 2.3 améliore de façon considérable les temps de détection des clefs Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2011-05-06 12:49:50 UTC (rev 1904) +++ trunk/src/site/en/apt/index.apt 2011-05-06 12:51:09 UTC (rev 1905) @@ -55,9 +55,16 @@ The 2.4 version manage properties file with UTF-8 encoding by default. It's also possible to change this encoding with maven plugin and with - {{{/i18n/nuiton-i18n/apidocs/org/nuiton/i18n/init/I18nInitializer.html}I18nInitializer}} + {{{./nuiton-i18n/apidocs/org/nuiton/i18n/init/I18nInitializer.html}I18nInitializer}} for runtime api. + A new formatter {{{./nuiton-i18n/apidocs/org/nuiton/i18n/I18nFormatter.html}I18nFormatter}} + is available to allow different implementation than <String.format> (default one). + The maven plugin also allow to apply a conversion if different format are used + when using <<bundle>> goal, you can set the <<bundleFormatConverter>> parameter. + This converter implements the interface + {{{./nuiton-i18n/apidocs/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.html}BundleFormatConverter}}. + What's new in 2.3 version Version 2.3 improves a lot performance on detection of java file i18n keys