From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 19 May 2016 10:17:29 +0000 (+0200)
Subject: Cleanup additional tranlation.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=0a3573572ed9f1838d6c937b209f85111d2c4f5c

Cleanup additional tranlation.

Change-Id: Ib935ae46975c9c51137d20c3ef8cf6f57e91e2d7
---

diff --git a/src/org/cacert/gigi/pages/OneFormPage.java b/src/org/cacert/gigi/pages/OneFormPage.java
index e61511dc..c1e075cb 100644
--- a/src/org/cacert/gigi/pages/OneFormPage.java
+++ b/src/org/cacert/gigi/pages/OneFormPage.java
@@ -36,7 +36,7 @@ public abstract class OneFormPage extends Page {
         try {
             c.getConstructor(HttpServletRequest.class).newInstance(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
         } catch (ReflectiveOperationException e) {
-            new GigiApiException(e.getMessage()).format(resp.getWriter(), getLanguage(req));
+            new GigiApiException().format(resp.getWriter(), getLanguage(req));
         }
     }
 
diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
index f4085514..aafd5b9d 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.pages.admin.support;
 
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -10,6 +11,7 @@ import org.cacert.gigi.dbObjects.CertificateOwner;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.output.template.Template;
 
 public class FindDomainForm extends Form {
@@ -33,13 +35,13 @@ public class FindDomainForm extends Form {
             try {
                 d = Domain.getById(Integer.parseInt(request.substring(1)));
             } catch (IllegalArgumentException e) {
-                throw (new GigiApiException("No personal domains found matching the id " + request.substring(1) + "."));
+                throw (new GigiApiException(new SprintfCommand("No personal domains found matching the id %s", Arrays.asList(request.substring(1)))));
             }
         } else {
             d = Domain.searchUserIdByDomain(request);
         }
         if (d == null) {
-            throw (new GigiApiException("No personal domains found matching " + request));
+            throw (new GigiApiException(new SprintfCommand("No personal domains found matching %s", Arrays.asList(request))));
         }
         res = d.getOwner();
         return true;
diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
index 17799e3b..d88f93ab 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserForm.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.pages.admin.support;
 
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -9,6 +10,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.output.template.Template;
 
 public class FindUserForm extends Form {
@@ -28,7 +30,7 @@ public class FindUserForm extends Form {
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
         User[] users = User.findByEmail(req.getParameter("email"));
         if (users.length == 0) {
-            throw (new GigiApiException("No users found matching " + req.getParameter("email")));
+            throw (new GigiApiException(new SprintfCommand("No users found matching %s", Arrays.asList(req.getParameter("email")))));
         }
         this.users = users;
         return true;
diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 27566aee..0cadcf64 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -167,7 +167,7 @@ public class Signup extends Form {
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (GigiApiException e) {
-            outputError(out, req, e.getMessage());
+            e.format(out, Page.getLanguage(req));
             return false;
         }
         return true;
diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 24118fc3..144bf6d8 100644
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.util;
 
 import java.text.ParseException;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -13,6 +14,7 @@ import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.output.template.SprintfCommand;
 
 public class Notary {
 
@@ -135,7 +137,7 @@ public class Notary {
             } else if (type == AssuranceType.TTP_ASSISTED) {
                 assureTTP(assurer, assuree, awarded, location, date);
             } else {
-                throw new GigiApiException("Unknown Assurance type: " + type);
+                throw new GigiApiException(new SprintfCommand("Unknown Assurance type: %s", Arrays.asList(type.toString())));
             }
             assurer.invalidateMadeAssurances();
             assuree.invalidateReceivedAssurances();