add tests + fix in locale

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/locale/LocalizableStringBuffer.java

@@ -1,73 +1,73 @@
-package net.lecousin.framework.locale;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import net.lecousin.framework.concurrent.synch.AsyncWork;
-import net.lecousin.framework.concurrent.synch.JoinPoint;
-import net.lecousin.framework.exception.NoException;
-
-/**
- * List of objects to concatenate to form a string, in which any object implementing ILocalizableString will be localized.
- */
-public class LocalizableStringBuffer implements ILocalizableString {
-
-	/** Constructor. */
-	public LocalizableStringBuffer(Object... list) {
-		for (int i = 0; i < list.length; ++i)
-			this.list.add(list[i]);
-	}
-	
-	private LinkedList<Object> list = new LinkedList<>();
-	
-	/** Append the given object. */
-	public void add(Object string) {
-		list.add(string);
-	}
-	
-	@Override
-	public AsyncWork<String, NoException> localize(String[] languageTag) {
-		JoinPoint<NoException> jp = new JoinPoint<>();
-		List<AsyncWork<String, NoException>> list = new LinkedList<>();
-		for (Object o : list)
-			if (o instanceof ILocalizableString) {
-				AsyncWork<String, NoException> l = ((ILocalizableString)o).localize(languageTag);
-				jp.addToJoin(l);
-				list.add(l);
-			}
-		AsyncWork<String, NoException> result = new AsyncWork<>();
-		jp.start();
-		jp.listenInline(new Runnable() {
-			@Override
-			public void run() {
-				Iterator<AsyncWork<String, NoException>> it = list.iterator();
-				StringBuffer s = new StringBuffer();
-				for (Object o : list) {
-					if (o instanceof String)
-						s.append((String)o);
-					else if (o instanceof ILocalizableString)
-						s.append(it.next().getResult());
-					else
-						s.append(o);
-				}
-				result.unblockSuccess(s.toString());
-			}
-		});
-		return result;
-	}
-	
-	@Override
-	public String localizeSync(String[] languageTag) {
-		StringBuffer s = new StringBuffer();
-		for (Object o : list) {
-			if (o instanceof String)
-				s.append((String)o);
-			else if (o instanceof ILocalizableString)
-				s.append(((ILocalizableString)o).localizeSync(languageTag));
-			else
-				s.append(o);
-		}
-		return s.toString();
-	}
-}
+package net.lecousin.framework.locale;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import net.lecousin.framework.concurrent.synch.AsyncWork;
+import net.lecousin.framework.concurrent.synch.JoinPoint;
+import net.lecousin.framework.exception.NoException;
+
+/**
+ * List of objects to concatenate to form a string, in which any object implementing ILocalizableString will be localized.
+ */
+public class LocalizableStringBuffer implements ILocalizableString {
+
+	/** Constructor. */
+	public LocalizableStringBuffer(Object... list) {
+		for (int i = 0; i < list.length; ++i)
+			this.list.add(list[i]);
+	}
+	
+	private LinkedList<Object> list = new LinkedList<>();
+	
+	/** Append the given object. */
+	public void add(Object string) {
+		list.add(string);
+	}
+	
+	@Override
+	public AsyncWork<String, NoException> localize(String[] languageTag) {
+		JoinPoint<NoException> jp = new JoinPoint<>();
+		List<AsyncWork<String, NoException>> list = new LinkedList<>();
+		for (Object o : this.list)
+			if (o instanceof ILocalizableString) {
+				AsyncWork<String, NoException> l = ((ILocalizableString)o).localize(languageTag);
+				jp.addToJoin(l);
+				list.add(l);
+			}
+		AsyncWork<String, NoException> result = new AsyncWork<>();
+		jp.start();
+		jp.listenInline(new Runnable() {
+			@Override
+			public void run() {
+				Iterator<AsyncWork<String, NoException>> it = list.iterator();
+				StringBuffer s = new StringBuffer();
+				for (Object o : LocalizableStringBuffer.this.list) {
+					if (o instanceof String)
+						s.append((String)o);
+					else if (o instanceof ILocalizableString)
+						s.append(it.next().getResult());
+					else
+						s.append(o);
+				}
+				result.unblockSuccess(s.toString());
+			}
+		});
+		return result;
+	}
+	
+	@Override
+	public String localizeSync(String[] languageTag) {
+		StringBuffer s = new StringBuffer();
+		for (Object o : list) {
+			if (o instanceof String)
+				s.append((String)o);
+			else if (o instanceof ILocalizableString)
+				s.append(((ILocalizableString)o).localizeSync(languageTag));
+			else
+				s.append(o);
+		}
+		return s.toString();
+	}
+}

net.lecousin.core/src/main/java/net/lecousin/framework/locale/LocalizedProperties.java

@@ -306,7 +306,7 @@ public void run() {
 					if (!lang.loading.hasError())
 						content = lang.properties.get(key.toLowerCase());
 					if (content != null) {
-						localize(key, content, values, result);
+						localize(lang.tag, key, content, values, result);
 						lang.lastUsage = System.currentTimeMillis();
 						return;
 					}
@@ -321,7 +321,19 @@ public void run() {
 			load(ns, lang);
 	}
 
-	private static void localize(String key, String content, Object[] values, AsyncWork<String, NoException> result) {
+	private static void localize(String[] languageTag, String key, String content, Object[] values, AsyncWork<String, NoException> result) {
+		for (int i = 0; i < values.length; ++i)
+			if (values[i] instanceof ILocalizableString) {
+				AsyncWork<String, NoException> l = ((ILocalizableString)values[i]).localize(languageTag);
+				Object[] newValues = new Object[values.length];
+				System.arraycopy(values, 0, newValues, 0, values.length);
+				int ii = i;
+				l.listenAsync(new Task.Cpu.FromRunnable(() -> {
+					newValues[ii] = l.getResult();
+					localize(languageTag, key, content, newValues, result);
+				}, "Localization", Task.PRIORITY_NORMAL), true);
+				return;
+			}
 		result.unblockSuccess(setCase(replaceValues(content, values), key));
 	}