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

r1851 - in trunk/nuiton-i18n/src: main/java/org/nuiton/i18n test/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 16:17:58 +0100 (Thu, 20 Jan 2011) New Revision: 1851 Url: http://nuiton.org/repositories/revision/i18n/1851 Log: init the store in not already done + add test for it Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-01-20 13:55:29 UTC (rev 1850) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-01-20 15:17:58 UTC (rev 1851) @@ -207,6 +207,11 @@ } if (result == null) { + if (!isInit()) { + + // always init the store + init(); + } result = addLanguage(locale); } else { if (log.isDebugEnabled()) { Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-20 13:55:29 UTC (rev 1850) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-20 15:17:58 UTC (rev 1851) @@ -24,6 +24,7 @@ */ package org.nuiton.i18n; +import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -47,6 +48,11 @@ ); } + @After + public void after() throws Exception { + I18n.close(); + } + @AfterClass public static void afterClass() throws Exception { I18n.setInitializer(null); @@ -54,6 +60,20 @@ } @Test + public void testWithNoInit() { + + String actual; + String expected; + + actual = I18n._("key.with.param"); + Assert.assertNotNull(actual); + + expected = "Clef avec %s"; + actual = I18n.l_(Locale.FRANCE, "key.with.param"); + Assert.assertEquals(expected, actual); + } + + @Test public void testSimple() { String expected;

1 0

r1850 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 14:55:29 +0100 (Thu, 20 Jan 2011) New Revision: 1850 Url: http://nuiton.org/repositories/revision/i18n/1850 Log: make finally works I18n with all the lazy stuff... Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.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-01-20 10:56:19 UTC (rev 1849) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-20 13:55:29 UTC (rev 1850) @@ -74,6 +74,8 @@ /** Filtre a appliquer avant de retourner les chaines */ protected static I18nFilter filter; + public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; + /** * Sets the initializer to use to init the I18n system. * @@ -119,6 +121,7 @@ */ public static void init(Locale locale) { if (locale == null) { + // use default locale locale = I18nUtil.newLocale(null, null); } @@ -130,7 +133,7 @@ /** * Retourne la chaine traduite si possible dans la locale demandée. * - * @param locale la locale dans lequel on souhaite la traduction + * @param locale la locale dans lequel on souhaite la traduction * @param message la chaine a traduire * @return la traduction si possible ou la chaine passee en parametre * sinon. @@ -143,7 +146,7 @@ return null; } - I18nLanguage language = getStore().getLanguage(locale); + I18nLanguage language = getLanguage(locale); String result = message; if (language != null) { result = language.translate(message); @@ -169,7 +172,7 @@ return null; } - I18nLanguage language = getStore().getLanguage(locale); + I18nLanguage language = getLanguage(locale); String result = message; if (language != null) { result = language.translate(message); @@ -198,7 +201,16 @@ * sinon. */ public static String _(String message) { + + // if the key to translate is null, just return null + if (message == null) { + return null; + } + + // get current locale (from the language in the store) Locale locale = getCurrentLanguage().getLocale(); + + // translate with this locale String result = l_(locale, message); return result; } @@ -213,7 +225,16 @@ * sinon. */ public static String _(String message, Object... args) { + + // if the key to translate is null, just return null + if (message == null) { + return null; + } + + // get current locale (from the language in the store) Locale locale = getCurrentLanguage().getLocale(); + + // translate with this locale String result = l_(locale, message, args); return result; } @@ -288,11 +309,17 @@ } } + /** + * Get the i18n initializer. + * + * If no one was specified, then use the {@link ClassPathI18nInitializer}. + * + * @return the i81n initializer to used to init system + */ public static I18nInitializer getInitializer() { if (initializer == null) { initializer = new ClassPathI18nInitializer(); } - return initializer; } @@ -304,7 +331,6 @@ * @return the instanciated i18n store */ public static I18nStore getStore() { - if (store == null) { store = new I18nStore(DEFAULT_LOCALE, getInitializer()); } @@ -326,14 +352,60 @@ } /** - * @return the current language of the store, or {@code null} if store is + * Obtain the registred language from the store. + * + * If no language were registred in the store, then use the language + * with the default locale of the store. + * + * @return the current language of the store, or the default one if store is * not init. */ protected static I18nLanguage getCurrentLanguage() { - I18nLanguage language = getStore().getLanguage(); +// I18nLanguage language = getStore().getLanguage(); + I18nLanguage language = getLanguage(null); return language; } + /** + * Obtain the language for the given {@code locale}. + * + * If locale is {@code null}, it means we wants to use the language + * registred in the store. + * + * As a fallback if this language is not defined, we use the language of + * the default locale of the store. + * + * @param locale the required locale or {@code null} if we wants to use the + * one from the store + * @return the language associated with the given locale. + * @since 2.1 + */ + protected static I18nLanguage getLanguage(Locale locale) { + I18nLanguage language; + if (locale == null) { + + // default locale required : means wants the one of the store + + language = getStore().getLanguage(); + + if (language == null) { + + // store was not initialized + + // use the default locale of the store + locale = getStore().getDefaultLocale(); + + // get the language for this default locale + language = getStore().getLanguage(locale); + } + } else { + + // get the given language from the store + language = getStore().getLanguage(locale); + } + return language; + } + protected static I18nFilter getFilter() { return filter; }

1 0

r1849 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 11:56:19 +0100 (Thu, 20 Jan 2011) New Revision: 1849 Url: http://nuiton.org/repositories/revision/i18n/1849 Log: fix lazy instanciation Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.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-01-20 07:33:24 UTC (rev 1848) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-20 10:56:19 UTC (rev 1849) @@ -330,7 +330,7 @@ * not init. */ protected static I18nLanguage getCurrentLanguage() { - I18nLanguage language = store == null ? null : store.getLanguage(); + I18nLanguage language = getStore().getLanguage(); return language; }

1 0

