- I18n-commits - mailman.cloud.codelutin.com

r1981 - in trunk: i18n-maven-plugin/src/site nuiton-i18n/src/site src/site src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 11:26:32 +0200 (Tue, 04 Sep 2012) New Revision: 1981 Url: http://nuiton.org/repositories/revision/i18n/1981 Log: improve site generation Modified: trunk/i18n-maven-plugin/src/site/site_en.xml trunk/i18n-maven-plugin/src/site/site_fr.xml trunk/nuiton-i18n/src/site/site_en.xml trunk/nuiton-i18n/src/site/site_fr.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/i18n-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/i18n-maven-plugin/src/site/site_en.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/i18n-maven-plugin/src/site/site_en.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -28,53 +28,38 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> - <links> +  <menu name="Project Parent"> <item name="I18n" href="../../en/index.html"/> </menu> - + + <menu name="Language"> + <item name="Version Française" href="../index.html"/> + <item name="English Version" href="./index.html"/> + </menu> + <menu name="User"> <item name="Home" href="index.html"/> <item name="Usages" href="usages.html"/> @@ -99,26 +84,10 @@ </item> </menu> - <menu name="Downloads"> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - <menu ref="reports"/> <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' Modified: trunk/i18n-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/i18n-maven-plugin/src/site/site_fr.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/i18n-maven-plugin/src/site/site_fr.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -28,51 +28,36 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> - <links> +  <menu ref="parent"/> + <menu name="Language"> + <item name="Version Française" href="./index.html"/> + <item name="English Version" href="./en/index.html"/> + </menu> + <menu name="Utilisateur"> <item name="Introduction" href="index.html"/> <item name="Usages" href="usages.html"/> @@ -97,26 +82,10 @@ </item> </menu> - <menu name="Téléchargement"> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item - href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - <menu ref="reports"/> <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' Modified: trunk/nuiton-i18n/src/site/site_en.xml =================================================================== --- trunk/nuiton-i18n/src/site/site_en.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/nuiton-i18n/src/site/site_en.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -28,53 +28,38 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> - <links> +  <menu name="Project Parent"> - <item name="I18n" href="../../en/index.html"/> + <item name="I18n" href="../../en/index.html"/> </menu> + <menu name="Language"> + <item name="Version Française" href="../index.html"/> + <item name="English Version" href="./index.html"/> + </menu> + <menu name="User"> <item name="Home" href="index.html"/> </menu> @@ -95,10 +80,6 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' Modified: trunk/nuiton-i18n/src/site/site_fr.xml =================================================================== --- trunk/nuiton-i18n/src/site/site_fr.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/nuiton-i18n/src/site/site_fr.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -28,51 +28,36 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> + <href>./index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <body> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> - <links> +  <menu ref="parent"/> + <menu name="Language"> + <item name="Version Française" href="./index.html"/> + <item name="English Version" href="./en/index.html"/> + </menu> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> </menu> @@ -93,10 +78,6 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/src/site/apt/index.apt 2012-09-04 09:26:32 UTC (rev 1981) @@ -61,7 +61,7 @@ * Ajout d'un parseur pour les jsp de struts2 Ce nouveau parseur scan les fichier jsp et extrait toutes les clefs - contenues dans des attributs text name='xxx' ou label='xxx' ou %{getText("xxx". + contenues dans des attributs text name='xxx' ou label='xxx' ou %\{getText("xxx". Malheureusement il n'est pas possible de faire mieux que ça et il se peut alors de récupérer trop de clefs. Pour limiter cet effet indésirable il est Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/src/site/en/apt/index.apt 2012-09-04 09:26:32 UTC (rev 1981) @@ -62,7 +62,7 @@ * Add a struts2 jsp parser this new parseur scan jsp files to extract keys which match these forms: - text name='xxx' or label='xxx' or %{getText("xxx". + text name='xxx' or label='xxx' or %\{getText("xxx". Unfortunatly, we can't do better than this, and still we detects too much keys. To avoid this problem we had a new paramter (see next section) to restrict Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/src/site/site_en.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -39,14 +39,14 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -62,13 +62,22 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> <menu name="Language"> - <item name="French" href="../index.html"/> - <item name="English" href="index.html"/> + <item name="Version Française" href="../index.html"/> + <item name="English Version" href="./index.html"/> </menu> <links> @@ -96,20 +105,18 @@ <item name="Extend Initializer" href="extendInitializer.html"/> </menu> - <menu name="Modules"> + <menu ref="modules"/> + +  <menu ref="reports"/> <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-04 09:25:48 UTC (rev 1980) +++ trunk/src/site/site_fr.xml 2012-09-04 09:26:32 UTC (rev 1981) @@ -39,14 +39,14 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -62,6 +62,15 @@ <body> + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -70,13 +79,11 @@ <item name="nuiton.org" href="http://www.nuiton.org"/> <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> -  </links> <menu name="Langue"> - <item name="French" href="index.html"/> - <item name="English" href="./en/index.html"/> + <item name="Version Française" href="./index.html"/> + <item name="English Version" href="./en/index.html"/> </menu> <menu name="Utilisateur"> @@ -102,10 +109,6 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}'

