Log message for OSGi exceptions

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / i18n / LocaleUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java b/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java
index 6253e585beeb50b25420f967157fc6d0e92718f9..e0a77bcf3bdda1d6abbf401adc7b8378cc1f086a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.argeo.eclipse.ui.specific.UiContext;
+import org.argeo.cms.auth.CurrentUser;
 
 /** Utilities simplifying the development of localization enums. */
 public class LocaleUtils {
@@ -21,10 +21,8 @@ public class LocaleUtils {
                return local(en, locale, resource, en.getClass().getClassLoader());
        }
 
-       public static Object local(Enum<?> en, Locale locale, String resource,
-                       ClassLoader classLoader) {
-               ResourceBundle rb = ResourceBundle.getBundle(resource, locale,
-                               classLoader);
+       public static Object local(Enum<?> en, Locale locale, String resource, ClassLoader classLoader) {
+               ResourceBundle rb = ResourceBundle.getBundle(resource, locale, classLoader);
                return rb.getString(en.name());
        }
 
@@ -41,7 +39,10 @@ public class LocaleUtils {
        }
 
        static Locale getCurrentLocale() {
-               return UiContext.getLocale();
+               return CurrentUser.locale();
+               // return UiContext.getLocale();
+               // FIXME look into Subject or settings
+               // return Locale.getDefault();
        }
 
        /** Returns null if argument is null. */