FIX: a bug in evaluating sprintf-template-statments

[gigi.git] / src / org / cacert / gigi / output / template / SprintfCommand.java

diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java
index 1a3c29084e5d95bf2384f9301575a3a07b5ae85a..17ef23a8240d7181c428b2d432ac371ca3c0f6d2 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -4,8 +4,9 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.util.HTMLEncoder;
 
 public final class SprintfCommand implements Outputable {
 
@@ -20,12 +21,21 @@ public final class SprintfCommand implements Outputable {
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-        String[] parts = l.getTranslation(text).split("%s");
+        String[] parts = l.getTranslation(text).split("%s", -1);
         String[] myvars = store.toArray(new String[store.size()]);
-        out.print(parts[0]);
+        out.print(HTMLEncoder.encodeHTML(parts[0]));
         for (int j = 1; j < parts.length; j++) {
-            Template.outputVar(out, l, vars, myvars[j - 1].substring(1));
-            out.print(parts[j]);
+            String var = myvars[j - 1];
+            if (var.startsWith("$!")) {
+                Template.outputVar(out, l, vars, myvars[j - 1].substring(2), true);
+            } else if (var.startsWith("!\"")) {
+                out.print(var.substring(2));
+            } else if (var.startsWith("\"")) {
+                out.print(HTMLEncoder.encodeHTML(var.substring(1)));
+            } else {
+                Template.outputVar(out, l, vars, myvars[j - 1].substring(1), false);
+            }
+            out.print(HTMLEncoder.encodeHTML(parts[j]));
         }
     }
 }