1 0

r1980 - trunk
by tchemit＠users.nuiton.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 11:25:48 +0200 (Tue, 04 Sep 2012) New Revision: 1980 Url: http://nuiton.org/repositories/revision/i18n/1980 Log: fixes #2296: Updates to helper-m-p 1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 09:25:30 UTC (rev 1979) +++ trunk/pom.xml 2012-09-04 09:25:48 UTC (rev 1980) @@ -199,8 +199,7 @@ <projectId>i18n</projectId> <processorVersion>1.2.1</processorVersion> - <helperPluginVersion>1.4</helperPluginVersion> - +  <locales>fr,en</locales>

1 0

r1979 - trunk
by tchemit＠users.nuiton.org 04 Sep '12

04 Sep '12

Author: tchemit Date: 2012-09-04 11:25:30 +0200 (Tue, 04 Sep 2012) New Revision: 1979 Url: http://nuiton.org/repositories/revision/i18n/1979 Log: #2297: remove ant module from svn Removed: trunk/ant-i18n-task/

1 0

r1978 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:42:55 +0200 (Thu, 30 Aug 2012) New Revision: 1978 Url: http://nuiton.org/repositories/revision/i18n/1978 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-29 21:25:39 UTC (rev 1977) +++ trunk/pom.xml 2012-08-30 14:42:55 UTC (rev 1978) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.3.7</version> </parent> <artifactId>i18n</artifactId>

1 0