r1848 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 08:33:24 +0100 (Thu, 20 Jan 2011) New Revision: 1848 Url: http://nuiton.org/repositories/revision/i18n/1848 Log: Evolution #1213: Updates to processor 1.1 (use his new api) Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2011-01-20 07:25:14 UTC (rev 1847) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2011-01-20 07:33:24 UTC (rev 1848) @@ -34,6 +34,7 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.io.SortedProperties; +import org.nuiton.processor.ProcessorUtil; import java.io.File; import java.io.FileInputStream; @@ -252,20 +253,20 @@ */ public static class GWTJavaProcessor extends ProcessorHelper.AbstractParserProcessor { - protected ProcessorHelper.KeyExtractor filter1 = - new ProcessorHelper.KeyExtractor( + protected ProcessorUtil.FragmentExtractor filter1 = + new ProcessorUtil.FragmentExtractor( "@Key(\"", "\")" ); - protected ProcessorHelper.KeyExtractor filter2 = - new ProcessorHelper.KeyExtractor( + protected ProcessorUtil.FragmentExtractor filter2 = + new ProcessorUtil.FragmentExtractor( "@LocalizableResource.Key(\"", "\")" ); - protected ProcessorHelper.KeyExtractor filter3 = - new ProcessorHelper.KeyExtractor( + protected ProcessorUtil.FragmentExtractor filter3 = + new ProcessorUtil.FragmentExtractor( "@com.google.gwt.i18n.client.LocalizableResource.Key(\"", "\")" ); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-20 07:25:14 UTC (rev 1847) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-20 07:33:24 UTC (rev 1848) @@ -184,12 +184,17 @@ } } + /** + * Pour filtrer les clefs i18n dans un fichier java. + * + * @since 2.1 + */ public static class I18nFilter extends DefaultFilter { /** Instance logger */ private final Log log; -// private String header = "_\$\\s*\""; + // private String header = "_\\(\\s*\""; private String header = "^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\""; private String footer = "\"\\s*(\$|,|\\+|$)"; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-20 07:25:14 UTC (rev 1847) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-20 07:33:24 UTC (rev 1848) @@ -34,6 +34,7 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.io.SortedProperties; +import org.nuiton.processor.ProcessorUtil; import java.io.File; import java.io.FileInputStream; @@ -256,14 +257,14 @@ "-" + "-" + ">" ); - protected ProcessorHelper.KeyExtractor extractor1 = - new ProcessorHelper.KeyExtractor( + protected ProcessorUtil.FragmentExtractor extractor1 = + new ProcessorUtil.FragmentExtractor( "$" + "{" + "m" + "e" + "s" + "s" + "a" + "g" + "e" + ":", "}" ); - protected ProcessorHelper.KeyExtractor extractor2 = - new ProcessorHelper.KeyExtractor( + protected ProcessorUtil.FragmentExtractor extractor2 = + new ProcessorUtil.FragmentExtractor( "$" + "{" + "f" + "o" + "r" + "m" + "a" + "t" + ":", "}") { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2011-01-20 07:25:14 UTC (rev 1847) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2011-01-20 07:33:24 UTC (rev 1848) @@ -30,16 +30,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.processor.Processor; import org.nuiton.processor.ProcessorUtil; -import org.nuiton.processor.filters.DefaultFilter; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -85,7 +82,7 @@ doProcess(this, filein, fileout, encoding); } - public void extractKeys(KeyExtractor filter, + public void extractKeys(FragmentExtractor filter, File filein, String encoding, boolean verbose, @@ -127,141 +124,4 @@ } } - /** - * To extract all content inside the header and footer. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.1 - */ - public static class KeyExtractor extends DefaultFilter { - - /** Logger. */ - static protected final Log log = - LogFactory.getLog(KeyExtractor.class); - - protected String header; - - protected String footer; - - protected boolean verbose; - - public KeyExtractor(String header, String footer) { - this.header = header; - this.footer = footer; - } - - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - @Override - protected String performInFilter(String ch) { - if (verbose) { - log.info("Detected key " + ch); - } - return ch + "\n"; - } - - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - } - - /** - * To remove all content inside the header and footer. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.1 - */ - public static class FragmentRemover extends DefaultFilter { - - /** Logger. */ - static private final Log log = - LogFactory.getLog(FragmentRemover.class); - - protected String header; - - protected String footer; - - protected boolean verbose; - - public FragmentRemover(String header, String footer) { - this.header = header; - this.footer = footer; - } - - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - @Override - protected String performInFilter(String ch) { - if (verbose) { - log.info("Will remove " + ch); - } - return EMPTY_STRING; - } - - @Override - protected String performOutFilter(String ch) { - return ch; - } - - @Override - protected String getHeader() { - return header; - } - - @Override - protected String getFooter() { - return footer; - } - } - - /** - * Launch the process of the given {@code processor} to the given streams. - * - * @param processor the processor to launch - * @param in the input file - * @param out the output file - * @param encoding encoding to use to read and write files. - * @throws IOException if any problems while processing file - * @since 2.1 remove this when will use processor >= 1.1 - */ - public static void doProcess(Processor processor, - InputStream in, - OutputStream out, - String encoding) throws IOException { - InputStreamReader input = new InputStreamReader(in, encoding); - try { - OutputStreamWriter output = new OutputStreamWriter(out, encoding); - try { - processor.process(input, output); - } catch (IOException eee) { - if (log.isErrorEnabled()) { - log.error( - "Error while processing file " + in + " to " + out + - " with processor " + processor, eee); - } - throw eee; - } finally { - output.close(); - } - } finally { - input.close(); - } - } - - }

1 0

r1847 - trunk
by tchemit＠users.nuiton.org 20 Jan '11

20 Jan '11

Author: tchemit Date: 2011-01-20 08:25:14 +0100 (Thu, 20 Jan 2011) New Revision: 1847 Url: http://nuiton.org/repositories/revision/i18n/1847 Log: Evolution #1213: Updates to processor 1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-19 22:03:16 UTC (rev 1846) +++ trunk/pom.xml 2011-01-20 07:25:14 UTC (rev 1847) @@ -187,7 +187,7 @@  <projectId>i18n</projectId> - <processorVersion>1.0.4</processorVersion> + <processorVersion>1.1-SNAPSHOT</processorVersion>  <locales>fr,en</locales>

