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

r1923 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init
by tchemit＠users.nuiton.org 11 May '11

11 May '11

Author: tchemit Date: 2011-05-11 17:46:11 +0200 (Wed, 11 May 2011) New Revision: 1923 Url: http://nuiton.org/repositories/revision/i18n/1923 Log: fix inheritance... Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-11 14:51:07 UTC (rev 1922) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-11 15:46:11 UTC (rev 1923) @@ -68,10 +68,10 @@ protected I18nInitializer() { // use the default encoding - setEncoding(I18nUtil.DEFAULT_CHARSET); + encoding = I18nUtil.DEFAULT_CHARSET; // use the default message formatter - setMessageFormatter(I18nUtil.DEFAULT_MESSAGE_FORMATTER); + messageFormatter = I18nUtil.DEFAULT_MESSAGE_FORMATTER; } /**

1 0

r1922 - in trunk/nuiton-i18n/src: main/java/org/nuiton/i18n main/java/org/nuiton/i18n/bundle main/java/org/nuiton/i18n/init test/java/org/nuiton/i18n test/resources
by tchemit＠users.nuiton.org 11 May '11

11 May '11

Author: tchemit Date: 2011-05-11 16:51:07 +0200 (Wed, 11 May 2011) New Revision: 1922 Url: http://nuiton.org/repositories/revision/i18n/1922 Log: clean api Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/ Removed: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormatter.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.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/I18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java trunk/nuiton-i18n/src/test/resources/log4j.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-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -74,11 +74,15 @@ protected static I18nFilter filter; /** - * Formatter to use, default value is {@link I18nFormat#STRING_FORMAT} + * Formatter to apply on each translation. + * + * This formatter can not be configured directly here, but must be setted + * into the {@code initializer} used to configure the I18n system. * + * @see I18nInitializer#setMessageFormatter(I18nMessageFormatter) * @since 2.4 */ - protected static I18nFormatter formatter = I18nFormat.STRING_FORMAT; + protected static I18nMessageFormatter messageFormatter; /** * Change le filtre des chaines traduites @@ -90,16 +94,6 @@ } /** - * Change {@code formatter} to use on each translation with args. - * - * @param formatter I18nFormatter to use - * @since 2.4 - */ - public static void setFormatter(I18nFormatter formatter) { - I18n.formatter = formatter; - } - - /** * Initialize I18n system. * * The {@code initializer} can be null, in that case it will use the default @@ -199,7 +193,7 @@ * 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 {@link I18nFormatter} + * @param message message formate avec {@link I18nMessageFormatter} * @param args les parametres pour le message. * @return la traduction si possible ou la chaine passee en parametre * sinon. @@ -217,7 +211,7 @@ I18nLanguage language = getLanguage(locale); String result = language.translate(message); - // Don't check the length, this will be done directly in formatter if necessary. + // Don't check the length, this will be done directly in messageFormatter if necessary. // In MessageFormat case it must format all messages even there is no args (because of '' escape case). // if (args.length == 0) { // @@ -226,10 +220,10 @@ // } try { - return applyFilter(formatter.format(locale, result, args)); + return applyFilter(messageFormatter.format(locale, result, args)); } catch (Exception eee) { try { - return applyFilter(formatter.format(locale, message, args)); + return applyFilter(messageFormatter.format(locale, message, args)); } catch (Exception zzz) { if (log.isWarnEnabled()) { log.warn( @@ -244,7 +238,7 @@ /** * Retourne la chaine traduite si possible. * - * @param message message formate avec {@link I18nFormatter} + * @param message message formate avec {@link I18nMessageFormatter} * @param args les parametres pour le message. * @return la traduction si possible ou la chaine passee en parametre * sinon. @@ -280,7 +274,7 @@ * devant être traduit seulement à leur lecture suivant la locale du lecteur * et non du créateur. * - * @param message message formate avec {@link I18nFormatter} + * @param message message formate avec {@link I18nMessageFormatter} * @param args les parametres pour le message. * @return le message passe en argument mais formatté avec les parametres */ @@ -293,7 +287,7 @@ // XXX-fdesbois-2011-05-05 : don't know if it's relevant to format here, // seems pretty useless because we will not use the value // corresponding to given key message - return formatter.format(getDefaultLocale(), message, args); + return messageFormatter.format(getDefaultLocale(), message, args); } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn( @@ -315,6 +309,9 @@ store.close(); store = null; } + if (messageFormatter != null) { + messageFormatter = null; + } } /** @@ -398,8 +395,8 @@ return filter; } - public static I18nFormatter getFormatter() { - return formatter; + public static I18nMessageFormatter getMessageFormatter() { + return messageFormatter; } /** @@ -433,6 +430,8 @@ store = new I18nStore(locale, initializer); setDefaultLocale(locale); + + messageFormatter = initializer.getMessageFormatter(); } protected static I18nInitializer getDefaultInitializer() { Deleted: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -1,76 +0,0 @@ -/* - * #%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 java.text.MessageFormat; -import java.util.Formatter; -import java.util.Locale; - -/** - * Enum implementation for {@link I18nFormatter}. Provides basic formatter - * such as {@link #STRING_FORMAT} and {@link #MESSAGE_FORMAT}. - * - * Created: 05/05/11 - * - * @author fdesbois <desbois(a)codelutin.com> - * $Id$ - * @since 2.4 - */ -public enum I18nFormat implements I18nFormatter { - - /** - * Implementation based on printf syntax. - * - * @see Formatter - * @see String#format(Locale, String, Object...) - */ - STRING_FORMAT { - - @Override - public String format(Locale locale, String message, Object... args) { - String result; - // Previous behavior, no format will be done for empty args - if (args.length == 0) { - result = message; - } else { - result = String.format(locale, message, args); - } - return result; - } - }, - - /** - * Implementation based on {@link MessageFormat} syntax. - */ - MESSAGE_FORMAT { - - @Override - public String format(Locale locale, String message, Object... args) { - MessageFormat formatter = new MessageFormat(message, locale); - return formatter.format(args); - } - } - -} Deleted: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormatter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormatter.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormatter.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -1,53 +0,0 @@ -/* - * #%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 java.util.Locale; - -/** - * Formatter to use at runtime when message need to be translated with args. - * - * Created: 05/05/11 - * - * @author fdesbois <desbois(a)codelutin.com> - * @see I18nFormat - * $Id$ - * @since 2.4 - */ -public interface I18nFormatter { - - /** - * Format a given {@code message} with {@code locale} and {@code args}. - * The purpose is to replace placeholders in {@code message} with {@code args} - * value. This could depends on {@code locale} for date purpose for example. - * - * @param locale Locale to use for formatting (number, date, ...) - * @param message Message to format (that contains placeholders) - * @param args Object array to use in formatting the message - * @return the formatted message - */ - String format(Locale locale, String message, Object... args); - -} Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -81,8 +81,7 @@ */ @Deprecated public void load(I18nBundleEntry[] bundleEntries) { - Charset encoding = Charset.forName(I18nUtil.DEFAULT_ENCODING); - load(bundleEntries, encoding); + load(bundleEntries, I18nUtil.DEFAULT_CHARSET); } /** Copied: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java (from rev 1920, trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormatter.java) =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -0,0 +1,57 @@ +/* + * #%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 java.util.Locale; + +/** + * Contract to format a i18n message. + * + * Created: 05/05/11 + * + * @author fdesbois <desbois(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @see I18nUtil.DefaultI18nMessageFormatters + * $Id$ + * @since 2.4 + */ +public interface I18nMessageFormatter { + + /** + * Format a given {@code message} with {@code locale} and optinal {@code args}. + * + * The main purpose is to replace placeholders in {@code message} with + * {@code args} value. + * + * This may depend on {@code locale} for date purpose for example. + * + * @param locale locale to use for formatting (number, date, ...) + * @param message message to format (that contains placeholders) + * @param args object array to use in formatting the message + * @return the formatted message + */ + String format(Locale locale, String message, Object... args); + +} Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -36,8 +36,11 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; +import java.nio.charset.Charset; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Formatter; import java.util.List; import java.util.Locale; import java.util.Stack; @@ -49,7 +52,7 @@ /** @author tchemit <chemit(a)codelutin.com> */ public class I18nUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18nUtil.class); public static final String ISO_8859_1_ENCONDING = "ISO-8859-1"; @@ -58,6 +61,12 @@ public static final String DEFAULT_ENCODING = UTF_8_ENCONDING; + public static final Charset DEFAULT_CHARSET = + Charset.forName(DEFAULT_ENCODING); + + public static final I18nMessageFormatter DEFAULT_MESSAGE_FORMATTER = + new StringFormatI18nMessageFormatter(); + public static final Locale DEFAULT_LOCALE = Locale.UK; public static final String[] EMPTY_STRING_ARRAY = new String[0]; @@ -83,7 +92,7 @@ result.add(l); } catch (Exception e) { throw new IllegalArgumentException("bundle " + s + - " is not a valid locale,e"); + " is not a valid locale", e); } } return result.toArray(new Locale[result.size()]); @@ -91,15 +100,18 @@ public static Locale newLocale(String str) { if (str == null) { - // get use locale + + // get user locale return newLocale(null, null); } try { return (Locale) new LocaleConverter().convert(Locale.class, str); } catch (Exception e) { - if (log.isWarnEnabled()) { - log.warn("could not load locale '" + str + " for reason : " + e.getMessage()); - } + if (log.isWarnEnabled()) { + log.warn("could not load locale '" + str + + " for reason : " + e.getMessage()); + } + // use default locale return DEFAULT_LOCALE; } @@ -107,6 +119,7 @@ public static Locale newLocale(String language, String country) { if (language == null) { + // get user locale language = System.getProperty("user.language", DEFAULT_LOCALE.getLanguage()); @@ -378,4 +391,46 @@ } return result; } + + /** + * Implementation of {@link I18nMessageFormatter} based on {@link Formatter} + * syntax. + * + * Note: This is the default message formatter used by + * i18n system. + * + * @see Formatter + * @see String#format(Locale, String, Object...) + * @since 2.4 + */ + public static class StringFormatI18nMessageFormatter implements I18nMessageFormatter { + + @Override + public String format(Locale locale, String message, Object... args) { + String result; + // Previous behavior, no format will be done for empty args + if (args.length == 0) { + result = message; + } else { + result = String.format(locale, message, args); + } + return result; + } + } + + /** + * Implementation of {@link I18nMessageFormatter} based on + * {@link MessageFormat} syntax. + * + * @see MessageFormat + * @since 2.4 + */ + public static class MessageFormatI18nMessageFormatter implements I18nMessageFormatter { + @Override + public String format(Locale locale, String message, Object... args) { + MessageFormat formatter = new MessageFormat(message, locale); + return formatter.format(args); + } + } + } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -130,8 +130,7 @@ */ @Deprecated public void load(Properties resource) throws IOException { - Charset encoding = Charset.forName(I18nUtil.DEFAULT_ENCODING); - load(resource, encoding); + load(resource, I18nUtil.DEFAULT_CHARSET); } /** 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-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -33,7 +33,6 @@ import java.net.URL; import java.net.URLClassLoader; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -71,11 +70,6 @@ } public ClassPathI18nInitializer(ClassLoader loader, URL[] extraURLs) { - this(loader, extraURLs, null); - } - - public ClassPathI18nInitializer(ClassLoader loader, URL[] extraURLs, Charset encoding) { - super(encoding); this.loader = loader == null ? getClass().getClassLoader() : loader; this.extraURLs = extraURLs; } 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-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -78,13 +78,13 @@ public static final String DEFAULT_I18N_PATH = "META-INF/"; public DefaultI18nInitializer(String bundleName) throws - NullPointerException { + NullPointerException { this(bundleName, null, null); } public DefaultI18nInitializer(String bundleName, ClassLoader loader) throws - NullPointerException { + NullPointerException { this(bundleName, loader, null); } @@ -148,11 +148,12 @@ } // Load encoding from definition file and use it as Charset encoding - if (encoding == null) { - String encoding = properties.getProperty(BUNDLE_DEF_ENCODING); - Charset charset = Charset.forName(encoding); - setEncoding(charset); + String encoding = properties.getProperty(BUNDLE_DEF_ENCODING); + Charset charset = Charset.forName(encoding); + if (log.isInfoEnabled()) { + log.info("Use encoding " + charset); } + setEncoding(charset); String prefix = url.toString(); prefix = prefix.substring(0, prefix.length() - filename.length()); Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -27,6 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.I18nMessageFormatter; import org.nuiton.i18n.I18nUtil; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; @@ -37,7 +39,8 @@ import java.util.List; /** - * Contract of a resolver of {@link I18nBundle}. + * Abstract object to resolv {@link I18nBundle} and prepare initialization of + * {@link I18n}. * * @author tchemit <chemit(a)codelutin.com> * @since 1.1 @@ -47,21 +50,28 @@ /** Logger */ private static final Log log = LogFactory.getLog(I18nInitializer.class); - protected static Charset defaultEncoding = - Charset.forName(I18nUtil.DEFAULT_ENCODING); - + /** + * Encoding used to load i18n bundles. + * + * @since 2.4 + */ protected Charset encoding; - protected I18nInitializer() { - } - /** - * Constructor with {@code encoding} used to load Properties file. + * Message formatter used in {@link I18n} to produce final translated + * messages. * - * @param encoding Charset to use for Properties loading + * @since 2.4 */ - protected I18nInitializer(Charset encoding) { - this.encoding = encoding; + protected I18nMessageFormatter messageFormatter; + + protected I18nInitializer() { + + // use the default encoding + setEncoding(I18nUtil.DEFAULT_CHARSET); + + // use the default message formatter + setMessageFormatter(I18nUtil.DEFAULT_MESSAGE_FORMATTER); } /** @@ -86,17 +96,29 @@ log.info(bundles.size() + " bundle(s) found, in " + entries.length + " file(s)."); } - return result; } public Charset getEncoding() { - Charset result = encoding == null ? defaultEncoding : encoding; - return result; + return encoding; } public void setEncoding(Charset encoding) { + if (encoding == null) { + throw new NullPointerException("Can not set a null encoding"); + } this.encoding = encoding; } + public I18nMessageFormatter getMessageFormatter() { + return messageFormatter; + } + + public void setMessageFormatter(I18nMessageFormatter messageFormatter) { + if (messageFormatter == null) { + throw new NullPointerException( + "Can not set a null message formatter"); + } + this.messageFormatter = messageFormatter; + } } 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-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -28,6 +28,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18nMessageFormatter; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; @@ -37,6 +38,7 @@ import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; +import java.nio.charset.Charset; import java.util.Properties; /** @@ -97,6 +99,26 @@ } @Override + public Charset getEncoding() { + return getDelegate().getEncoding(); + } + + @Override + public void setEncoding(Charset encoding) { + getDelegate().setEncoding(encoding); + } + + @Override + public I18nMessageFormatter getMessageFormatter() { + return getDelegate().getMessageFormatter(); + } + + @Override + public void setMessageFormatter(I18nMessageFormatter messageFormatter) { + getDelegate().setMessageFormatter(messageFormatter); + } + + @Override public I18nBundle[] resolvBundles() throws Exception { File directory = getUserDirectory(); @@ -164,8 +186,7 @@ I18nBundle[] bundles = resolvBundles(urls); // detect bundles entries - I18nBundleEntry[] entries = - I18nBundleUtil.getBundleEntries(bundles); + I18nBundleEntry[] entries = I18nBundleUtil.getBundleEntries(bundles); // copy all bundle entries resource for (I18nBundleEntry e : entries) { Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-05-11 14:51:07 UTC (rev 1922) @@ -79,7 +79,7 @@ String actual; // pas de traduction possible car l'initialiser n'est pas bon :) - + expected = "key.with.param"; actual = I18n.l_(Locale.FRANCE, "key.with.param"); Assert.assertEquals(expected, actual); @@ -204,8 +204,8 @@ @Test public void testFormatterMessageFormat() { + initializer.setMessageFormatter(new I18nUtil.MessageFormatI18nMessageFormatter()); I18n.init(initializer, Locale.UK); - I18n.setFormatter(I18nFormat.MESSAGE_FORMAT); Date date = new GregorianCalendar(2011, 4, 5).getTime(); @@ -220,8 +220,5 @@ expected = "Clé avec 5 mai 2011"; actual = I18n.l_(Locale.FRANCE, "key.with.date", date); Assert.assertEquals(expected, actual); - - // reset default value - I18n.setFormatter(I18nFormat.STRING_FORMAT); } } Modified: trunk/nuiton-i18n/src/test/resources/log4j.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/log4j.properties 2011-05-11 14:48:59 UTC (rev 1921) +++ trunk/nuiton-i18n/src/test/resources/log4j.properties 2011-05-11 14:51:07 UTC (rev 1922) @@ -28,6 +28,6 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X + # package level -log4j.logger.org.nuiton.i18n=INFO +log4j.logger.org.nuiton=WARN

