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

r1948 - trunk
by tchemit＠users.nuiton.org 19 Aug '11

19 Aug '11

Author: tchemit Date: 2011-08-19 18:29:00 +0200 (Fri, 19 Aug 2011) New Revision: 1948 Url: http://nuiton.org/repositories/revision/i18n/1948 Log: Update mavenpom4redmineAndCentral to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 05:32:34 UTC (rev 1947) +++ trunk/pom.xml 2011-08-19 16:29:00 UTC (rev 1948) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <artifactId>i18n</artifactId>

1 0

r1947 - trunk/maven-i18n-plugin/src/license
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 07:32:34 +0200 (Thu, 18 Aug 2011) New Revision: 1947 Url: http://nuiton.org/repositories/revision/i18n/1947 Log: update third-parties Modified: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties Modified: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 2011-08-16 23:11:34 UTC (rev 1946) +++ trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 2011-08-18 05:32:34 UTC (rev 1947) @@ -1,9 +1,14 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - The Apache Software License, Version 2.0 # - http://classworlds.codehaus.org/license.html @@ -11,6 +16,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 11:21:03 CET 2010 -classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:31:47 CEST 2011 +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0

1 0

r1946 - trunk
by tchemit＠users.nuiton.org 16 Aug '11

16 Aug '11

Author: tchemit Date: 2011-08-17 01:11:34 +0200 (Wed, 17 Aug 2011) New Revision: 1946 Url: http://nuiton.org/repositories/revision/i18n/1946 Log: Update mavenpom4redmineAndCentral to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:12:08 UTC (rev 1945) +++ trunk/pom.xml 2011-08-16 23:11:34 UTC (rev 1946) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1945 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:12:08 +0200 (Thu, 04 Aug 2011) New Revision: 1945 Url: http://nuiton.org/repositories/revision/i18n/1945 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-08-04 15:12:07 UTC (rev 1944) +++ trunk/ant-i18n-task/pom.xml 2011-08-04 15:12:08 UTC (rev 1945) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-08-04 15:12:07 UTC (rev 1944) +++ trunk/maven-i18n-plugin/pom.xml 2011-08-04 15:12:08 UTC (rev 1945) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-08-04 15:12:07 UTC (rev 1944) +++ trunk/nuiton-i18n/pom.xml 2011-08-04 15:12:08 UTC (rev 1945) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 15:12:07 UTC (rev 1944) +++ trunk/pom.xml 2011-08-04 15:12:08 UTC (rev 1945) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <modules> <module>nuiton-i18n</module> @@ -201,11 +201,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.4.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.4.1 + scm:svn:http://svn.nuiton.org/svn/i18n/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.4.1</url> + <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> <profiles>

1 0

r1944 - tags
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:12:07 +0200 (Thu, 04 Aug 2011) New Revision: 1944 Url: http://nuiton.org/repositories/revision/i18n/1944 Log: [maven-release-plugin] copy for tag i18n-2.4.1 Added: tags/i18n-2.4.1/

1 0

r1943 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: hudson Date: 2011-08-04 17:12:06 +0200 (Thu, 04 Aug 2011) New Revision: 1943 Url: http://nuiton.org/repositories/revision/i18n/1943 Log: [maven-release-plugin] prepare release i18n-2.4.1 Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-08-04 13:00:47 UTC (rev 1942) +++ trunk/ant-i18n-task/pom.xml 2011-08-04 15:12:06 UTC (rev 1943) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-08-04 13:00:47 UTC (rev 1942) +++ trunk/maven-i18n-plugin/pom.xml 2011-08-04 15:12:06 UTC (rev 1943) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-08-04 13:00:47 UTC (rev 1942) +++ trunk/nuiton-i18n/pom.xml 2011-08-04 15:12:06 UTC (rev 1943) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 13:00:47 UTC (rev 1942) +++ trunk/pom.xml 2011-08-04 15:12:06 UTC (rev 1943) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <modules> <module>nuiton-i18n</module> @@ -201,11 +201,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.4.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/trunk + scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.4.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> + <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.4.1</url> </scm> <profiles>

1 0

r1942 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 15:00:47 +0200 (Thu, 04 Aug 2011) New Revision: 1942 Url: http://nuiton.org/repositories/revision/i18n/1942 Log: do NOT rewrite user already existing files Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-08-04 11:40:26 UTC (rev 1941) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-08-04 13:00:47 UTC (rev 1942) @@ -212,7 +212,9 @@ if (log.isDebugEnabled()) { log.debug("Keep user file " + dst); } + continue; } + if (log.isInfoEnabled()) { log.info("Create user file to create : " + dst); }

