X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FLocaleUtils.java;h=f02e6a2b4439f57a3e5a23f69aaecbda3dcf1c46;hb=e5a22cdc7d0f4918f2740c626e1ab6384bd5ee44;hp=8101563d95e9fee6bbe3c4c6d51510206e5c0cc1;hpb=11c9710b1d2456c8304a5841d775af008a794431;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java b/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java index 8101563d9..f02e6a2b4 100644 --- a/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java @@ -8,15 +8,14 @@ import java.util.ResourceBundle; import javax.security.auth.Subject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.auth.CurrentUser; /** Utilities simplifying the development of localization enums. */ public class LocaleUtils { final static String DEFAULT_OSGI_l10N_BUNDLE = "/OSGI-INF/l10n/bundle"; - private final static Log log = LogFactory.getLog(LocaleUtils.class); + private final static CmsLog log = CmsLog.getLog(LocaleUtils.class); private final static ThreadLocal threadLocale = new ThreadLocal<>(); @@ -94,7 +93,7 @@ public class LocaleUtils { } public static String lead(Localized localized) { - return lead(localized, getCurrentLocale()); + return lead(localized, localized.getL10nClassLoader()); } public static String lead(Localized localized, Locale locale) {