1 0

r1921 - in trunk/maven-i18n-plugin/src: it/evo-1507 it/evo-1507/src/test/java/org/nuiton/i18n it/evo-1507/src/test/resources main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 11 May '11

11 May '11

Author: tchemit Date: 2011-05-11 16:48:59 +0200 (Wed, 11 May 2011) New Revision: 1921 Url: http://nuiton.org/repositories/revision/i18n/1921 Log: clean javadoc and it Modified: trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties trunk/maven-i18n-plugin/src/it/evo-1507/pom.xml trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java trunk/maven-i18n-plugin/src/it/evo-1507/src/test/resources/log4j.properties trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java Modified: trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties 2011-05-11 14:48:59 UTC (rev 1921) @@ -24,7 +24,7 @@ ### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project -invoker.goals=clean test i18n:available-converters +invoker.goals=clean test # Optionally, a list of goals to run during further invocations of Maven #invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run Modified: trunk/maven-i18n-plugin/src/it/evo-1507/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/pom.xml 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/it/evo-1507/pom.xml 2011-05-11 14:48:59 UTC (rev 1921) @@ -41,9 +41,9 @@ </parent> <groupId>org.nuiton.i18n</groupId> - <artifactId>evo-formatter</artifactId> + <artifactId>evo-1507</artifactId> - <name>I18n Test :: evo-formatter</name> + <name>I18n Test :: evo-1507</name> <dependencies> @@ -78,7 +78,6 @@ <verbose>true</verbose> <bundleFormatConverter>toMessageFormat</bundleFormatConverter> <bundleOutputName>ResultBundle</bundleOutputName> - <bundleOutputPackage>org.nuiton</bundleOutputPackage> </configuration> <executions> <execution> Modified: trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2011-05-11 14:48:59 UTC (rev 1921) @@ -28,6 +28,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; import java.util.Locale; @@ -42,19 +43,18 @@ @After public void tearDown() { I18n.close(); - I18n.setFormatter(I18nFormat.STRING_FORMAT); } @Test public void testMessageFormatFormatter() { - DefaultI18nInitializer initializer = - new DefaultI18nInitializer("ResultBundle", null, "org/nuiton/"); + I18nInitializer initializer = new DefaultI18nInitializer("ResultBundle"); + initializer.setMessageFormatter( + new I18nUtil.MessageFormatI18nMessageFormatter()); + I18n.init(initializer, Locale.FRANCE); - I18n.setFormatter(I18nFormat.MESSAGE_FORMAT); - String expected = "Message qui fait attention à la conversion de param"; String actual = I18n._("lib.property.message2", "param"); Assert.assertEquals(expected, actual); Modified: trunk/maven-i18n-plugin/src/it/evo-1507/src/test/resources/log4j.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/src/test/resources/log4j.properties 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/it/evo-1507/src/test/resources/log4j.properties 2011-05-11 14:48:59 UTC (rev 1921) @@ -30,5 +30,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.nuiton.util=WARN -log4j.logger.org.nuiton.i18n=DEBUG +log4j.logger.org.nuiton=WARN Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java 2011-05-11 14:48:59 UTC (rev 1921) @@ -24,11 +24,10 @@ */ package org.nuiton.i18n.plugin.bundle; -import org.nuiton.i18n.I18nFormatter; - /** - * Used to convert from a {@link I18nFormatter} syntax to an other. + * Contract to make a conversion from a syntax to another one. * + * * Created: 05/05/11 * * @author fdesbois <desbois(a)codelutin.com> @@ -40,7 +39,7 @@ /** * Convert format syntax to an other from {@code value}. * - * @param value Message with some format placeholders to convert + * @param value message with some format placeholders to convert * @return the message with other format syntax */ String convert(String value); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2011-05-10 22:16:27 UTC (rev 1920) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2011-05-11 14:48:59 UTC (rev 1921) @@ -29,11 +29,13 @@ import org.apache.commons.logging.LogFactory; import java.text.MessageFormat; +import java.util.Formatter; import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * Converter used to change printf args syntax by {@link MessageFormat} syntax. + * Implementation of {@link BundleFormatConverter} to convert {@link Formatter} + * syntax to a {@link MessageFormat} syntax. * * Created: 05/05/11 *

