Improve internationalization.

diff --git a/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java b/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java
index 8101563d95e9fee6bbe3c4c6d51510206e5c0cc1..ec8c97f79e58a7551db78c479da1e542530bac2c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/LocaleUtils.java
@@ -94,7 +94,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) {

diff --git a/org.argeo.cms/src/org/argeo/cms/Localized.java b/org.argeo.cms/src/org/argeo/cms/Localized.java
index 0a3bd18a862fd73a048a0993242b5d0c00c2d805..1a8c597157a4e1c67383014df052fbef64af75df 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/Localized.java
+++ b/org.argeo.cms/src/org/argeo/cms/Localized.java
@@ -8,6 +8,10 @@ import java.util.Locale;
 public interface Localized {
        String name();
 
+       default ClassLoader getL10nClassLoader() {
+               return getClass().getClassLoader();
+       }
+
        /** Default assumes that this is an {@link Enum} */
        default String local(Locale locale) {
                return LocaleUtils.local(this, locale);
@@ -30,7 +34,7 @@ public interface Localized {
        default String lead(Locale locale) {
                return LocaleUtils.toLead(local(locale).toString(), locale);
        }
-       
+
        static class Untranslated implements Localized {
                private String msg;