r1977 - in trunk: i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 23:25:39 +0200 (Wed, 29 Aug 2012) New Revision: 1977 Url: http://nuiton.org/repositories/revision/i18n/1977 Log: fixes #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/i18n-maven-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/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-08-29 21:25:39 UTC (rev 1977) @@ -147,7 +147,7 @@ /** * The definitive directory where to generate the bundles (includes the - * package of bunlde). + * package of bundle). * * @since 2.3.2 */ Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-08-29 21:25:39 UTC (rev 1977) @@ -25,6 +25,7 @@ package org.nuiton.i18n.plugin.bundle; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; @@ -39,18 +40,23 @@ import org.nuiton.io.SortedProperties; import org.nuiton.plugin.PluginHelper; +import java.io.BufferedWriter; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.Set; /** * Generate an aggregate i18n bundle for all dependencies of the project. @@ -88,6 +94,36 @@ protected boolean generateDefinitionFile; /** + * A flag to generate the i18n csv file wich contains all translation for + * all locales. + * <p/> + * Useful to translate from a language to another one. + * + * @since 2.5 + */ + @Parameter(property = "i18n.generateCsvFile", defaultValue = "false") + protected boolean generateCsvFile; + + /** + * Location of the csv file to generate if parameter + * {@link #generateCsvFile} is on. + * + * @since 2.5 + */ + @Parameter(property = "i18n.bundleCsvFile", + defaultValue = "${basedir}/target/${project.artifactId}-i18n.csv") + protected File bundleCsvFile; + + /** + * Char separator used when generating the csf bundle file if parameter + * {@link #generateCsvFile} is on. + * + * @since 2.5 + */ + @Parameter(property = "i18n.bundleCsvSeparator", defaultValue = "\t") + protected String bundleCsvSeparator; + + /** * Converter used to change format of bundles. * * @since 2.4 @@ -242,6 +278,11 @@ generateDefinitionFile(version, bundleDico); } + + if (generateCsvFile) { + generateCsvFile(); + } + if (!silent && verbose) { getLog().info("done in " + PluginHelper.convertTime(t00, System.nanoTime())); @@ -304,4 +345,69 @@ } } + /** + * Generates a csv file with all translations. + * <p/> + * First column is key, second is first locale translation, ... + * + * @throws IOException if any IO problem while the copy. + * @since 2.5 + */ + protected void generateCsvFile() throws IOException { + + if (!bundleCsvFile.exists()) { + createNewFile(bundleCsvFile); + } + + Set<String> allKeys = new HashSet<String>(); + Map<Locale, SortedProperties> bundlesByLocale = + new LinkedHashMap<Locale, SortedProperties>(); + for (Locale locale : locales) { + File bundleFile = getBundleFile(outputFolder, + bundleOutputName, + locale, + false + ); + + SortedProperties properties = new SortedProperties(bundleOutputEncoding); + properties.load(bundleFile); + for (Object o : properties.keySet()) { + allKeys.add((String) o); + } + bundlesByLocale.put(locale, properties); + } + List<String> keys = new ArrayList<String>(allKeys); + Collections.sort(keys); + + BufferedWriter writer = new BufferedWriter(new FileWriter(bundleCsvFile)); + try { + // add header line + StringBuilder builder = new StringBuilder("Key"); + for (Locale locale : locales) { + builder.append(bundleCsvSeparator).append(locale.getCountry()); + } + writer.write(builder.toString()); + + // for each key get all translations for all + for (String key : keys) { + writer.newLine(); + builder = new StringBuilder(key); + for (Locale locale : locales) { + SortedProperties properties = bundlesByLocale.get(locale); + Object value = properties.get(key); + builder.append(bundleCsvSeparator); + builder.append(value == null ? "" : value); + } + writer.write(builder.toString()); + } + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + + if (!isSilent()) { + getLog().info("Generate csv bundle file at " + bundleCsvFile); + } + } + } Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/src/site/apt/index.apt 2012-08-29 21:25:39 UTC (rev 1977) @@ -77,6 +77,16 @@ Cela permet de limiter les clefs entrantes (ce qui est nécessaire pour le parseur struts2...) +* Permettre de générer un fichier csv avec toutes les traductions d'un bundle + + Cela peut aider grandement à compléter les traduction à partir des + traductions complètes d'une langue. + + Pour utiliser cette fonctionnalité, il suffit d'ajouter à la ligne de + commande <-Di18n.generateCsvFile> lors de l'execution du mojo <bundle>. + + See {{{http://nuiton.org/issues/2291}Evolution #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo}}. + Quoi de neuf dans la version 2.4 * Meilleure utilisation des encodings Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/src/site/en/apt/index.apt 2012-08-29 21:25:39 UTC (rev 1977) @@ -75,6 +75,14 @@ This permits to limit incoming keys by a regex. +* Can generate a csv file from the generated bundle for all locales. + + This can help people to translate missing keys. + + To use this just add *-Di18n.generateCsvFile* on the bundle mojo. + + See {{{http://nuiton.org/issues/2291}Evolution #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo}}. + What's new in 2.4 version * Better usage of encodings @@ -109,14 +117,6 @@ another one, using a different syntax from the one used by translations will not work properly. -What's new in 2.5 version - -* Plugin module renamed to i18n-maven-plugin. - - the i18n maven plugin was renamed from <maven-i18n-plugin> to <i18n-maven-plugin>. - - Think to update your poms. - What's new in 2.3 version Version 2.3 improves a lot performance on detection of java file i18n keys

1 0