1 0

r1920 - trunk
by tchemit＠users.nuiton.org 10 May '11

10 May '11

Author: tchemit Date: 2011-05-11 00:16:27 +0200 (Wed, 11 May 2011) New Revision: 1920 Url: http://nuiton.org/repositories/revision/i18n/1920 Log: Evolution #1516: Updates to m-helper-p 1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-10 20:39:58 UTC (rev 1919) +++ trunk/pom.xml 2011-05-10 22:16:27 UTC (rev 1920) @@ -188,7 +188,7 @@ <projectId>i18n</projectId> <processorVersion>1.2.1</processorVersion> - <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.3</helperPluginVersion>  <locales>fr,en</locales>

1 0

r1919 - in trunk/maven-i18n-plugin/src: it it/evo-1507 main/java/org/nuiton/i18n/plugin/bundle
by fdesbois＠users.nuiton.org 10 May '11

10 May '11

Author: fdesbois Date: 2011-05-10 22:39:58 +0200 (Tue, 10 May 2011) New Revision: 1919 Url: http://nuiton.org/repositories/revision/i18n/1919 Log: #1515 : Add AvailableConverterMojo for BundlerFormatConverter Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java Modified: trunk/maven-i18n-plugin/src/it/evo-1507/README.txt trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties trunk/maven-i18n-plugin/src/it/settings.xml Modified: trunk/maven-i18n-plugin/src/it/evo-1507/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/README.txt 2011-05-10 20:36:43 UTC (rev 1918) +++ trunk/maven-i18n-plugin/src/it/evo-1507/README.txt 2011-05-10 20:39:58 UTC (rev 1919) @@ -1,5 +1,5 @@ This it test the http://nuiton.org/issues/show/1507. -To test I18nFormatterMessageFormat and conversion from string.format syntax +To test BundlerFormatConverter and conversion from string.format syntax using StringFormatToMessageFormat. Modified: trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties 2011-05-10 20:36:43 UTC (rev 1918) +++ trunk/maven-i18n-plugin/src/it/evo-1507/invoker.properties 2011-05-10 20:39:58 UTC (rev 1919) @@ -24,7 +24,7 @@ ### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project -invoker.goals=clean test +invoker.goals=clean test i18n:available-converters # Optionally, a list of goals to run during further invocations of Maven #invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run Modified: trunk/maven-i18n-plugin/src/it/settings.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/settings.xml 2011-05-10 20:36:43 UTC (rev 1918) +++ trunk/maven-i18n-plugin/src/it/settings.xml 2011-05-10 20:39:58 UTC (rev 1919) @@ -58,4 +58,9 @@ </pluginRepositories> </profile> </profiles> + + <pluginGroups> + <pluginGroup>org.nuiton.i18n</pluginGroup> + </pluginGroups> + </settings> Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java 2011-05-10 20:39:58 UTC (rev 1919) @@ -0,0 +1,79 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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.plugin.bundle; + +import org.nuiton.plugin.AbstractAvailableDataMojo; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; + +/** + * Mojo used to display available {@link BundleFormatConverter}. + * + * Created: 09/05/11 + * + * @author fdesbois <desbois(a)codelutin.com> + * $Id$ + * @goal available-converters + * @requiresProject true + * @requiresDirectInvocation true + * @requiresDependencyResolution test + * @since 2.4 + */ +public class AvailableConverterMojo extends AbstractAvailableDataMojo { + + /** + * Map of all availables {@link BundleFormatConverter}. + * + * @component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" + */ + protected Map<String, BundleFormatConverter> bundleFormatConverters; + + @Override + protected Collection<AvailableData> getAllAvailableDatas() { + + AvailableData data = new AvailableData() { + + @Override + public String name() { + return "bundleFormatConverter"; + } + + @Override + public Map<String, ?> getData() { + return bundleFormatConverters; + } + + @Override + public String toString(Object value) { + return value.getClass().getName(); + } + }; + + return Arrays.asList(data); + } + +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1918 - in trunk/maven-i18n-plugin/src: main/java/org/nuiton/i18n/plugin/bundle test/java/org/nuiton/i18n/plugin/bundle
by fdesbois＠users.nuiton.org 10 May '11

