From 7add0317b164483ad82ed696cc8d63c516273714 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sat, 20 Aug 2016 22:44:17 +0200
Subject: [PATCH] fix: output booleans as yes/no directly using the template
 system

Change-Id: I14e5839917457e77c949395a395aadef61ff317f
---
 src/org/cacert/gigi/output/CertificateIterable.java       | 6 +-----
 src/org/cacert/gigi/output/template/Template.java         | 2 ++
 src/org/cacert/gigi/pages/account/certs/Certificates.java | 6 +-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index afc883ff..9e551411 100644
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -72,11 +72,7 @@ public class CertificateIterable implements IterableDataset {
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
-        if (c.isLoginEnabled()) {
-            vars.put("login", l.getTranslation("No"));
-        } else {
-            vars.put("login", l.getTranslation("Yes"));
-        }
+        vars.put("login", c.isLoginEnabled());
         return true;
     }
 }
diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index dfb7b463..8c633c42 100644
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -224,6 +224,8 @@ public class Template implements Outputable {
             ((Outputable) s).output(out, l, vars);
         } else if (s instanceof DayDate) {
             out.print(DateSelector.getDateFormat().format(((DayDate) s).toDate()));
+        } else if (s instanceof Boolean) {
+            out.print(((Boolean) s) ? l.getTranslation("yes") : l.getTranslation("no"));
         } else if (s instanceof Date) {
             SimpleDateFormat sdfUI = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
diff --git a/src/org/cacert/gigi/pages/account/certs/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java
index 45ca5637..04eaa8d5 100644
--- a/src/org/cacert/gigi/pages/account/certs/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java
@@ -208,11 +208,7 @@ public class Certificates extends Page implements HandlesMixedRequest {
                         return true;
                     }
                 });
-                if (c.isLoginEnabled()) {
-                    vars.put("login", l.getTranslation("Yes"));
-                } else {
-                    vars.put("login", l.getTranslation("No"));
-                }
+                vars.put("login", c.isLoginEnabled());
             } catch (GeneralSecurityException e) {
                 e.printStackTrace();
             }
-- 
2.39.2