From 2992f7582c890fc180f74f1b5b9deac15752fe26 Mon Sep 17 00:00:00 2001
From: INOPIAE <m.maengel@inopiae.de>
Date: Wed, 3 Aug 2016 07:32:43 +0200
Subject: [PATCH] upd: added correct display of login and revoked status to
 status table

Change-Id: I7b7d8e2c7d19042a98a146c8f3620e7f2a74e386
---
 src/org/cacert/gigi/output/CertificateIterable.java        | 7 ++++++-
 src/org/cacert/gigi/output/CertificateTable.templ          | 4 ++--
 .../pages/account/certs/CertificateModificationForm.templ  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index f24d7782..bb2c493c 100644
--- 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 {
-                vars.put("revoked", "n/a");
+                vars.put("revoked", l.getTranslation("N/A"));
             }
         } 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;
     }
 }
diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index 5a732ea9..278b4f7f 100644
--- 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>
-<th><?=_Renew/Revoke/Delete?></th>
+<th></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>a</td>
+	<td><?=$login?></td>
 </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 585513d1..76f60b00 100644
--- 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?>
-<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
-- 
2.39.2