Merge branch 'initial-sone-discovery' into next

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / L10nFilter.java

diff --git a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
index a9d1d72..910e0d6 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java
@@ -20,6 +20,7 @@ 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.util.template.Filter;
@@ -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 l10n.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(l10n.getString(String.valueOf(data)), new Locale(l10n.getSelectedLanguage().shortCode)).format(parameterValues.toArray());
        }
 }