X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2Ftemplate%2FTranslateCommand.java;h=d291e9d414b3d4ce0111b3edf1c1ff85963b9294;hb=449f75a2b5d97ebf34bec2df715b71aa7e31afb0;hp=fdb35a96bcbc2c6103fcd9a28588c0905bd23e4f;hpb=ffab4ac1fae1a58919c7dde59d90c75df096512c;p=gigi.git

diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/org/cacert/gigi/output/template/TranslateCommand.java
index fdb35a96..d291e9d4 100644
--- a/src/org/cacert/gigi/output/template/TranslateCommand.java
+++ b/src/org/cacert/gigi/output/template/TranslateCommand.java
@@ -1,20 +1,45 @@
 package org.cacert.gigi.output.template;
 
 import java.io.PrintWriter;
+import java.util.Collection;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.HTMLEncoder;
 
-final class TranslateCommand implements Outputable {
-	private final String raw;
+/**
+ * Wraps a String that needs to be translated before it is printed to the user.
+ */
+public final class TranslateCommand implements Translatable {
 
-	TranslateCommand(String raw) {
-		this.raw = raw;
-	}
+    private final String raw;
 
-	@Override
-	public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-		out.print(l.getTranslation(raw));
-	}
-}
\ No newline at end of file
+    /**
+     * Creates a new TranslateCommand that wraps the given String.
+     * 
+     * @param raw
+     *            the String to be translated.
+     */
+    public TranslateCommand(String raw) {
+        this.raw = raw;
+    }
+
+    @Override
+    public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+        out.print(HTMLEncoder.encodeHTML(l.getTranslation(raw)));
+    }
+
+    /**
+     * Gets the raw, untranslated String.
+     * 
+     * @return the raw, untranslated String.
+     */
+    public String getRaw() {
+        return raw;
+    }
+
+    @Override
+    public void addTranslations(Collection<String> s) {
+        s.add(raw);
+    }
+}