upd: Reduce Boilerplate in translated SprintfCommands

[gigi.git] / src / org / cacert / gigi / dbObjects / EmailAddress.java

diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java
index d92338ca9899f0dc8e126159e005e26863cd0b88..964d1b68ec8dda6cb2afb7685d43c46415f303d7 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/EmailAddress.java
+++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java
@@ -1,11 +1,8 @@
 package org.cacert.gigi.dbObjects;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
@@ -13,7 +10,6 @@ import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.email.MailProbe;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.template.Scope;
 import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.util.RandomToken;
 
@@ -42,6 +38,7 @@ public class EmailAddress implements IdCachable, Verifyable {
     }
 
     public EmailAddress(User owner, String address, Locale mailLocale) throws GigiApiException {
+        address = address.toLowerCase();
         if ( !EmailProvider.MAIL.matcher(address).matches()) {
             throw new IllegalArgumentException("Invalid email.");
         }
@@ -137,9 +134,7 @@ public class EmailAddress implements IdCachable, Verifyable {
         Date lastExecution = getLastPing(false);
 
         if (lastExecution != null && lastExecution.getTime() + REPING_MINIMUM_DELAY >= System.currentTimeMillis()) {
-            Map<String, Object> data = new HashMap<String, Object>();
-            data.put("data", new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY));
-            throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at {0}.", Arrays.asList("${data}")), data));
+            throw new GigiApiException(SprintfCommand.createSimple("Reping is only allowed after {0} minutes, yours end at {1}.", REPING_MINIMUM_DELAY / 60 / 1000, new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY)));
         }
         ping(l);
         return;