1 0

r1941 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 13:40:26 +0200 (Thu, 04 Aug 2011) New Revision: 1941 Url: http://nuiton.org/repositories/revision/i18n/1941 Log: Evolution #1656: UserInitializer should always try to copy files Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-08-04 09:50:59 UTC (rev 1940) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-08-04 11:40:26 UTC (rev 1941) @@ -28,10 +28,10 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.format.I18nMessageFormatter; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; +import org.nuiton.i18n.format.I18nMessageFormatter; import java.io.File; import java.io.FileOutputStream; @@ -125,26 +125,26 @@ boolean isNew = !directory.exists(); - if (isNew) { + // creates the user directory and fill it with i18n resources + // coming from default initializer + createUserI18nLayout(directory); - // creates the user directory and fill it with i18n resources - // coming from default initializer - createUserI18nLayout(directory); - } - // use a new classloader directly on the directory setLoader(new URLClassLoader(new URL[]{directory.toURI().toURL()})); + // now can grab bundles from the user external directory I18nBundle[] bundles = super.resolvBundles(); if (!isNew) { + + // will update directory if required updateUserI18nLayout(directory, bundles); } return bundles; } /** - * Creates the user i18n structure. + * Creates the user i18n structure or fill it if required. * <p/> * will use the default initializer to obtain i18n resources from default * system, then copy them to the user directory. @@ -154,10 +154,9 @@ */ protected void createUserI18nLayout(File directory) throws Exception { - // user i18n directory does not exists - // create it and fill it - - boolean b = directory.mkdirs(); + // if user i18n directory does not exists create it + // Then fill it (if files not exists) + boolean b = directory.exists() || directory.mkdirs(); if (!b) { throw new IOException("could not create directory " + directory); } @@ -170,13 +169,18 @@ File f = new File(directory, filename); - FileOutputStream outStream = new FileOutputStream(f); - try { + FileOutputStream outStream; + + if (!f.exists()) { + outStream = new FileOutputStream(f); + try { - definition.store(outStream, "Generated by " + getClass().getName()); - } finally { + definition.store(outStream, + "Generated by " + getClass().getName()); + } finally { - outStream.close(); + outStream.close(); + } } // detect bundles urls @@ -203,6 +207,12 @@ File dst = new File(directory, name); + if (dst.exists()) { + + if (log.isDebugEnabled()) { + log.debug("Keep user file " + dst); + } + } if (log.isInfoEnabled()) { log.info("Create user file to create : " + dst); } @@ -220,7 +230,7 @@ /** * Hook to update the user i18n structure. * <p/> - * If you wants to do something specific, overrides this method. + * If you wants to do something specific, overriddes this method. * * @param directory the user directory where are i18n resources * @param bundles the user i18n bundles

1 0

r1940 - trunk
by tchemit＠users.nuiton.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 11:50:59 +0200 (Thu, 04 Aug 2011) New Revision: 1940 Url: http://nuiton.org/repositories/revision/i18n/1940 Log: Update mavenpom4redmineAndCentral to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-03 08:22:46 UTC (rev 1939) +++ trunk/pom.xml 2011-08-04 09:50:59 UTC (rev 1940) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <artifactId>i18n</artifactId>

1 0

r1939 - in trunk/nuiton-i18n/src: main/java/org/nuiton/i18n test/java/org/nuiton/i18n
by athimel＠users.nuiton.org 03 Aug '11

03 Aug '11

Author: athimel Date: 2011-08-03 10:22:46 +0200 (Wed, 03 Aug 2011) New Revision: 1939 Url: http://nuiton.org/repositories/revision/i18n/1939 Log: Prevent case when result is null Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-08-03 07:27:28 UTC (rev 1938) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-08-03 08:22:46 UTC (rev 1939) @@ -276,7 +276,10 @@ // } try { - return applyFilter(messageFormatter.format(locale, result, args)); + if (result != null) { + result = applyFilter(messageFormatter.format(locale, result, args)); + } + return result; } catch (Exception eee) { try { return applyFilter(messageFormatter.format(locale, message, args)); Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-08-03 07:27:28 UTC (rev 1938) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-08-03 08:22:46 UTC (rev 1939) @@ -243,6 +243,9 @@ text = I18n._(key); Assert.assertNull(text); + + text = I18n._(key, 123); + Assert.assertNull(text); } @Test

1 0