add: guide the user back when ttp request is missing.

[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 0275219b983366b1781e579260ab48f0d602233c..8d42af44f4b76f5e7fff844a8e6d28f20604dff7 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -1,7 +1,7 @@
 package org.cacert.gigi.output.template;
 
 import java.io.PrintWriter;
-import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 import org.cacert.gigi.localisation.Language;
@@ -12,24 +12,26 @@ public final class SprintfCommand implements Outputable {
 
     private final String text;
 
-    private final LinkedList<String> store;
+    private final String[] store;
 
-    public SprintfCommand(String text, LinkedList<String> store) {
+    public SprintfCommand(String text, List<String> store) {
         this.text = text;
-        this.store = store;
+        this.store = store.toArray(new String[store.size()]);
     }
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-        String[] parts = l.getTranslation(text).split("%s");
-        String[] myvars = store.toArray(new String[store.size()]);
+        String[] parts = l.getTranslation(text).split("%s", -1);
+        String[] myvars = store;
         out.print(HTMLEncoder.encodeHTML(parts[0]));
         for (int j = 1; j < parts.length; 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(var.substring(1));
+                out.print(HTMLEncoder.encodeHTML(var.substring(1)));
             } else {
                 Template.outputVar(out, l, vars, myvars[j - 1].substring(1), false);
             }