X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fwot%2FVerificationForm.java;h=77f2be093c4cf34e3338b90580544237479888ac;hb=ffb01a792727b470e7d24251f63cce0dc8bd462e;hp=7a8a558cdf114f36261d284f0727bf7cdfeae534;hpb=08c941629aea14473e5c42ab6f5d590be4af4bf8;p=gigi.git diff --git a/src/club/wpia/gigi/pages/wot/VerificationForm.java b/src/club/wpia/gigi/pages/wot/VerificationForm.java index 7a8a558c..77f2be09 100644 --- a/src/club/wpia/gigi/pages/wot/VerificationForm.java +++ b/src/club/wpia/gigi/pages/wot/VerificationForm.java @@ -28,6 +28,7 @@ import club.wpia.gigi.pages.Page; import club.wpia.gigi.pages.PasswordResetPage; import club.wpia.gigi.util.DayDate; import club.wpia.gigi.util.Notary; +import club.wpia.gigi.util.ServerConstants; public class VerificationForm extends Form { @@ -165,7 +166,7 @@ public class VerificationForm extends Form { } if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("assertion"))) { - gae.mergeInto(new GigiApiException("You failed to check all boxes to validate" + " your adherence to the rules and policies of SomeCA")); + gae.mergeInto(new GigiApiException(SprintfCommand.createSimple("You failed to check all boxes to validate your adherence to the rules and policies of {0}.", ServerConstants.getAppName()))); } if ("1".equals(req.getParameter("passwordReset"))) { aword = req.getParameter("passwordResetValue"); @@ -205,18 +206,19 @@ public class VerificationForm extends Form { throw gae; } - LinkedList toAssure = new LinkedList(); + LinkedList toVerify = new LinkedList(); for (int i = 0; i < selected.length; i++) { if (selected[i]) { - toAssure.add(applicantNames[i]); + toVerify.add(applicantNames[i]); } } - if (toAssure.size() == 0) { + if (toVerify.size() == 0) { throw new GigiApiException("You must confirm at least one name to verify an account."); } - Notary.verifyAll(agent, applicant, dob, pointsI, location, req.getParameter("date"), type, toAssure.toArray(new Name[toAssure.size()]), cs.getCountry()); - Outputable result = new TranslateCommand("Verification complete."); + Notary.verifyAll(agent, applicant, dob, pointsI, location, req.getParameter("date"), type, toVerify.toArray(new Name[toVerify.size()]), cs.getCountry()); + + Outputable result = SprintfCommand.createSimple("Verification of user with email address {0} and {1} verification points complete.", applicant.getEmail(), points); if (isWithPasswordReset()) { Language langApplicant = Language.getInstance(applicant.getPreferredLocale()); String method = langApplicant.getTranslation("A password reset was triggered. If you did a password reset by verification, please enter your secret password using this form:");