1 0

r1846 - trunk/nuiton-i18n/src/test/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: tchemit Date: 2011-01-19 23:03:16 +0100 (Wed, 19 Jan 2011) New Revision: 1846 Url: http://nuiton.org/repositories/revision/i18n/1846 Log: add license header Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-19 22:02:10 UTC (rev 1845) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-19 22:03:16 UTC (rev 1846) @@ -1,3 +1,27 @@ +/* + * #%L + * I18n :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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% + */ package org.nuiton.i18n; import org.junit.AfterClass;

1 0

r1845 - trunk/nuiton-i18n/src/test/java/org/nuiton/i18n
by tchemit＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: tchemit Date: 2011-01-19 23:02:10 +0100 (Wed, 19 Jan 2011) New Revision: 1845 Url: http://nuiton.org/repositories/revision/i18n/1845 Log: fix svn-keywords Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Property changes on: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r1844 - in trunk/nuiton-i18n/src: main/java/org/nuiton/i18n main/java/org/nuiton/i18n/bundle main/java/org/nuiton/i18n/init main/java/org/nuiton/util test/java/org/nuiton/i18n test/java/org/nuiton/util test/java/org/nuiton/util/converter test/resources/META-INF
by tchemit＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: tchemit Date: 2011-01-19 22:38:53 +0100 (Wed, 19 Jan 2011) New Revision: 1844 Url: http://nuiton.org/repositories/revision/i18n/1844 Log: Evolution #1210: Remove deprecated api Evolution #1208: Be able to force locale for translation (add some tests) Added: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/ trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java Removed: trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -128,12 +128,13 @@ } /** - * Retourne la chaine traduite si possible. + * Retourne la chaine traduite si possible dans la locale demandée. * * @param locale la locale dans lequel on souhaite la traduction * @param message la chaine a traduire * @return la traduction si possible ou la chaine passee en parametre * sinon. + * @since 2.1 */ public static String l_(Locale locale, String message) { @@ -150,14 +151,16 @@ return applyFilter(result); } - /** - * Retourne la chaine traduite si possible. + /** + * Retourne la chaine traduite si possible dans la locale demandée. * + * @param locale la locale dans lequel on souhaite la traduction * @param message message formate avec la meme syntaxe que {@link * String#format} * @param args les parametres pour le message. * @return la traduction si possible ou la chaine passee en parametre * sinon. + * @since 2.1 */ public static String l_(Locale locale, String message, Object... args) { @@ -273,7 +276,7 @@ } /** - * close i18n caches, says the store if exists + * Close i18n caches, says the store if exists. * * This method should be called to reset all caches (languages, * bundles,...) @@ -335,49 +338,4 @@ return filter; } - /** - * @return the current store - * @deprecated since 1.1, only keep for compatibility - */ - @Deprecated - public static I18nStore getLoader() { - return getStore(); - } - - /** - * Parse a list of {@link Locale} seperated by comma. - * - * Example : fr_FR,en_GB - * - * @param str the string representation of locale separated by comma - * @return list of available locales - * @throws IllegalArgumentException ia a locale is not valid - * @deprecated since 1.1, prefer use the {@link I18nUtil#parseLocales(String)} - */ - @Deprecated - public static Locale[] parseLocales(String str) - throws IllegalArgumentException { - return I18nUtil.parseLocales(str); - } - - /** - * @param str the text representation of the locale - * @return the locale, or default locale if could not parse the given one - * @deprecated since 1.1, prefer use the {@link I18nUtil#newLocale(String)} - */ - @Deprecated - public static Locale newLocale(String str) { - return I18nUtil.newLocale(str); - } - - /** - * @param language the language of the locale - * @param country the country of the locale - * @return the required locale - * @deprecated since 1.1, prefer use the {@link I18nUtil#newLocale(String,String)} - */ - @Deprecated - public static Locale newLocale(String language, String country) { - return I18nUtil.newLocale(language, country); - } } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -23,7 +23,7 @@ * #L% */ -/* * +/** * i18nFilter.java * * Created: 2 déc. 2003 Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -158,7 +158,7 @@ } I18nLanguage result = getLanguage(locale); language = result; - //TC-20090702 the selected langue is the default locale, usefull for + //TC-20090702 the selected language is the default locale, usefull for // objects dealing with the default locale (swing widgets,...) Locale.setDefault(locale); } @@ -166,7 +166,7 @@ /** * Close store and release cache ofg language. * - * Current language will be also clean. + * Current language will be also cleaned. */ protected void close() { if (languages != null) { @@ -186,8 +186,14 @@ } /** + * Recherche un object de type {@link I18nLanguage} pour la locale donnée + * en paramètre dans le cache des langues chargées ({@link #languages}). + * + * Si un tel objet n'existe pas, alors on en crée un et on le place dans le + * cache. + * * @param locale la locale du language recherche - * @return le language trouve dans le cache, ou null. + * @return le language trouve dans le cache. */ protected I18nLanguage getLanguage(Locale locale) { I18nLanguage result = null; @@ -208,7 +214,6 @@ } } - return result; } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -61,13 +61,6 @@ public static final String DIRECTORY_SEARCH_BUNDLE_PATTERN = "i18n"; - /** - * @deprecated since 2.0, this is not compatible with os, so do not used it - * any more. - */ - @Deprecated - public static final String SEARCH_BUNDLE_PATTERN = ".*i18n/.+\\.properties"; - private static final I18nBundleEntry[] EMPTY_I18N_BUNDLE_ENTRYS_ARRAY = new I18nBundleEntry[0]; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -116,12 +116,11 @@ @Override public I18nBundle[] resolvBundles() throws Exception { - // detect bundles urls + // detect bundles urls URL[] urls = resolvURLs(); // detect bundles - I18nBundle[] result = resolvBundles(urls); return result; } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -162,10 +162,9 @@ return definitionURL; } -// @Override + public URL[] resolvURLs(String prefixURL, + Properties definition) throws Exception { - public URL[] resolvURLs(String prefixURL, Properties definition) throws Exception { - // get locales from properties String localesAsStr = definition.getProperty(BUNDLE_DEF_LOCALES); @@ -206,11 +205,9 @@ String prefixURL = resolvDefinition(definition); // detect bundles urls - URL[] urls = resolvURLs(prefixURL, definition); // detect bundles - I18nBundle[] result = resolvBundles(urls); return result; } 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-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -158,20 +158,16 @@ } // detect bundles urls - URL[] urls = resolvURLs(prefixURL, definition); // detect bundles - I18nBundle[] bundles = resolvBundles(urls); // detect bundles entries - I18nBundleEntry[] entries = I18nBundleUtil.getBundleEntries(bundles); // copy all bundle entries resource - for (I18nBundleEntry e : entries) { URL url = e.getPath(); @@ -190,8 +186,7 @@ log.info("Create user file to create : " + dst); } - // recopie du fichier - + // copy file outStream = new FileOutputStream(dst); try { IOUtils.copy(url.openStream(), outStream); Deleted: trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -1,149 +0,0 @@ -/* - * #%L - * I18n :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 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% - */ - -package org.nuiton.util; - -import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.beanutils.Converter; -import static org.apache.commons.logging.LogFactory.getLog; - -import org.apache.commons.logging.Log; -import org.nuiton.i18n.CountryEnum; -import org.nuiton.i18n.LanguageEnum; - -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * classe pour convertir une chaine en un objet {@link Locale}. - * - * @author tchemit <chemit(a)codelutin.com> - * @deprecated since 2.0.1, use the {@link org.nuiton.util.converter.LocaleConverter} instead - */ -@Deprecated -public class LocaleConverter implements Converter { - - private static final Pattern FULL_SCOPE_PATTERN = - Pattern.compile("([a-zA-Z]{2})_([a-zA-Z]{2})"); - - private static final Pattern MEDIUM_SCOPE_PATTERN = - Pattern.compile("([a-zA-Z]{2})"); - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static Log log = getLog(LocaleConverter.class); - - @Override - public Object convert(Class aClass, Object value) { - if (value == null) { - throw new ConversionException("can not convert null value in " + - this + " convertor"); - } - if (isEnabled(aClass)) { - Object result; - if (isEnabled(value.getClass())) { - result = value; - return result; - } - if (value instanceof String) { - result = valueOf(((String) value).trim()); - return result; - } - } - throw new ConversionException( - "could not find a convertor for type " + aClass.getName() + - " and value : " + value); - } - - public Locale valueOf(String value) { - try { - Locale result = convertFullScope(value); - - if (result == null) { - result = convertMediumScope(value); - } - - if (result == null) { - throw new ConversionException("could not convert locale " + - value); - } - - return result; - } catch (Exception e) { - throw new ConversionException("could not convert locale " + value + - " for reason " + e.getMessage()); - } - } - - private Locale convertFullScope(String value) { - Matcher m = FULL_SCOPE_PATTERN.matcher(value); - if (m.matches()) { - // found a full scope pattern (language + country) - LanguageEnum language = - LanguageEnum.valueOf(m.group(1).toLowerCase()); - CountryEnum country = CountryEnum.valueOf(m.group(2).toUpperCase()); - if (language == null || country == null) { - // not safe - throw new ConversionException("could not convert locale " + - value); - } - return new Locale(language.name(), country.name()); - } - return null; - } - - private Locale convertMediumScope(String value) { - Matcher m = MEDIUM_SCOPE_PATTERN.matcher(value); - if (m.matches()) { - // found a medium scope pattern (only language) - LanguageEnum language = - LanguageEnum.valueOf(m.group(1).toLowerCase()); - - if (language == null) { - // not safe - throw new ConversionException("could not convert locale " + - value); - } - return new Locale(language.name()); - } - return null; - } - - - public LocaleConverter() { - if (log.isDebugEnabled()) { - log.debug(this); - } - } - - protected boolean isEnabled(Class<?> aClass) { - return Locale.class.equals(aClass); - } - - public Class<?> getType() { - return Locale.class; - } - -} Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -51,7 +51,7 @@ I18nStore store; @BeforeClass - public static void beforeClass() throws MalformedURLException { + public static void beforeClass() { I18n.setInitializer( new DefaultI18nInitializer(I18nStoreTest.class.getSimpleName()) ); Added: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java (rev 0) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -0,0 +1,113 @@ +package org.nuiton.i18n; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +import java.util.Locale; + +/** + * Test the class {@link I18n}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +public class I18nTest { + + @BeforeClass + public static void beforeClass() { + I18n.setInitializer( + new DefaultI18nInitializer(I18nStoreTest.class.getSimpleName()) + ); + } + + @AfterClass + public static void afterClass() throws Exception { + I18n.setInitializer(null); + I18n.close(); + } + + @Test + public void testSimple() { + + String expected; + String actual; + + // passage en français + + I18n.getStore().setLanguage(Locale.FRANCE); + + expected = "Clef avec %s"; + actual = I18n._("key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "Clef avec param"; + actual = I18n._("key.with.param", "param"); + Assert.assertEquals(expected, actual); + + // passage en anglais + + I18n.getStore().setLanguage(Locale.UK); + + expected = "Key with %s"; + actual = I18n._("key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "Key with param"; + actual = I18n._("key.with.param", "param"); + Assert.assertEquals(expected, actual); + + // passage langue inconnue + + I18n.getStore().setLanguage(Locale.CHINA); + + expected = "key.with.param"; + actual = I18n._("key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "key.with.param"; + actual = I18n._("key.with.param", "param"); + Assert.assertEquals(expected, actual); + } + + @Test + public void testMultiLanguage() { + + String expected; + String actual; + + // en français + + expected = "Clef avec %s"; + actual = I18n.l_(Locale.FRANCE, "key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "Clef avec param"; + actual = I18n.l_(Locale.FRANCE, "key.with.param", "param"); + Assert.assertEquals(expected, actual); + + // en anglais + + I18n.getStore().setLanguage(Locale.UK); + + expected = "Key with %s"; + actual = I18n.l_(Locale.UK, "key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "Key with param"; + actual = I18n.l_(Locale.UK, "key.with.param", "param"); + Assert.assertEquals(expected, actual); + + // dans une langue inconnue + + expected = "key.with.param"; + actual = I18n.l_(Locale.CHINA, "key.with.param"); + Assert.assertEquals(expected, actual); + + expected = "key.with.param"; + actual = I18n.l_(Locale.CHINA, "key.with.param", "param"); + Assert.assertEquals(expected, actual); + } +} Property changes on: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -1,137 +0,0 @@ -/* - * #%L - * I18n :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 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% - */ - -package org.nuiton.util; - -import junit.framework.TestCase; -import org.apache.commons.beanutils.Converter; - -import java.util.Locale; - -/** - * Tests {@link LocaleConverter}. - * - * @author tchemit <chemit(a)codelutin.com> - */ -public class LocaleConverterTest extends TestCase { - - String toConvert; - - Locale excepted; - - Converter converter; - - @Override - protected void setUp() throws Exception { - super.setUp(); - converter = new LocaleConverter(); - } - - public void testConvertFull() throws Exception { - toConvert = "fr_FR"; - excepted = Locale.FRANCE; - assertEquals(toConvert, excepted); - - toConvert = "fr_fr"; - assertEquals(toConvert, excepted); - - toConvert = "FR_fr"; - assertEquals(toConvert, excepted); - - toConvert = "FR_FR"; - assertEquals(toConvert, excepted); - - toConvert = "\n\tFr_fR "; - assertEquals(toConvert, excepted); - - toConvert = "en_GB"; - excepted = Locale.UK; - assertEquals(toConvert, excepted); - - toConvert = "en_US"; - excepted = Locale.US; - assertEquals(toConvert, excepted); - - //TODO Arch, we must also check coherence ! - toConvert = "fr_GB"; - excepted = new Locale("fr", "GB"); - assertEquals(toConvert, excepted); - } - - public void testConvertMedium() throws Exception { - toConvert = "fr"; - excepted = new Locale("fr"); - assertEquals(toConvert, excepted); - - toConvert = "fR"; - assertEquals(toConvert, excepted); - - toConvert = "FR"; - assertEquals(toConvert, excepted); - - toConvert = " fR \t"; - assertEquals(toConvert, excepted); - - toConvert = "en"; - excepted = new Locale("en"); - assertEquals(toConvert, excepted); - - toConvert = "es"; - excepted = new Locale("es"); - assertEquals(toConvert, excepted); - - } - - public void testConvertFailed() throws Exception { - - toConvert = null; - assertConvertFailed(toConvert); - - toConvert = ""; - assertConvertFailed(toConvert); - - toConvert = "fr_"; - assertConvertFailed(toConvert); - - toConvert = "_FR"; - assertConvertFailed(toConvert); - - } - - protected void assertEquals(String toConvert, Locale expected) { - Object result = converter.convert(Locale.class, toConvert); - assertEquals(expected, result); - } - - protected void assertConvertFailed(String toConvert) { - try { - converter.convert(Locale.class, toConvert); - fail(); - } catch (Exception e) { - assertTrue(true); - } - - } -} Copied: trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java (from rev 1842, trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java) =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java (rev 0) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java 2011-01-19 21:38:53 UTC (rev 1844) @@ -0,0 +1,137 @@ +/* + * #%L + * I18n :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 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% + */ + +package org.nuiton.util.converter; + +import junit.framework.TestCase; +import org.apache.commons.beanutils.Converter; + +import java.util.Locale; + +/** + * Tests {@link LocaleConverter}. + * + * @author tchemit <chemit(a)codelutin.com> + */ +public class LocaleConverterTest extends TestCase { + + String toConvert; + + Locale excepted; + + Converter converter; + + @Override + protected void setUp() throws Exception { + super.setUp(); + converter = new LocaleConverter(); + } + + public void testConvertFull() throws Exception { + toConvert = "fr_FR"; + excepted = Locale.FRANCE; + assertEquals(toConvert, excepted); + + toConvert = "fr_fr"; + assertEquals(toConvert, excepted); + + toConvert = "FR_fr"; + assertEquals(toConvert, excepted); + + toConvert = "FR_FR"; + assertEquals(toConvert, excepted); + + toConvert = "\n\tFr_fR "; + assertEquals(toConvert, excepted); + + toConvert = "en_GB"; + excepted = Locale.UK; + assertEquals(toConvert, excepted); + + toConvert = "en_US"; + excepted = Locale.US; + assertEquals(toConvert, excepted); + + //TODO Arch, we must also check coherence ! + toConvert = "fr_GB"; + excepted = new Locale("fr", "GB"); + assertEquals(toConvert, excepted); + } + + public void testConvertMedium() throws Exception { + toConvert = "fr"; + excepted = new Locale("fr"); + assertEquals(toConvert, excepted); + + toConvert = "fR"; + assertEquals(toConvert, excepted); + + toConvert = "FR"; + assertEquals(toConvert, excepted); + + toConvert = " fR \t"; + assertEquals(toConvert, excepted); + + toConvert = "en"; + excepted = new Locale("en"); + assertEquals(toConvert, excepted); + + toConvert = "es"; + excepted = new Locale("es"); + assertEquals(toConvert, excepted); + + } + + public void testConvertFailed() throws Exception { + + toConvert = null; + assertConvertFailed(toConvert); + + toConvert = ""; + assertConvertFailed(toConvert); + + toConvert = "fr_"; + assertConvertFailed(toConvert); + + toConvert = "_FR"; + assertConvertFailed(toConvert); + + } + + protected void assertEquals(String toConvert, Locale expected) { + Object result = converter.convert(Locale.class, toConvert); + assertEquals(expected, result); + } + + protected void assertConvertFailed(String toConvert) { + try { + converter.convert(Locale.class, toConvert); + fail(); + } catch (Exception e) { + assertTrue(true); + } + + } +} Property changes on: trunk/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties 2011-01-19 21:38:53 UTC (rev 1844) @@ -24,3 +24,4 @@ ### key.one=First key.two=Second +key.with.param=Key with %s \ No newline at end of file Modified: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties 2011-01-19 20:29:56 UTC (rev 1843) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties 2011-01-19 21:38:53 UTC (rev 1844) @@ -24,3 +24,4 @@ ### key.one=Premier key.two=Seconde +key.with.param=Clef avec %s

