X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2FL10nFilter.java;h=e56321d91b71229ec5353491167377956c07bfe0;hb=8dbd4962313978d19dd464ead0b413d405921ae3;hp=36ac8cdcf93e0d77efca9e85bb23cd2cbd175147;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;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 36ac8cd..e56321d 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 @@ -53,6 +53,13 @@ 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()); + } if (parameters.isEmpty()) { return webInterface.getL10n().getString(String.valueOf(data)); } @@ -65,4 +72,5 @@ public class L10nFilter implements Filter { } return new MessageFormat(webInterface.getL10n().getString(String.valueOf(data)), new Locale(webInterface.getL10n().getSelectedLanguage().shortCode)).format(parameterValues.toArray()); } + }