X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2Ftemplate%2FTemplate.java;h=01d5bbd3d48348cea55c840b03006d10e9aea495;hp=da94098afca208430009e59b0fcfa89c6dab1acf;hb=ad86421f667d8f7ea22a4c01d1287c33847f3a63;hpb=aad46870b1b7d7d4badf831b355669199c5ce830 diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java index da94098a..01d5bbd3 100644 --- a/src/org/cacert/gigi/output/template/Template.java +++ b/src/org/cacert/gigi/output/template/Template.java @@ -9,6 +9,7 @@ import java.io.PrintWriter; import java.io.Reader; import java.net.URISyntaxException; import java.net.URL; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedList; import java.util.Map; @@ -16,7 +17,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.DateSelector; import org.cacert.gigi.util.HTMLEncoder; public class Template implements Outputable { @@ -190,7 +190,8 @@ public class Template implements Outputable { if (s instanceof Outputable) { ((Outputable) s).output(out, l, vars); } else if (s instanceof Date) { - out.print(DateSelector.getDateFormat().format(s)); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + out.print(sdf.format(s)); } else { out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString()))); }