Fix: followups on sprintf syntax

diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
index e27b696d829cbc432a782546c19c5918135ad116..ae0246d0308308a672723c7397e785c9efda70c8 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
+++ b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
@@ -96,6 +96,6 @@ public class DomainPingConfiguration implements IdCachable {
         }
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("data", new Date(lastExecution.getTime() + 5 * 60 * 1000));
         }
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("data", new Date(lastExecution.getTime() + 5 * 60 * 1000));

-        throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at %s.", Arrays.asList("$data")), data));
+        throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at {0}.", Arrays.asList("$data")), data));

     }
 }
     }
 }

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
index 0f1620f43b7c49c36e36c101a0e1ad309ab25709..5fec31344bcd7339bf1e5a625558992b5b663666 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
@@ -334,7 +334,7 @@ public class CertificateRequest {
             HashMap<String, Object> vars = new HashMap<>();
             vars.put("SAN", san.getType().toString().toLowerCase() + ":" + san.getName());
             error.mergeInto(new GigiApiException(new Scope(new SprintfCommand(//
             HashMap<String, Object> vars = new HashMap<>();
             vars.put("SAN", san.getType().toString().toLowerCase() + ":" + san.getName());
             error.mergeInto(new GigiApiException(new Scope(new SprintfCommand(//

-                    "The requested Subject alternate name \"%s\" has been removed.", Arrays.asList("$SAN")), vars)));
+                    "The requested Subject alternate name \"{0}\" has been removed.", Arrays.asList("$SAN")), vars)));

         }
         return filteredSANs;
     }
         }
         return filteredSANs;
     }

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
index 04d325c1b02b2479ff7430f39a5150f48864ea62..2f2c25d253edc60c985035d19f0720f91a91c098 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -47,7 +47,7 @@ public class TTPAdminPage extends Page {
             int id = Integer.parseInt(path.substring(1 + PATH.length()));
             User u = User.getById(id);
             if (u == null || !u.isInGroup(TTP_APPLICANT)) {
             int id = Integer.parseInt(path.substring(1 + PATH.length()));
             User u = User.getById(id);
             if (u == null || !u.isInGroup(TTP_APPLICANT)) {

-                SprintfCommand command = new SprintfCommand("The TTP-request is not available anymore. You might want to go %sback%s.", Arrays.asList("!\"<a href='" + PATH + "'>", "!\"</a>"));
+                SprintfCommand command = new SprintfCommand("The TTP-request is not available anymore. You might want to go {0}back{1}.", Arrays.asList("!\"<a href='" + PATH + "'>", "!\"</a>"));

                 req.setAttribute(PageNotFound.MESSAGE_ATTRIBUTE, command);
                 resp.sendError(404);
                 return;
                 req.setAttribute(PageNotFound.MESSAGE_ATTRIBUTE, command);
                 resp.sendError(404);
                 return;