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

diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/org/cacert/gigi/output/template/TranslateCommand.java
index fdb35a96..7bb60112 100644
--- a/src/org/cacert/gigi/output/template/TranslateCommand.java
+++ b/src/org/cacert/gigi/output/template/TranslateCommand.java
@@ -1,20 +1,53 @@
 package org.cacert.gigi.output.template;
 
 import java.io.PrintWriter;
+import java.io.Serializable;
+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, Serializable {
 
-	TranslateCommand(String raw) {
-		this.raw = raw;
-	}
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-		out.print(l.getTranslation(raw));
-	}
-}
\ No newline at end of file
+    private final String raw;
+
+    /**
+     * 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) {
+        String translation = l.getTranslation(raw);
+        if (vars.containsKey(Outputable.OUT_KEY_PLAIN)) {
+            out.print(translation);
+        } else {
+            out.print(HTMLEncoder.encodeHTML(translation));
+        }
+    }
+
+    /**
+     * 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);
+    }
+}