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=d291e9d414b3d4ce0111b3edf1c1ff85963b9294;hb=47aa7641e6b1ce74178c559fbad67bc9fb012a88;hpb=aa5723dbb64ec8efa63909d39ff72364f0a5ee96 diff --git a/src/org/cacert/gigi/output/template/TranslateCommand.java b/src/org/cacert/gigi/output/template/TranslateCommand.java index d291e9d4..7bb60112 100644 --- a/src/org/cacert/gigi/output/template/TranslateCommand.java +++ b/src/org/cacert/gigi/output/template/TranslateCommand.java @@ -1,6 +1,7 @@ package org.cacert.gigi.output.template; import java.io.PrintWriter; +import java.io.Serializable; import java.util.Collection; import java.util.Map; @@ -10,7 +11,9 @@ import org.cacert.gigi.util.HTMLEncoder; /** * Wraps a String that needs to be translated before it is printed to the user. */ -public final class TranslateCommand implements Translatable { +public final class TranslateCommand implements Translatable, Serializable { + + private static final long serialVersionUID = 1L; private final String raw; @@ -26,7 +29,12 @@ public final class TranslateCommand implements Translatable { @Override public void output(PrintWriter out, Language l, Map vars) { - out.print(HTMLEncoder.encodeHTML(l.getTranslation(raw))); + String translation = l.getTranslation(raw); + if (vars.containsKey(Outputable.OUT_KEY_PLAIN)) { + out.print(translation); + } else { + out.print(HTMLEncoder.encodeHTML(translation)); + } } /**