fix: output booleans as yes/no directly using the template system

Change-Id: I14e5839917457e77c949395a395aadef61ff317f

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index afc883ff4a13544a04df6bcb6fd91d70c4965a23..9e55141155d9f25fd9bcd59bccb998b91f635a5a 100644 (file)
--- 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 dfb7b46382f92c8b36e9a207fb28687016bf9eb5..8c633c422934d415b7da3b813bc5d44512f00753 100644 (file)
--- 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 45ca5637ceb0f018d582663fced91abd6a2077a6..04eaa8d5ffc33b68fba1b39b7127d6a27d902f14 100644 (file)
--- 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();
             }