upd: added correct display of login and revoked status to status table

Change-Id: I7b7d8e2c7d19042a98a146c8f3620e7f2a74e386

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index f24d7782ce060e54896feb566269d5bad318a48e..bb2c493ce3024b16d0e78c4ac05efe8bc4eef4ff 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -45,13 +45,18 @@ public class CertificateIterable implements IterableDataset {
             if (st == CertificateStatus.REVOKED) {
                 vars.put("revoked", c.getRevocationDate());
             } else {
             if (st == CertificateStatus.REVOKED) {
                 vars.put("revoked", c.getRevocationDate());
             } else {

-                vars.put("revoked", "n/a");
+                vars.put("revoked", l.getTranslation("N/A"));

             }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
             }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }

+        if (c.isLoginEnabled()) {
+            vars.put("login", l.getTranslation("No"));
+        } else {
+            vars.put("login", l.getTranslation("Yes"));
+        }

         return true;
     }
 }
         return true;
     }
 }

diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index 5a732ea9fd037d7ea37976095686adb64a45d109..278b4f7f7bb04c989b9dc9b22808801fa5774ee8 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -1,6 +1,6 @@
 <table class="table">
 <thead><tr>
 <table class="table">
 <thead><tr>

-<th><?=_Renew/Revoke/Delete?></th>
+<th></th>

 <th><?=_Status?></th>
 <th><?=_Email Address?></th>
 <th><?=_SerialNumber?></th>
 <th><?=_Status?></th>
 <th><?=_Email Address?></th>
 <th><?=_SerialNumber?></th>


@@ -25,7 +25,7 @@
        <td><?=$issued?></td>
        <td><?=$revoked?></td>
        <td><?=$expire?></td>
        <td><?=$issued?></td>
        <td><?=$revoked?></td>
        <td><?=$expire?></td>

-       <td>a</td>
+       <td><?=$login?></td>

 </tr>
 <? } ?>
 </tbody>
 </tr>
 <? } ?>
 </tbody>

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
index 585513d13d99333bb0173c6369ed9d963fd87337..76f60b00b9202be1b0120299496e86a793cb70e8 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
@@ -1,2 +1,2 @@
 <?=$certTable?>
 <?=$certTable?>

-<input type="submit" value="<?=_Revoke Certificates?>"/>
\ No newline at end of file
+<input type="submit" value="<?=_Revoke Selected Certificates?>"/>
\ No newline at end of file