r1976 - in trunk/i18n-maven-plugin/src: main/java/org/nuiton/i18n/plugin/parser/impl test/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

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 {

1 0

r1975 - trunk/nuiton-i18n-editor
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:20:51 +0200 (Wed, 29 Aug 2012) New Revision: 1975 Url: http://nuiton.org/repositories/revision/i18n/1975 Log: use last stable of jaxx Modified: trunk/nuiton-i18n-editor/pom.xml Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2012-08-29 20:18:09 UTC (rev 1974) +++ trunk/nuiton-i18n-editor/pom.xml 2012-08-29 20:20:51 UTC (rev 1975) @@ -93,7 +93,7 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxxVersion>2.5.1-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.5</jaxxVersion> <nuitonUtilsVersion>1.2</nuitonUtilsVersion>

1 0

r1974 - trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:18:09 +0200 (Wed, 29 Aug 2012) New Revision: 1974 Url: http://nuiton.org/repositories/revision/i18n/1974 Log: refs #2290: Introduce a simple struts2 jsp parser Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.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:13:39 UTC (rev 1973) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:18:09 UTC (rev 1974) @@ -43,7 +43,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -132,14 +131,11 @@ /** * Pattern used to detect i18n keys. * - * @since 2.3 + * @since 2.5 */ protected final Pattern i18nPattern = - Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\""); + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:text\\s*name='|key=')(.*?)'"); - protected final Pattern i18nPattern2 = - Pattern.compile("(?:text\\s*name='|key=')(.*?)'"); - public Struts2JspFileParser(Log log, String encoding, SortedProperties oldParser, @@ -178,34 +174,17 @@ Matcher matcher = i18nPattern.matcher(line); - boolean match = false; while (matcher.find()) { - match = true; String key = matcher.group(1); + if (key == null) { + key = matcher.group(2); + } if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } // register key registerKey(key); } - - if (!match) { - - // try with second pattern - matcher = i18nPattern2.matcher(line); - - while (matcher.find()) { - String key = matcher.group(1); - if (getLog().isDebugEnabled()) { - getLog().debug(file.getName() + " detected key = " + key); - } -// // one key found in file, so file is marked as touched -// setTouched(true); - - // register key - registerKey(key); - } - } } }

1 0

r1973 - in trunk/src/site: apt en/apt
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:13:39 +0200 (Wed, 29 Aug 2012) New Revision: 1973 Url: http://nuiton.org/repositories/revision/i18n/1973 Log: complete 2.5 doc Modified: trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-08-29 19:51:09 UTC (rev 1972) +++ trunk/src/site/apt/index.apt 2012-08-29 20:13:39 UTC (rev 1973) @@ -58,7 +58,25 @@ Pensez à mettre à jour vos pom. +* Ajout d'un parseur pour les jsp de struts2 + Ce nouveau parseur scan les fichier jsp et extrait toutes les clefs + contenues dans des attributs text name='xxx' ou label='xxx' ou %{getText("xxx". + + Malheureusement il n'est pas possible de faire mieux que ça et il se peut + alors de récupérer trop de clefs. Pour limiter cet effet indésirable il est + possible d'utiliser le nouveau paramètre <acceptKeyformat> qui permet de + limiter les clefs remontées. + + De toute manière il ne faut pas oublier qu'une bnne pratique est de toujours + utiliser un prefixe commun à toutes les clefs de traduction (donc le pattern + doit rester simple à écrire). + +* Ajout d'un paramètre <acceptKeyFormat> sur les goals de type parser + + Cela permet de limiter les clefs entrantes (ce qui est nécessaire pour le + parseur struts2...) + Quoi de neuf dans la version 2.4 * Meilleure utilisation des encodings Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2012-08-29 19:51:09 UTC (rev 1972) +++ trunk/src/site/en/apt/index.apt 2012-08-29 20:13:39 UTC (rev 1973) @@ -51,6 +51,30 @@ - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} +What's new in 2.5 version + +* Plugin was renamed to i18n-maven-plugin. + + the plugin was renamed from <maven-i18n-plugin> to <i18n-maven-plugin>. + + think to update your poms. + +* Add a struts2 jsp parser + + this new parseur scan jsp files to extract keys which match these forms: + text name='xxx' or label='xxx' or %{getText("xxx". + + Unfortunatly, we can't do better than this, and still we detects too much keys. + To avoid this problem we had a new paramter (see next section) to restrict + accepted incoming keys. + + anyway, always keep in mind that a good pratice is to use a common i18n + prefix for all your keys, so the pattern should not be so harde to write ;) + +* Add a new parameter <acceptKeyFormat> on parser-like goals + + This permits to limit incoming keys by a regex. + What's new in 2.4 version * Better usage of encodings

1 0

r1972 - trunk/i18n-maven-plugin
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 21:51:09 +0200 (Wed, 29 Aug 2012) New Revision: 1972 Url: http://nuiton.org/repositories/revision/i18n/1972 Log: fix dependencies Modified: trunk/i18n-maven-plugin/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-08-29 19:38:52 UTC (rev 1971) +++ trunk/i18n-maven-plugin/pom.xml 2012-08-29 19:51:09 UTC (rev 1972) @@ -101,6 +101,20 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> + <exclusions> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> + </exclusion> + </exclusions> </dependency>

1 0