X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=5dfaa5d6a1709ae88727979633fc594b58e7fe86;hb=2f50dbb24105e6345329b8e9ecb5ef4d67ab2a8c;hp=8e66c7f30c3d98c3b123ef9f6f5c73114aa95905;hpb=a0232b6e40e7e09767f0444d24e18bf12dafc362;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 8e66c7f3..5dfaa5d6 100644
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -19,6 +19,8 @@ import java.util.Map.Entry;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
+import org.cacert.gigi.output.template.Outputable;
+import org.cacert.gigi.output.template.TranslateCommand;
 import org.cacert.gigi.util.KeyStorage;
 import org.cacert.gigi.util.Notary;
 
@@ -139,7 +141,7 @@ public class Certificate implements IdCachable {
         this.owner = owner;
         this.dn = dn;
         if (dn.size() == 0) {
-            throw new GigiApiException("DN must not be empty");
+            throw new GigiApiException("DN must not be empty.");
         }
         dnString = stringifyDN(dn);
         this.md = md;
@@ -215,25 +217,34 @@ public class Certificate implements IdCachable {
          * This certificate is not in the database, has no id and only exists as
          * this java object.
          */
-        DRAFT(),
+        DRAFT("draft"),
         /**
          * The certificate has been signed. It is stored in the database.
          * {@link Certificate#cert()} is valid.
          */
-        ISSUED(),
+        ISSUED("issued"),
 
         /**
          * The certificate has been revoked.
          */
-        REVOKED(),
+        REVOKED("revoked"),
 
         /**
          * If this certificate cannot be updated because an error happened in
          * the signer.
          */
-        ERROR();
+        ERROR("error");
 
-        private CertificateStatus() {}
+        private final Outputable name;
+
+        private CertificateStatus(String codename) {
+            this.name = new TranslateCommand(codename);
+
+        }
+
+        public Outputable getName() {
+            return name;
+        }
 
     }
 
@@ -276,7 +287,7 @@ public class Certificate implements IdCachable {
         if (getStatus() != CertificateStatus.DRAFT) {
             throw new IllegalStateException();
         }
-        Notary.writeUserAgreement(actor, "CCA", "issue certificate", "", true, 0);
+        Notary.writeUserAgreement(actor, "ToS", "certificate issuance", "", true, 0);
 
         return Job.sign(this, start, period);