Merge changes I82859d98,I3da54fbf

* changes:
  upd: fix some wording
  upd: replace assure, assurance, assurer etc in output to user

diff --git a/src/org/cacert/gigi/dbObjects/Group.java b/src/org/cacert/gigi/dbObjects/Group.java
index dd6767ef783cb8e0a309403983a90e6c17e22c90..e85b82775de44d5ad92b604e5b333b5349319a4f 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Group.java
+++ b/src/org/cacert/gigi/dbObjects/Group.java
@@ -11,7 +11,7 @@ public enum Group {
     BLOCKEDLOGIN("blockedlogin", "may not login"), BLOCKEDCERT("blockedcert", "may not issue certificates"), //
     TTP_ASSURER("ttp-assurer", "may verify via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be verified via ttp"), //
     CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may verify organisations"), //
-    NUCLEUS_ASSURER("nucleus-assurer", "may issue nucleus assurances"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system");
+    NUCLEUS_ASSURER("nucleus-assurer", "may enter nucleus verifications"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system");
 
     private final String dbName;
 

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 61f347a4e90b380e70802d9871641da1ead0161f..cf43f80f3182a4377a1578b3f11ac370375f8e53 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -136,7 +136,7 @@ public class User extends CertificateOwner {
     public void setDoB(DayDate dob) throws GigiApiException {
         synchronized (Notary.class) {
             if (getReceivedAssurances().length != 0) {
-                throw new GigiApiException("No change after assurance allowed.");
+                throw new GigiApiException("No change after verification allowed.");
             }
 
             if ( !CalendarUtil.isOfAge(dob, User.MINIMUM_AGE)) {

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 0bc3d1c2764c7a36a95d0659474b3a80f1cfb8a2..7fd6cf23a071ab558853d7766d25063a4fe1c411 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -72,7 +72,7 @@
     </td>
     <td align="left">
       <label for="login"><?=_Enable certificate login with this certificate?><br />
-      <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
+      <?=_By allowing certificate login, this certificate can be used to log into this account at !'<code>https://secure.cacert.org/</code>'.?></label>
     </td>
   </tr>
   <tr>

diff --git a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
index 0711cddd4b6a0854a30ee5e118a3d3f208146b57..5139a695c235017855c9ad704f8858bca03c4123 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
+++ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
@@ -7,7 +7,7 @@
   </thead>
   <tbody>
   <tr>
-    <td><?=_I have a CSR! Paste it here:?><br/>Don't know, what as CSR is and how to create one? Take a look in the <a href="https://wiki.cacert.org/FAQ/CSR">Wiki</a>!</td>
+    <td><?=_I have a CSR! Paste it here:?><br/><?=_Don't know what a CSR is or how to create one? Take a look at the !'<a href="https://wiki.cacert.org/FAQ/CSR">'Wiki!'</a>'!?></td>
     <td>
       <textarea class="form-control" name="CSR" class="csr"></textarea>
     </td>

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index aca82b917b68fbf6c2433712af1186b930b6ef72..e5521dab20b3ca251798811995d5c048502bad74 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -152,14 +152,14 @@ public class AssuranceForm extends Form {
             try {
                 type = AssuranceType.valueOf(val);
             } catch (IllegalArgumentException e) {
-                gae.mergeInto(new GigiApiException("Assurance Type wrong."));
+                gae.mergeInto(new GigiApiException("Verification Type wrong."));
             }
         }
 
         int pointsI = 0;
         String points = req.getParameter("points");
         if (points == null || "".equals(points)) {
-            gae.mergeInto(new GigiApiException("For an assurance, you need to enter points."));
+            gae.mergeInto(new GigiApiException("For a verification, you need to enter points."));
         } else {
             try {
                 pointsI = Integer.parseInt(points);
@@ -191,8 +191,8 @@ public class AssuranceForm extends Form {
 
         if (aword != null && !aword.equals("")) {
             Language langApplicant = Language.getInstance(assuree.getPreferredLocale());
-            String method = langApplicant.getTranslation("A password reset was triggered. If you did a password reset by assurance, please enter your secret password using this form:");
-            String subject = langApplicant.getTranslation("Password reset by assurance");
+            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:");
+            String subject = langApplicant.getTranslation("Password reset by verification");
             PasswordResetPage.initPasswordResetProcess(out, assuree, req, aword, langApplicant, method, subject);
         }
         return true;

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 8d4a3aacb3259fbccf23c454cbd30cddff68f0a0..508a9c62413b5b5f0807d7ee300abe94e87737be 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -26,7 +26,7 @@ public class AssurePage extends Page {
     private static final Template t = new Template(AssuranceForm.class.getResource("AssureeSearch.templ"));
 
     public AssurePage() {
-        super("Assure someone");
+        super("Verify someone");
 
     }
 
@@ -51,7 +51,7 @@ public class AssurePage extends Page {
             AssuranceForm form = Form.getForm(req, AssuranceForm.class);
             try {
                 if (form.submit(out, req)) {
-                    out.println(translate(req, "Assurance complete."));
+                    out.println(translate(req, "Verification complete."));
                     return;
                 }
             } catch (GigiApiException e) {