UPD: Move some template classes to there reightful place.

[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 42ed9570d514fd3498c7ddd1504b50a3c4dce6e9..e2ff0ba6ce6395c4bfd3e3e8c587bc3c572c13fa 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -1,29 +1,40 @@
 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.Language;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.util.HTMLEncoder;
 
 public final class SprintfCommand implements Outputable {
-       private final String text;
-       private final LinkedList<String> store;
 
-       public SprintfCommand(String text, LinkedList<String> store) {
-               this.text = text;
-               this.store = store;
-       }
+    private final String text;
 
-       @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()]);
-               out.print(parts[0]);
-               for (int j = 1; j < parts.length; j++) {
-                       Template.outputVar(out, l, vars, myvars[j - 1].substring(1));
-                       out.print(parts[j]);
-               }
-       }
-}
\ No newline at end of file
+    private final String[] store;
+
+    public SprintfCommand(String text, List<String> store) {
+        this.text = text;
+        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", -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(HTMLEncoder.encodeHTML(var.substring(1)));
+            } else {
+                Template.outputVar(out, l, vars, myvars[j - 1].substring(1), false);
+            }
+            out.print(HTMLEncoder.encodeHTML(parts[j]));
+        }
+    }
+}