X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FLocaleUtils.java;h=8aca8768a04d9e3af196ce9690ea449ba1d7d651;hb=0e533d2562def311fdd7aa71f1d0d704e466861e;hp=8101563d95e9fee6bbe3c4c6d51510206e5c0cc1;hpb=dc52678dfc8c4506ee9cbb452ab2a7de380be43d;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..8aca8768a 100644
--- a/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java
@@ -1,22 +1,15 @@
 package org.argeo.cms;
 
-import java.security.AccessController;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import javax.security.auth.Subject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.auth.CurrentUser;
+import org.argeo.api.cms.CmsLog;
 
 /** 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<Locale> threadLocale = new ThreadLocal<>();
 
@@ -65,9 +58,10 @@ public class LocaleUtils {
 	/** Where the search for a message is actually performed. */
 	public static String local(String key, Locale locale, String resource, ClassLoader classLoader) {
 		ResourceBundle rb = ResourceBundle.getBundle(resource, locale, classLoader);
-		assert key.length() > 2;
-		if (isLocaleKey(key))
+		if (isLocaleKey(key)) {
+			assert key.length() > 1;
 			key = key.substring(1);
+		}
 		if (rb.containsKey(key))
 			return rb.getString(key);
 		else // for simple cases, the key will actually be the English word
@@ -94,7 +88,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) {
@@ -103,7 +97,7 @@ public class LocaleUtils {
 
 	static Locale getCurrentLocale() {
 		Locale currentLocale = null;
-		if (Subject.getSubject(AccessController.getContext()) != null)
+		if (CurrentUser.isAvailable())
 			currentLocale = CurrentUser.locale();
 		else if (threadLocale.get() != null) {
 			currentLocale = threadLocale.get();
@@ -119,26 +113,4 @@ public class LocaleUtils {
 		// return Locale.getDefault();
 	}
 
-	/** Returns null if argument is null. */
-	public static List<Locale> asLocaleList(Object locales) {
-		if (locales == null)
-			return null;
-		ArrayList<Locale> availableLocales = new ArrayList<Locale>();
-		String[] codes = locales.toString().split(",");
-		for (int i = 0; i < codes.length; i++) {
-			String code = codes[i];
-			// variant not supported
-			int indexUnd = code.indexOf("_");
-			Locale locale;
-			if (indexUnd > 0) {
-				String language = code.substring(0, indexUnd);
-				String country = code.substring(indexUnd + 1);
-				locale = new Locale(language, country);
-			} else {
-				locale = new Locale(code);
-			}
-			availableLocales.add(locale);
-		}
-		return availableLocales;
-	}
 }