X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fi18n%2FLocaleUtils.java;h=700e731058037a26a2da15c998910b315523332c;hb=914f28bff086f27218c7e657428fd68fa44b0d15;hp=6253e585beeb50b25420f967157fc6d0e92718f9;hpb=972528f4de2d00690362c01d3ce843ca9cd10250;p=lgpl%2Fargeo-commons.git 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 6253e585b..700e73105 100644 --- a/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/i18n/LocaleUtils.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Locale; import java.util.ResourceBundle; -import org.argeo.eclipse.ui.specific.UiContext; - /** Utilities simplifying the development of localization enums. */ public class LocaleUtils { public static Object local(Enum en) { @@ -21,10 +19,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 +37,9 @@ public class LocaleUtils { } static Locale getCurrentLocale() { - return UiContext.getLocale(); + // return UiContext.getLocale(); + // FIXME look into Subject or settings + return Locale.getDefault(); } /** Returns null if argument is null. */