branch develop updated (9d150c8 -> 17272f0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git from 9d150c8 refs #4070: Try to update antlr new 17272f0 Do not use ConverterUtils, cause some linkage error in some special cases (Fixes #4144) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 17272f02e07c087e29722c7668e443eea94f1eda Author: Tony CHEMIT <dev@tchemit.fr> Date: Thu Feb 9 09:38:23 2017 +0100 Do not use ConverterUtils, cause some linkage error in some special cases (Fixes #4144) Summary of changes: nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 17272f02e07c087e29722c7668e443eea94f1eda Author: Tony CHEMIT <dev@tchemit.fr> Date: Thu Feb 9 09:38:23 2017 +0100 Do not use ConverterUtils, cause some linkage error in some special cases (Fixes #4144) --- nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java index 46d7523..8c9d2cd 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -27,7 +27,7 @@ package org.nuiton.i18n; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.converter.ConverterUtil; +import org.nuiton.converter.LocaleConverter; import org.nuiton.i18n.format.I18nMessageFormatter; import org.nuiton.i18n.format.StringFormatI18nMessageFormatter; @@ -70,6 +70,7 @@ public class I18nUtil { public static final Locale DEFAULT_LOCALE = Locale.UK; public static final String[] EMPTY_STRING_ARRAY = new String[0]; + public static final LocaleConverter LOCALE_CONVERTER = new LocaleConverter(); /** * Parse a list of {@link Locale} seperated by comma. @@ -87,7 +88,7 @@ public class I18nUtil { String s = bundlesToUse[i].trim(); // on devrait verifier que le bundle existe try { - Locale l = (Locale) ConverterUtil.convert(Locale.class, s); + Locale l = LOCALE_CONVERTER.valueOf(s); result.add(l); } catch (Exception e) { throw new IllegalArgumentException("bundle " + s + @@ -104,7 +105,7 @@ public class I18nUtil { return newLocale(null, null); } try { - return ConverterUtil.convert(Locale.class, str); + return LOCALE_CONVERTER.valueOf(str); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("could not load locale '" + str + -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm