X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FL10nFilter.java;h=229b8e140fb78c90d0a9b8d3a862e85d438635e5;hp=c8075c51c4de7717e9ccc0c103de1ec9ef54d3c5;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=629ddb006542df2b671e172d8f544815bbab639b

diff --git a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
index c8075c5..229b8e1 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–2013 David Roden
+ * Sone - L10nFilter.java - Copyright © 2010–2016 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,6 +23,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.TemplateContext;
@@ -30,8 +32,6 @@ import net.pterodactylus.util.template.TemplateContext;
 /**
  * {@link Filter} implementation replaces {@link String} values with their
  * translated equivalents.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class L10nFilter implements Filter {
 
@@ -53,8 +53,23 @@ public class L10nFilter implements Filter {
 	 */
 	@Override
 	public String format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
-		if (parameters.isEmpty()) {
-			return webInterface.getL10n().getString(String.valueOf(data));
+		List<Object> parameterValues = getParameters(data, parameters);
+		String text = getText(data);
+		if (parameterValues.isEmpty()) {
+			return webInterface.getL10n().getString(text);
+		}
+		return new MessageFormat(webInterface.getL10n().getString(text), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(parameterValues.toArray());
+	}
+
+	@Nonnull
+	private String getText(Object data) {
+		return (data instanceof L10nText) ? ((L10nText) data).getText() : String.valueOf(data);
+	}
+
+	@Nonnull
+	private List<Object> getParameters(Object data, Map<String, Object> parameters) {
+		if (data instanceof L10nText) {
+			return ((L10nText) data).getParameters();
 		}
 		List<Object> parameterValues = new ArrayList<Object>();
 		int parameterIndex = 0;
@@ -63,7 +78,7 @@ public class L10nFilter implements Filter {
 			parameterValues.add(value);
 			++parameterIndex;
 		}
-		return new MessageFormat(webInterface.getL10n().getString(String.valueOf(data)), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(parameterValues.toArray());
+		return parameterValues;
 	}
 
 }