10 May '11

Author: fdesbois Date: 2011-05-10 22:36:43 +0200 (Tue, 10 May 2011) New Revision: 1918 Url: http://nuiton.org/repositories/revision/i18n/1918 Log: Rename converter and remove previous commented implementation Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java Removed: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java Deleted: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java 2011-05-10 20:16:51 UTC (rev 1917) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java 2011-05-10 20:36:43 UTC (rev 1918) @@ -1,150 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2011 CodeLutin, Tony chemit - * %% - * 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.plugin.bundle; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.text.MessageFormat; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Converter used to change printf args syntax by {@link MessageFormat} syntax. - * - * Created: 05/05/11 - * - * @author fdesbois <desbois(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @plexus.component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" role-hint="toMessageFormat" - * @since 2.4 - */ -public class StringFormatToMessageFormat implements BundleFormatConverter { - - private static final Log log = - LogFactory.getLog(StringFormatToMessageFormat.class); - - protected static Pattern PATTERN = Pattern.compile("%\\$?(\\d?)[^\\s']*"); - - @Override - public String convert(String value) { - - String result; - - Matcher matcher = PATTERN.matcher(value); - boolean matches = matcher.find(); - - if (log.isDebugEnabled()) { - log.debug("> value : " + value + " _ matches ? " + matches); - } - - if (matches) { - - // Reset done, because of first find() - matcher.reset(); - - StringBuffer sb = new StringBuffer(); - int i = 0; - - while (matcher.find()) { - - if (log.isDebugEnabled()) { - log.debug("> match group : " + matcher.group(0)); - log.debug("> match group for number : " + matcher.group(1)); - } - - String argNumber = matcher.group(1); - - int nb; - - if (StringUtils.isNotEmpty(argNumber)) { - - // there is a arg position number, so must use the -1 value - nb = Integer.parseInt(argNumber) - 1; - } else { - - // use the current argument position value - nb = i; - } - -// int nb = i; -// // Group 1 is the arg number, for MessageFormat it starts from 0 -// // compare to printf that starts from 1 -// if (!"".equals(matcher.group(1))) { -// nb = Integer.parseInt(matcher.group(1)) - 1; -// } - - // Append replacement for current occurence - matcher.appendReplacement(sb, "\\{" + nb + "\\}"); - i++; - } - // Append last chars from input String - matcher.appendTail(sb); - result = sb.toString(); - - if (log.isDebugEnabled()) { - log.debug("Result : " + result); - } - -// result = escapeQuoteChar(result); - - } else { - - // there is no argument in incoming string value - result = value; - } - - result = escapeQuoteChar(result); - - return result; - } - - /** - * Escape ' char with '', needed by {@link MessageFormat}. - * - * @param value Message that contains ' - * @return the message with ' escaped - */ - protected String escapeQuoteChar(String value) { - - // Replace ' by '' - String result = value.replaceAll("'", "''"); -// String result = value.replaceAll("([^'])'([^'])", "$1''$2"); - - // Manage ' as last char -// result = result.replaceFirst("([^'])'$", "$1''"); - - // Manage ' as first char -// result = result.replaceFirst("^'([^'])", "''$1"); - - if (log.isDebugEnabled()) { - log.debug("Result with ' escape : " + result); - } - - return result; - } - -} Copied: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java (from rev 1915, trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormat.java) =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2011-05-10 20:36:43 UTC (rev 1918) @@ -0,0 +1,135 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2011 CodeLutin, Tony chemit + * %% + * 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.plugin.bundle; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.text.MessageFormat; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Converter used to change printf args syntax by {@link MessageFormat} syntax. + * + * Created: 05/05/11 + * + * @author fdesbois <desbois(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" role-hint="toMessageFormat" + * @since 2.4 + */ +public class StringFormatToMessageFormatConverter implements BundleFormatConverter { + + private static final Log log = + LogFactory.getLog(StringFormatToMessageFormatConverter.class); + + protected static Pattern PATTERN = Pattern.compile("%\\$?(\\d?)[^\\s']*"); + + @Override + public String convert(String value) { + + String result; + + Matcher matcher = PATTERN.matcher(value); + boolean matches = matcher.find(); + + if (log.isDebugEnabled()) { + log.debug("> value : " + value + " _ matches ? " + matches); + } + + if (matches) { + + // Reset done, because of first find() + matcher.reset(); + + StringBuffer sb = new StringBuffer(); + int i = 0; + + while (matcher.find()) { + + if (log.isDebugEnabled()) { + log.debug("> match group : " + matcher.group(0)); + log.debug("> match group for number : " + matcher.group(1)); + } + + String argNumber = matcher.group(1); + + int nb; + + if (StringUtils.isNotEmpty(argNumber)) { + + // there is a arg position number, so must use the -1 value + nb = Integer.parseInt(argNumber) - 1; + } else { + + // use the current argument position value + nb = i; + } + + // Append replacement for current occurence + matcher.appendReplacement(sb, "\\{" + nb + "\\}"); + i++; + } + // Append last chars from input String + matcher.appendTail(sb); + result = sb.toString(); + + if (log.isDebugEnabled()) { + log.debug("Result : " + result); + } + + } else { + + // there is no argument in incoming string value + result = value; + } + + // Always escape quote ' to '' + result = escapeQuoteChar(result); + + return result; + } + + /** + * Escape ' char with '', needed by {@link MessageFormat}. + * + * @param value Message that contains ' + * @return the message with ' escaped + */ + protected String escapeQuoteChar(String value) { + + // Replace ' by '' + String result = value.replaceAll("'", "''"); + + if (log.isDebugEnabled()) { + log.debug("Result with ' escape : " + result); + } + + return result; + } + +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java (from rev 1915, trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java) =================================================================== --- trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java (rev 0) +++ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java 2011-05-10 20:36:43 UTC (rev 1918) @@ -0,0 +1,76 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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.plugin.bundle; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Tests the {@link StringFormatToMessageFormatConverter}. + * + * Created: 05/05/11 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class StringFormatToMessageFormatConverterTest { + + BundleFormatConverter converter; + + @Test + public void testConvert() throws Exception { + + + converter = new StringFormatToMessageFormatConverter(); + + convertAndAssertEquals("Salut à tous pour l'ouverture", + "Salut à tous pour l''ouverture"); + + convertAndAssertEquals("Salut à tous pour l''ouverture", + "Salut à tous pour l''''ouverture"); + + convertAndAssertEquals("Salut à tous pour l'ouverture de %s", + "Salut à tous pour l''ouverture de {0}"); + + convertAndAssertEquals("Salut à tous pour l'ouverture de %$1s", + "Salut à tous pour l''ouverture de {0}"); + + convertAndAssertEquals("Salut à tous pour l'ouverture de %$2s le %$1t", + "Salut à tous pour l''ouverture de {1} le {0}" + ); + + convertAndAssertEquals( + "Salut à tous pour l'ouverture de %$2s le %$1td à l'heure %1tH", + "Salut à tous pour l''ouverture de {1} le {0} à l''heure {0}" + ); + + convertAndAssertEquals("Salut à tous pour l''ouverture de '%$1s'", + "Salut à tous pour l''''ouverture de ''{0}''"); + } + + protected void convertAndAssertEquals(String incoming, String expected) { + String actual = converter.convert(incoming); + Assert.assertEquals(expected, actual); + } +} Property changes on: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java =================================================================== --- trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java 2011-05-10 20:16:51 UTC (rev 1917) +++ trunk/maven-i18n-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatTest.java 2011-05-10 20:36:43 UTC (rev 1918) @@ -1,97 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 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.plugin.bundle; - -import org.junit.Assert; -import org.junit.Test; - -/** - * Tests the {@link StringFormatToMessageFormat}. - * - * Created: 05/05/11 - * - * @author fdesbois <desbois(a)codelutin.com> - */ -public class StringFormatToMessageFormatTest { - - BundleFormatConverter converter; - - @Test - public void testConvert() throws Exception { - - - converter = new StringFormatToMessageFormat(); - -// String expected; -// String actual; - - convertAndAssertEquals("Salut à tous pour l'ouverture", - "Salut à tous pour l''ouverture"); - - convertAndAssertEquals("Salut à tous pour l''ouverture", - "Salut à tous pour l''''ouverture"); - -// actual = converter.convert("Salut à tous pour l'ouverture"); -// Assert.assertEquals(expected, actual); - - convertAndAssertEquals("Salut à tous pour l'ouverture de %s", - "Salut à tous pour l''ouverture de {0}"); -// expected = "Salut à tous pour l''ouverture de {0}"; -// actual = converter.convert("Salut à tous pour l'ouverture de %s"); -// Assert.assertEquals(expected, actual); - - convertAndAssertEquals("Salut à tous pour l'ouverture de %$1s", - "Salut à tous pour l''ouverture de {0}"); -// expected = "Salut à tous pour l''ouverture de {0}"; -// actual = converter.convert("Salut à tous pour l'ouverture de %$1s"); -// Assert.assertEquals(expected, actual); - - convertAndAssertEquals("Salut à tous pour l'ouverture de %$2s le %$1t", - "Salut à tous pour l''ouverture de {1} le {0}" - ); -// expected = "Salut à tous pour l''ouverture de {1} le {0}"; -// actual = converter.convert("Salut à tous pour l'ouverture de %$2s le %$1t"); -// Assert.assertEquals(expected, actual); - - convertAndAssertEquals( - "Salut à tous pour l'ouverture de %$2s le %$1td à l'heure %1tH", - "Salut à tous pour l''ouverture de {1} le {0} à l''heure {0}" - ); -// expected = "Salut à tous pour l''ouverture de {1} le {0} à l''heure {0}"; -// actual = converter.convert("Salut à tous pour l'ouverture de %$2s le %$1td à l'heure %1tH"); -// Assert.assertEquals(expected, actual); - - convertAndAssertEquals("Salut à tous pour l''ouverture de '%$1s'", - "Salut à tous pour l''''ouverture de ''{0}''"); -// expected = "Salut à tous pour l''ouverture de ''{0}''"; -// actual = converter.convert("Salut à tous pour l''ouverture de '%$1s'"); -// Assert.assertEquals(expected, actual); - } - - protected void convertAndAssertEquals(String incoming, String expected) { - String actual = converter.convert(incoming); - Assert.assertEquals(expected, actual); - } -}

