UPD: Move some template classes to there reightful place.

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

diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index 69f17bda11db9cf6774e74e1f146aa6c0af2d88e..0bd9cce170096b4d4088ed158edca8c4f9dfb459 100644 (file)
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -16,7 +16,6 @@ import java.util.regex.Pattern;
 
 import org.cacert.gigi.DevelLauncher;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {
@@ -121,10 +120,10 @@ public class Template implements Outputable {
         } else if (s2.startsWith("=s,")) {
             String command = s2.substring(3);
             final LinkedList<String> store = new LinkedList<String>();
-            while (command.startsWith("$") || command.startsWith("\"")) {
+            while (command.startsWith("$") || command.startsWith("\"") || command.startsWith("!\"")) {
                 int idx;
-                if (command.startsWith("\"")) {
-                    idx = command.indexOf("\"", 1) + 1;
+                if (command.startsWith("\"") || command.startsWith("!\"")) {
+                    idx = command.indexOf("\"", command.charAt(0) == '!' ? 2 : 1) + 1;
                     store.add(command.substring(0, idx - 1));
                 } else {
                     idx = command.indexOf(",");