X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2Ftemplate%2FSprintfCommand.java;h=47389643995640afa854a63469abfc345b45bbf9;hp=e2ff0ba6ce6395c4bfd3e3e8c587bc3c572c13fa;hb=0d1d3c357c8274c519270abc61b668bff637c40a;hpb=9136e3e03b6881b32aada896be3241e46cbd33d9

diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java
index e2ff0ba6..47389643 100644
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -1,8 +1,11 @@
 package org.cacert.gigi.output.template;
 
 import java.io.PrintWriter;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.util.HTMLEncoder;
@@ -18,23 +21,56 @@ public final class SprintfCommand implements Outputable {
         this.store = store.toArray(new String[store.size()]);
     }
 
+    private static final String VARIABLE = "\\$!?\\{[a-zA-Z0-9_-]+\\}";
+
+    private static final Pattern processingInstruction = Pattern.compile("(" + VARIABLE + ")|(!'[^{}'\\$]*)'");
+
+    public SprintfCommand(String content) {
+        StringBuffer raw = new StringBuffer();
+        List<String> var = new LinkedList<String>();
+        int counter = 0;
+        Matcher m = processingInstruction.matcher(content);
+        int last = 0;
+        while (m.find()) {
+            raw.append(content.substring(last, m.start()));
+            String group = null;
+            if ((group = m.group(1)) != null) {
+                var.add(group);
+            } else if ((group = m.group(2)) != null) {
+                var.add(group);
+            } else {
+                throw new Error("Regex is broken??");
+            }
+            last = m.end();
+            raw.append("{" + (counter++) + "}");
+        }
+        raw.append(content.substring(last));
+        text = raw.toString();
+        store = var.toArray(new String[var.size()]);
+    }
+
+    private final Pattern replacant = Pattern.compile("\\{([0-9]+)\\}");
+
     @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];
+        String parts = l.getTranslation(text);
+        Matcher m = replacant.matcher(parts);
+        int pos = 0;
+        while (m.find()) {
+            out.print(HTMLEncoder.encodeHTML(parts.substring(pos, m.start())));
+            String var = store[Integer.parseInt(m.group(1))];
             if (var.startsWith("$!")) {
-                Template.outputVar(out, l, vars, myvars[j - 1].substring(2), true);
-            } else if (var.startsWith("!\"")) {
+                Template.outputVar(out, l, vars, var.substring(3, var.length() - 1), true);
+            } else if (var.startsWith("!'")) {
                 out.print(var.substring(2));
-            } else if (var.startsWith("\"")) {
-                out.print(HTMLEncoder.encodeHTML(var.substring(1)));
+            } else if (var.startsWith("$")) {
+                Template.outputVar(out, l, vars, var.substring(2, var.length() - 1), false);
             } else {
-                Template.outputVar(out, l, vars, myvars[j - 1].substring(1), false);
+                throw new Error("Processing error in template.");
             }
-            out.print(HTMLEncoder.encodeHTML(parts[j]));
+            pos = m.end();
+
         }
+        out.print(HTMLEncoder.encodeHTML(parts.substring(pos)));
     }
 }