1 0

r1917 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 10 May '11

10 May '11

Author: tchemit Date: 2011-05-10 22:16:51 +0200 (Tue, 10 May 2011) New Revision: 1917 Url: http://nuiton.org/repositories/revision/i18n/1917 Log: Evolution #1513: Bundle mojo can have distinct encoding to read and write properties files Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2011-05-10 20:11:19 UTC (rev 1916) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2011-05-10 20:16:51 UTC (rev 1917) @@ -26,7 +26,6 @@ package org.nuiton.i18n.plugin.bundle; import org.nuiton.i18n.plugin.AbstractI18nMojo; -import org.nuiton.plugin.PluginHelper; import java.io.File; import java.io.IOException; @@ -91,16 +90,4 @@ return bundleOut; } - /** - * @param src the source file to read - * @return the url instanciated from lines of the source file. - * @throws IOException if any pb while reading file - * @deprecated since 1.2.2, use the {@link PluginHelper#getLinesAsURL(File)} - * instead. - */ - @Deprecated - public static URL[] getLinesAsURL(File src) throws IOException { - return PluginHelper.getLinesAsURL(src); - } - } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2011-05-10 20:11:19 UTC (rev 1916) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2011-05-10 20:16:51 UTC (rev 1917) @@ -44,6 +44,26 @@ public abstract class AbstractMakeI18nBundleMojo extends AbstractI18nBundleMojo { /** + * Encoding used to load any i18n property files. + * + * If not defined, will use the {@link #encoding} parameter. + * + * @parameter expression="${i18n.bundleInputEncoding}" + * @since 2.4 + */ + protected String bundleInputEncoding; + + /** + * Encoding used to write any i18n property files. + * + * If not defined, will use the {@link #encoding} parameter. + * + * @parameter expression="${i18n.bundleOutputEncoding}" + * @since 2.4 + */ + protected String bundleOutputEncoding; + + /** * Root directory where to generate aggregated bundles (this directory will * be added as resources of the project). * @@ -53,7 +73,6 @@ */ protected File bundleOutputDir; - /** * Package name of the generate aggregated bundles. * @@ -152,13 +171,34 @@ // get the definitive folder where to generate bundles (including // bundle package) - + outputFolder = getBundleOutputFolder(); if (isVerbose()) { getLog().info("Will generates bundles in " + outputFolder); } createDirectoryIfNecessary(outputFolder); + + if (StringUtils.isEmpty(bundleInputEncoding)) { + + // use the default encoding + bundleInputEncoding = getEncoding(); + if (getLog().isDebugEnabled()) { + getLog().debug("Use as input encoding the default one : " + + bundleInputEncoding); + } + } + + if (StringUtils.isEmpty(bundleOutputEncoding)) { + + // use the default encoding + bundleOutputEncoding = getEncoding(); + + if (getLog().isDebugEnabled()) { + getLog().debug("Use as output encoding the default one : " + + bundleOutputEncoding); + } + } } protected void failsIfWarning() throws MojoFailureException { @@ -235,4 +275,12 @@ return result; } + public String getBundleOutputEncoding() { + return bundleOutputEncoding; + } + + public String getBundleInputEncoding() { + return bundleInputEncoding; + } + } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2011-05-10 20:11:19 UTC (rev 1916) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2011-05-10 20:16:51 UTC (rev 1917) @@ -25,6 +25,8 @@ package org.nuiton.i18n.plugin.bundle; +import org.apache.commons.lang.StringUtils; +import org.apache.maven.plugin.MojoExecutionException; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -95,13 +97,31 @@ */ protected Map<String, BundleFormatConverter> bundleFormatConverters; + /** Format converter to apply if */ + protected BundleFormatConverter converter; + @Override public void init() throws Exception { super.init(); // add root bundle directory as resources of the project - + addResourceDir(bundleOutputDir, "**/*.properties"); + + if (StringUtils.isNotEmpty(bundleFormatConverter)) { + + // get converter from universe + converter = bundleFormatConverters.get(bundleFormatConverter); + + if (converter == null) { + + // unknown converter + throw new MojoExecutionException( + "There is no bundleFormatConverter named \"" + + bundleFormatConverter + "\", known ones are " + + bundleFormatConverters.keySet()); + } + } } @Override @@ -111,11 +131,18 @@ String version = getProject().getVersion(); version = PluginHelper.removeSnapshotSuffix(version); + String inputEncoding = getBundleInputEncoding(); + String outputEncoding = getBundleOutputEncoding(); + if (!silent) { getLog().info("config - resources dir : " + bundleOutputDir); getLog().info("config - package name : " + bundleOutputPackage); getLog().info("config - bundle name : " + bundleOutputName); - getLog().info("config - format converter : " + bundleFormatConverter); + getLog().info("config - input encoding : " + inputEncoding); + getLog().info("config - output encoding : " + outputEncoding); + if (bundleFormatConverter != null) { + getLog().info("config - format converter : " + bundleFormatConverter); + } getLog().info("config - locales : " + Arrays.toString(locales)); getLog().info("config - version : " + version); } @@ -134,7 +161,7 @@ ); SortedProperties propertiesOut = - new SortedProperties(encoding, false); + new SortedProperties(outputEncoding, false); StringBuilder buffer = new StringBuilder(); URL[] urls = getCollectI18nResources(locale); @@ -150,7 +177,7 @@ List<String> bundlesUrls = new ArrayList<String>(); - Charset loadEncoding = Charset.forName(encoding); + Charset loadEncoding = Charset.forName(inputEncoding); for (URL url : urls) { long t000 = System.nanoTime(); I18nBundleEntry bundleEntry = @@ -183,8 +210,8 @@ } // Apply conversion if necessary, depends on input bundleFormatConverter - if (bundleFormatConverter != null) { - applyConversion(propertiesOut, bundleFormatConverter); + if (converter != null) { + applyConversion(propertiesOut); } propertiesOut.store(bundleOut); @@ -258,20 +285,13 @@ } /** - * Apply conversion over {@code properties} with converter named - * {@code converterName}. + * Apply conversion over {@code properties} with internal converter. * * @param properties Properties to walk through - * @param converterName Name of the converter * @since 2.4 */ - protected void applyConversion(Properties properties, String converterName) { + protected void applyConversion(Properties properties) { - // Instantiate the converter - BundleFormatConverter converter = - bundleFormatConverters.get(converterName); - - // Apply conversion for (Entry<Object, Object> entry : properties.entrySet()) { String convertedValue = converter.convert((String) entry.getValue()); properties.setProperty((String) entry.getKey(), convertedValue);