1 0

r1843 - in trunk/maven-i18n-plugin/src: it/parsers/newProject it/parsers/newProject/src/main/java/org/nuiton/i18n/test it/parsers/withNewKeys it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test main/java/org/nuiton/i18n/plugin main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: tchemit Date: 2011-01-19 21:29:56 +0100 (Wed, 19 Jan 2011) New Revision: 1843 Url: http://nuiton.org/repositories/revision/i18n/1843 Log: Evolution #1208: Be able to force locale for translation - change parser to detect the new keys from the l_(Locale,String,...) method - improve its - use now I18nFilter inside the ParserJavaMojo and no more the one from processor project Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2011-01-19 20:29:56 UTC (rev 1843) @@ -55,6 +55,11 @@ </dependencies> + <properties> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.verbose>true</i18n.verbose> + <i18n.keepGetters>true</i18n.keepGetters> + </properties> <build> <plugins> @@ -92,7 +97,16 @@ </configuration> </execution> <execution> -  + <id>gen</id> + <goals> + <goal>gen</goal> + </goals> +  +  +  + </execution> +  +  </executions> </plugin> </plugins> Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java 2011-01-19 20:29:56 UTC (rev 1843) @@ -24,12 +24,19 @@ */ package org.nuiton.i18n.test; +import java.util.Locale; + import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.l_; public class MyBean { protected String field1 = n_("javaGetter.key1"); protected String field2 = _("javaGetter.key2"); + + public void method() { + l_(Locale.FRENCH,"javaGetter.key3"); + } } Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2011-01-19 20:29:56 UTC (rev 1843) @@ -23,40 +23,57 @@ * #L% */ -file = new File(basedir, 'target/generated-sources/i18n/java.getter'); -assert file.exists(); +def checkKeysInFile(path, keys) { -content = file.text; -assert content.contains( 'javaGetter.key1=' ); -assert content.contains( 'javaGetter.key2=' ); + file = new File(basedir, path); + if (!file.exists()) { + println("Could not find file [" + file + "]"); + return false; + } -file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); -assert file.exists(); + content = file.text; -content = file.text; -assert content.contains( 'validationGetter.key1=' ); -assert content.contains( 'validationGetter.key2=' ); + for (key in keys) { + if (!content.contains(key)) { + println("Could not find " + key + " in file " + file); + return false; + } + } + return true; +} -file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/java.getter', + ['javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=']) -content = file.text; -assert content.contains( 'jspGetter.key1=' ); -assert content.contains( 'jspGetter.key2=' ); +assert checkKeysInFile('target/generated-sources/i18n/validation.getter', + ['validationGetter.key1=', 'validationGetter.key2=']) -file = new File(basedir, 'target/generated-sources/i18n/tapestry.getter'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', + ['jspGetter.key1=', 'jspGetter.key2=']) -content = file.text; -assert content.contains( 'tmlGetter.key1=' ); -assert content.contains( 'tmlGetter.key2=' ); +assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', + ['tmlGetter.key1=', 'tmlGetter.key2=']) -file = new File(basedir, 'target/generated-sources/i18n/gwt-java.getter'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', + ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) -content = file.text; -assert content.contains( 'gwtJavaGetter.key1=' ); -assert content.contains( 'gwtJavaGetter.key2=' ); -assert content.contains( 'gwtJavaGetter.key3=' ); +assert checkKeysInFile('target/generated-sources/i18n/parsers-newProject_fr_FR.properties', + [ + 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', + 'validationGetter.key1=', 'validationGetter.key2=', + 'jspGetter.key1=', 'jspGetter.key2=', + 'tmlGetter.key1=', 'tmlGetter.key2=', + 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' + ]) +assert checkKeysInFile('target/generated-sources/i18n/parsers-newProject_en_GB.properties', + [ + 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', + 'validationGetter.key1=', 'validationGetter.key2=', + 'jspGetter.key1=', 'jspGetter.key2=', + 'tmlGetter.key1=', 'tmlGetter.key2=', + 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' + ]) + + return true; Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2011-01-19 20:29:56 UTC (rev 1843) @@ -65,6 +65,11 @@ </dependencies> + <properties> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.verbose>true</i18n.verbose> + <i18n.keepGetters>true</i18n.keepGetters> + </properties> <build> <plugins> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java 2011-01-19 20:29:56 UTC (rev 1843) @@ -24,12 +24,20 @@ */ package org.nuiton.i18n.test; +import java.util.Locale; + import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.l_; public class MyBean { protected String field1 = n_("javaGetter.key1"); protected String field2 = _("javaGetter.key2"); + + + public void method() { + l_(Locale.FRENCH,"javaGetter.key3"); + } } Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2011-01-19 20:29:56 UTC (rev 1843) @@ -23,66 +23,122 @@ * #L% */ -file = new File(basedir, 'target/generated-sources/i18n/java.getter'); -assert file.exists(); -content = file.text; -//assert content.contains( 'javaGetter.old.key1=' ); -//assert content.contains( 'javaGetter.old.key2=' ); -assert content.contains( 'javaGetter.key1=' ); -assert content.contains( 'javaGetter.key2=' ); +def checkKeysInFile(path, keys) { -file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); -assert file.exists(); + file = new File(basedir, path); + if (!file.exists()) { + println("Could not find file [" + file + "]"); + return false; + } -content = file.text; -assert content.contains( 'validationGetter.key1=' ); -assert content.contains( 'validationGetter.key2=' ); -assert content.contains( 'validationGetter.key3=' ); + content = file.text; -file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); -assert file.exists(); + for (key in keys) { + if (!content.contains(key)) { + println("Could not find " + key + " in file " + file); + return false; + } + } + return true; +} -content = file.text; -assert content.contains( 'jspGetter.key1=' ); -assert content.contains( 'jspGetter.key2=' ); +assert checkKeysInFile('target/generated-sources/i18n/java.getter', + ['javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=']) -file = new File(basedir, 'target/generated-sources/i18n/tapestry.getter'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/validation.getter', + ['validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=']) -content = file.text; -assert content.contains( 'tmlGetter.key1=' ); -assert content.contains( 'tmlGetter.key2=' ); +assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', + ['jspGetter.key1=', 'jspGetter.key2=']) +assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', + ['tmlGetter.key1=', 'tmlGetter.key2=']) -file = new File(basedir, 'target/generated-sources/i18n/gwt-java.getter'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', + ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) -content = file.text; -assert content.contains( 'gwtJavaGetter.key1=' ); -assert content.contains( 'gwtJavaGetter.key2=' ); -assert content.contains( 'gwtJavaGetter.key3=' ); +assert checkKeysInFile('target/generated-sources/i18n/parsers-withNewKeys_fr_FR.properties', + [ + 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', + 'javaGetter.old.key1=', 'javaGetter.old.key2=', + 'validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=', + 'jspGetter.key1=', 'jspGetter.key2=', + 'tmlGetter.key1=', 'tmlGetter.key2=', + 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' + ]) -file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); -assert file.exists(); +assert checkKeysInFile('target/generated-sources/i18n/parsers-withNewKeys_en_GB.properties', + [ + 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', + 'validationGetter.key1=', 'validationGetter.key2=', + 'jspGetter.key1=', 'jspGetter.key2=', + 'tmlGetter.key1=', 'tmlGetter.key2=', + 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' + ]) +// +//file = new File(basedir, 'target/generated-sources/i18n/java.getter'); +//assert file.exists(); +// +//content = file.text; +////assert content.contains( 'javaGetter.old.key1=' ); +////assert content.contains( 'javaGetter.old.key2=' ); +//assert content.contains( 'javaGetter.key1=' ); +//assert content.contains( 'javaGetter.key2=' ); +//assert content.contains( 'javaGetter.key3=' ); -content = file.text; -assert content.contains( 'javaGetter.old.key1=' ); -assert content.contains( 'javaGetter.old.key2=' ); -assert content.contains( 'javaGetter.key1=' ); -assert content.contains( 'javaGetter.key2=' ); -assert content.contains( 'validationGetter.key1=' ); -assert content.contains( 'validationGetter.key2=' ); -assert content.contains( 'validationGetter.key3=' ); -assert content.contains( 'jspGetter.key1=' ); -assert content.contains( 'jspGetter.key2=' ); +//file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); +//assert file.exists(); +// +//content = file.text; +//assert content.contains( 'validationGetter.key1=' ); +//assert content.contains( 'validationGetter.key2=' ); +//assert content.contains( 'validationGetter.key3=' ); -assert content.contains( 'tmlGetter.key1=' ); -assert content.contains( 'tmlGetter.key2=' ); +//file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); +//assert file.exists(); +// +//content = file.text; +//assert content.contains( 'jspGetter.key1=' ); +//assert content.contains( 'jspGetter.key2=' ); +// +// +//file = new File(basedir, 'target/generated-sources/i18n/tapestry.getter'); +//assert file.exists(); +// +//content = file.text; +//assert content.contains( 'tmlGetter.key1=' ); +//assert content.contains( 'tmlGetter.key2=' ); -assert content.contains( 'gwtJavaGetter.key1=' ); -assert content.contains( 'gwtJavaGetter.key2=' ); -assert content.contains( 'gwtJavaGetter.key3=' ); +//file = new File(basedir, 'target/generated-sources/i18n/gwt-java.getter'); +//assert file.exists(); +// +//content = file.text; +//assert content.contains( 'gwtJavaGetter.key1=' ); +//assert content.contains( 'gwtJavaGetter.key2=' ); +//assert content.contains( 'gwtJavaGetter.key3=' ); +//file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); +//assert file.exists(); +// +//content = file.text; +//assert content.contains('javaGetter.old.key1='); +//assert content.contains('javaGetter.old.key2='); +//assert content.contains('javaGetter.key1='); +//assert content.contains('javaGetter.key2='); +//assert content.contains('javaGetter.key3='); +//assert content.contains('validationGetter.key1='); +//assert content.contains('validationGetter.key2='); +//assert content.contains('validationGetter.key3='); +//assert content.contains('jspGetter.key1='); +//assert content.contains('jspGetter.key2='); +// +//assert content.contains('tmlGetter.key1='); +//assert content.contains('tmlGetter.key2='); +// +//assert content.contains('gwtJavaGetter.key1='); +//assert content.contains('gwtJavaGetter.key2='); +//assert content.contains('gwtJavaGetter.key3='); + return true; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2011-01-19 20:29:56 UTC (rev 1843) @@ -168,6 +168,9 @@ } if (!keepGetters) { + if (isVerbose()) { + getLog().info("Will delete getter " + bundleGetterOut); + } deleteFile(bundleGetterOut); } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2011-01-19 20:29:56 UTC (rev 1843) @@ -97,6 +97,9 @@ propertiesOut.putAll(propertiesIn); if (!keepGetters) { + if (isVerbose()) { + getLog().info("Will delete getter " + bundleGetter); + } deleteFile(bundleGetter); } if (!silent) { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-19 16:24:40 UTC (rev 1842) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2011-01-19 20:29:56 UTC (rev 1843) @@ -35,20 +35,22 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.SortedProperties; -import org.nuiton.processor.filters.I18nFilter; +import org.nuiton.processor.filters.DefaultFilter; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * To parse java files to detect new i18n keys. - * + * * Note: this goal must always be invoked before the {@code process-resources} * phase, otherwise all files will be considered as uptodate. - * + * * @author jruchaud <ruchaud(a)codelutin.com> * @author tchemit <tchemit(a)codelutin.com> * @goal parserJava @@ -128,13 +130,14 @@ protected static class JavaFileParser extends AbstractFileParser { - protected final I18nFilter filter = new I18nFilter(); + protected final I18nFilter filter; public JavaFileParser(Log log, String encoding, SortedProperties oldParser, boolean showTouchedFiles) { super(log, encoding, oldParser, showTouchedFiles); + filter = new I18nFilter(log); } @Override @@ -180,4 +183,131 @@ } } } + + public static class I18nFilter extends DefaultFilter { + + /** Instance logger */ + private final Log log; + +// private String header = "_\$\\s*\""; + private String header = "^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\""; + + private String footer = "\"\\s*(\$|,|\\+|$)"; + + private Pattern headerPattern = Pattern.compile(getHeader()); + + private Pattern footerPattern = Pattern.compile(getFooter()); + + private Matcher matcher; + + public I18nFilter(Log log) { + this.log = log; + } + + protected void setFooter(String footer) { + this.footer = footer; + } + + protected void setHeader(String header) { + this.header = header; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + + @Override + public int getMatchIndexFor(String input, String sequence) { + int index = NOT_FOUND; + + setMatcher(null); + if (sequence.equals(getHeader())) { + setMatcher(getHeaderPattern().matcher(input)); + } else if (sequence.equals(getFooter())) { + setMatcher(getFooterPattern().matcher(input)); + } + if (getMatcher() != null) { + try { + getMatcher().find(); + index = getMatcher().start(); + } catch (RuntimeException e) { + if (log.isDebugEnabled()) { + log.debug("Could not match with " + getMatcher() + " input " + input); + } + } + } + + return index; + } + + @Override + public int getMatchLengthFor(String sequence) { + int length = NOT_FOUND; + + try { + length = getMatcher().end() - getMatcher().start(); + } catch (RuntimeException e) { + if (log.isDebugEnabled()) { + log.debug("Could not match with " + getMatcher() + " input " + sequence); + } + } + + return length; + } + + /** + * methode appele lorsqu'on a la chaine entiere entre le header et le + * footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + @Override + protected String performInFilter(String ch) { + return ch.replaceAll("\"\\s*\\+\\s*\"", "") + "="; + } + + @Override + public String performHeaderFooterFilter(String ch) { + return ch.substring(ch.indexOf('"') + 1, ch.lastIndexOf('"')); + } + + /** + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + /** @return Returns the footerPattern. */ + protected Pattern getFooterPattern() { + return footerPattern; + } + + /** @return Returns the headerPattern. */ + protected Pattern getHeaderPattern() { + return headerPattern; + } + + /** @return Returns the matcher. */ + protected Matcher getMatcher() { + return matcher; + } + + /** @param matcher The matcher to set. */ + protected void setMatcher(Matcher matcher) { + this.matcher = matcher; + } + } }

