X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FL10nFilter.java;h=16dc9fbe280c169c79cd6e7b6e9e8f602cf3d49c;hb=c41176c97933de44f2d2df08249429cb427b2978;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..16dc9fb 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@ -20,11 +20,12 @@ 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.sone.web.WebInterface;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.TemplateContext;
-import freenet.l10n.BaseL10n;
 
 /**
  * {@link Filter} implementation replaces {@link String} values with their
@@ -34,17 +35,17 @@ import freenet.l10n.BaseL10n;
  */
 public class L10nFilter implements Filter {
 
-	/** The l10n handler. */
-	private final BaseL10n l10n;
+	/** The web interface. */
+	private final WebInterface webInterface;
 
 	/**
 	 * Creates a new L10n filter.
 	 *
-	 * @param l10n
-	 *            The l10n handler
+	 * @param webInterface
+	 *            The Sone web interface
 	 */
-	public L10nFilter(BaseL10n l10n) {
-		this.l10n = l10n;
+	public L10nFilter(WebInterface webInterface) {
+		this.webInterface = webInterface;
 	}
 
 	/**
@@ -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 webInterface.getL10n().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(webInterface.getL10n().getString(String.valueOf(data)), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(parameterValues.toArray());
 	}
 }