1 0

r1916 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 10 May '11

10 May '11

Author: tchemit Date: 2011-05-10 22:11:19 +0200 (Tue, 10 May 2011) New Revision: 1916 Url: http://nuiton.org/repositories/revision/i18n/1916 Log: Evolution #1512: Depreciates the tapestry-bundle mojo Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2011-05-10 13:52:04 UTC (rev 1915) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2011-05-10 20:11:19 UTC (rev 1916) @@ -53,7 +53,10 @@ * @requiresProject true * @requiresDependencyResolution runtime * @since 1.2 + * @deprecated since 2.4, will not be replaced, use the simple {@code bundle} + * goal instead */ +@Deprecated public class TapestryBundleMojo extends AbstractMakeI18nBundleMojo { @Override

1 0

r1915 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by fdesbois＠users.nuiton.org 10 May '11

10 May '11

Author: fdesbois Date: 2011-05-10 15:52:04 +0200 (Tue, 10 May 2011) New Revision: 1915 Url: http://nuiton.org/repositories/revision/i18n/1915 Log: Improve format case, MessageFormat must format all messages even there is no args Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.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-05-10 13:44:53 UTC (rev 1914) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-05-10 13:52:04 UTC (rev 1915) @@ -217,12 +217,14 @@ I18nLanguage language = getLanguage(locale); String result = language.translate(message); - if (args.length == 0) { + // Don't check the length, this will be done directly in formatter if necessary. + // In MessageFormat case it must format all messages even there is no args (because of '' escape case). +// if (args.length == 0) { +// +// // no argument form translation +// return applyFilter(result); +// } - // no argument form translation - return applyFilter(result); - } - try { return applyFilter(formatter.format(locale, result, args)); } catch (Exception eee) { Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-10 13:44:53 UTC (rev 1914) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-10 13:52:04 UTC (rev 1915) @@ -50,7 +50,14 @@ @Override public String format(Locale locale, String message, Object... args) { - return String.format(locale, message, args); + String result; + // Previous behavior, no format will be done for empty args + if (args.length == 0) { + result = message; + } else { + result = String.format(locale, message, args); + } + return result; } },

1 0

r1914 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by fdesbois＠users.nuiton.org 10 May '11

10 May '11

Author: fdesbois Date: 2011-05-10 15:44:53 +0200 (Tue, 10 May 2011) New Revision: 1914 Url: http://nuiton.org/repositories/revision/i18n/1914 Log: useless last ; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-10 11:16:26 UTC (rev 1913) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFormat.java 2011-05-10 13:44:53 UTC (rev 1914) @@ -64,6 +64,6 @@ MessageFormat formatter = new MessageFormat(message, locale); return formatter.format(args); } - }; + } }

1 0