X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateIterable.java;h=f24d7782ce060e54896feb566269d5bad318a48e;hb=d7be034f96e06985f57d86d2779c434276b5bd4d;hp=380b7a77ec5c58fff93334e67a185f8c6a9c75d1;hpb=b0ef15735933668691360622be28aa104ae24416;p=gigi.git diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java index 380b7a77..f24d7782 100644 --- a/src/org/cacert/gigi/output/CertificateIterable.java +++ b/src/org/cacert/gigi/output/CertificateIterable.java @@ -26,7 +26,7 @@ public class CertificateIterable implements IterableDataset { return false; } Certificate c = certificates[i++]; - vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase())); + vars.put("state", c.getStatus()); vars.put("CN", c.getDistinguishedName()); vars.put("serial", c.getSerial()); vars.put("digest", c.getMessageDigest()); @@ -36,14 +36,14 @@ public class CertificateIterable implements IterableDataset { vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED); if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) { X509Certificate cert = c.cert(); - vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore())); - vars.put("expire", DateSelector.getDateFormat().format(cert.getNotAfter())); + vars.put("issued", cert.getNotBefore()); + vars.put("expire", cert.getNotAfter()); } else { vars.put("issued", l.getTranslation("N/A")); vars.put("expire", l.getTranslation("N/A")); } if (st == CertificateStatus.REVOKED) { - vars.put("revoked", DateSelector.getDateFormat().format(c.getRevocationDate())); + vars.put("revoked", c.getRevocationDate()); } else { vars.put("revoked", "n/a"); }