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

diff --git a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
index 910e0d6..b547a53 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - L10nFilter.java - Copyright © 2010 David Roden
+ * Sone - L10nFilter.java - Copyright © 2010–2015 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,9 +23,9 @@ 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
@@ -35,39 +35,35 @@ 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;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public String format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+	public String format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
 		if (parameters.isEmpty()) {
-			return l10n.getString(String.valueOf(data));
+			return webInterface.getL10n().getString(String.valueOf(data));
 		}
 		List<Object> parameterValues = new ArrayList<Object>();
 		int parameterIndex = 0;
 		while (parameters.containsKey(String.valueOf(parameterIndex))) {
 			Object value = parameters.get(String.valueOf(parameterIndex));
-			if (((String) value).startsWith("=")) {
-				value = ((String) value).substring(1);
-			} else {
-				value = templateContext.get((String) value);
-			}
 			parameterValues.add(value);
 			++parameterIndex;
 		}
-		return new MessageFormat(l10n.getString(String.valueOf(data)), new Locale(l10n.getSelectedLanguage().shortCode)).format(parameterValues.toArray());
+		return new MessageFormat(webInterface.getL10n().getString(String.valueOf(data)), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(parameterValues.toArray());
 	}
+
 }