Keyring working for E4

[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 700e731058037a26a2da15c998910b315523332c..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,6 +5,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import org.argeo.cms.auth.CurrentUser;
+
 /** Utilities simplifying the development of localization enums. */
 public class LocaleUtils {
        public static Object local(Enum<?> en) {
@@ -37,9 +39,10 @@ public class LocaleUtils {
        }
 
        static Locale getCurrentLocale() {
+               return CurrentUser.locale();
                // return UiContext.getLocale();
                // FIXME look into Subject or settings
-               return Locale.getDefault();
+               // return Locale.getDefault();
        }
 
        /** Returns null if argument is null. */