X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FL10nFilter.java;h=229b8e140fb78c90d0a9b8d3a862e85d438635e5;hb=62573c314957b1851f4fbe693b8746686caa940a;hp=e56321d91b71229ec5353491167377956c07bfe0;hpb=8dbd4962313978d19dd464ead0b413d405921ae3;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 e56321d..229b8e1 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@ -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 David âBombeâ Roden
*/
public class L10nFilter implements Filter {
@@ -53,15 +53,23 @@ public class L10nFilter implements Filter {
*/
@Override
public String format(TemplateContext templateContext, Object data, Map parameters) {
- if (data instanceof L10nText) {
- L10nText l10nText = (L10nText) data;
- if (l10nText.getParameters().isEmpty()) {
- return webInterface.getL10n().getString(l10nText.getText());
- }
- return new MessageFormat(webInterface.getL10n().getString(l10nText.getText()), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(l10nText.getParameters().toArray());
+ List