X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FL10nFilter.java;h=910e0d6a0e39b9dddd80ff1ab2c8639d6e96754f;hb=e4ae59234c87e77f95714462adae370790c6d5e6;hp=a9d1d7231195607c8b0002c8c2e2421d2f3f5ac0;hpb=29b5ba6409b0843b2bd881e605181ecf30464b68;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
index a9d1d72..910e0d6 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.freenet;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import net.pterodactylus.util.template.Filter;
@@ -52,6 +53,9 @@ public class L10nFilter implements Filter {
 	 */
 	@Override
 	public String format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+		if (parameters.isEmpty()) {
+			return l10n.getString(String.valueOf(data));
+		}
 		List<Object> parameterValues = new ArrayList<Object>();
 		int parameterIndex = 0;
 		while (parameters.containsKey(String.valueOf(parameterIndex))) {
@@ -64,6 +68,6 @@ public class L10nFilter implements Filter {
 			parameterValues.add(value);
 			++parameterIndex;
 		}
-		return new MessageFormat(l10n.getString(String.valueOf(data))).format(parameterValues.toArray());
+		return new MessageFormat(l10n.getString(String.valueOf(data)), new Locale(l10n.getSelectedLanguage().shortCode)).format(parameterValues.toArray());
 	}
 }