1 0

r1842 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by bpoussin＠users.nuiton.org 19 Jan '11

19 Jan '11

Author: bpoussin Date: 2011-01-19 17:24:40 +0100 (Wed, 19 Jan 2011) New Revision: 1842 Url: http://nuiton.org/repositories/revision/i18n/1842 Log: Anomalie #1208: Be able to force locale for translation - rename method _(Locale locale, ...) to l_(Locale locale, ...) Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.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-01-19 15:18:57 UTC (rev 1841) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-01-19 16:24:40 UTC (rev 1842) @@ -45,7 +45,7 @@ * the translation support with the init(String language) or init(String * language, String country), init(Localelocale) static methods in your main, ( * eg: I18n.init("fr","FR") ) <li> call the translate static method for each - * sentence, ( eg: I18n._("hello you !") ) <li> create a resource file for each + * sentence, ( eg: I18n.l_("hello you !") ) <li> create a resource file for each * language following the naming convention given in the * java.util.ResourceBundle javadoc and translate all the sentence. </ul> * @@ -135,7 +135,7 @@ * @return la traduction si possible ou la chaine passee en parametre * sinon. */ - public static String _(Locale locale, String message) { + public static String l_(Locale locale, String message) { // if the key to translate is null, just return null if (message == null) { @@ -159,7 +159,7 @@ * @return la traduction si possible ou la chaine passee en parametre * sinon. */ - public static String _(Locale locale, String message, Object... args) { + public static String l_(Locale locale, String message, Object... args) { // if the key to translate is null, just return null if (message == null) { @@ -196,7 +196,7 @@ */ public static String _(String message) { Locale locale = getCurrentLanguage().getLocale(); - String result = _(locale, message); + String result = l_(locale, message); return result; } @@ -211,7 +211,7 @@ */ public static String _(String message, Object... args) { Locale locale = getCurrentLanguage().getLocale(); - String result = _(locale, message, args); + String result = l_(locale, message, args); return result; } @@ -223,7 +223,7 @@ * * Par exemple : * <pre>String key = "nuitonutils.key"; - * String result = _(key)</pre> + * String result = l_(key)</pre> * fonctionnera, mais la chaine n'aura pas été marquée comme devant être * internationalisé. * @@ -257,7 +257,7 @@ * * Par exemple : * <pre>String key = "nuitonutils.key"; - * String result = _(key)</pre> + * String result = l_(key)</pre> * fonctionnera, mais la chaine n'aura pas été marquée comme devant être * internationalisé. *

1 0