Merge changes I81e26418,Iaf50da91

* changes:
  add: allow the test-manager to filter forwarded mails
  add: allow chaining mail providers after the "TestManager" provider

diff --git a/src/org/cacert/gigi/localisation/Language.java b/src/org/cacert/gigi/localisation/Language.java
index 95971120f39df4151e997ff2af1d4694cd1bfcee..4caaa79beb698533b0bb8de4f26f4aeb12945a67 100644 (file)
--- a/src/org/cacert/gigi/localisation/Language.java
+++ b/src/org/cacert/gigi/localisation/Language.java
@@ -99,6 +99,9 @@ public class Language {
     }
 
     public String getTranslation(String text) {
+        if (text == null || text.equals("")) {
+            return text;
+        }
         String string = translations.get(text);
         if (string == null || string.equals("")) {
             return text;

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 595872ac3ac778f98c8760beac6887a14b5c62b7..8f0e6cabb54085287700e059db012ec1729aec35 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -4,6 +4,7 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.dbObjects.Assurance;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Outputable;
@@ -44,12 +45,13 @@ public class AssurancesDisplay implements Outputable {
                     Assurance assurance = assurances[i];
                     vars.put("id", assurance.getId());
                     vars.put("method", assurance.getMethod());
+                    Name to = assurance.getTo();
                     if (assurer) {
-                        vars.put("verbVal", assurance.getTo().getOwner().getId());
-                        vars.put("myName", assurance.getTo());
+                        vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
+                        vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
                     } else {
                         vars.put("verbVal", assurance.getFrom().getPreferredName());
-                        vars.put("myName", assurance.getTo());
+                        vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                     }
                     vars.put("date", assurance.getDate());
                     vars.put("location", assurance.getLocation());

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
index 12b6323d2c185a1b86f0305bc43ac7312c5594e1..bae43d589e6fae2dab514b3b925872e6289856cf 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
@@ -363,7 +363,7 @@ public class CertificateRequest {
                 }
             }
             error.mergeInto(new GigiApiException(SprintfCommand.createSimple(//
-                    "The requested Subject alternate name \"{0}\" has been removed.", san.getType().toString().toLowerCase() + ":" + san.getName())));
+                    "The requested subject alternate name (SAN) \"{0}\" has been removed.", san.getType().toString().toLowerCase() + ":" + san.getName())));
         }
         SANs = filteredSANs;
     }

diff --git a/src/org/cacert/gigi/pages/account/mail/MailOverview.templ b/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
index 487d052fda5874ad404057bbe0a36ad5c17c1dca..c0294310896c7ca8db529902e8bdad297d83efa6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.templ
@@ -3,7 +3,7 @@
   <div class="panel-heading"><?=_Manage email accounts?></div>
   <div class="panel-body">
    <p>
-<?=_Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default.?>
+<?=_Please Note: You can not set an unverified email address as a default email address, and you can not remove a default email address. To remove the default email address you must set another verified email address as the default.?>
 </p>
   </div>
 <?=$manForm?>

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index e1c903e867cf589896790842f88925d9db5e5c92..ed1ce238c93d144cd04da9ca42230df36600a25b 100644 (file)
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -156,7 +156,7 @@ public class Notary {
             } else if (type == AssuranceType.TTP_ASSISTED) {
                 assureTTP(assurer, assuree, assureeName, awarded, location, date);
             } else {
-                throw new GigiApiException(SprintfCommand.createSimple("Unknown Assurance type: {0}", type.toString()));
+                throw new GigiApiException(SprintfCommand.createSimple("Unknown Verification type: {0}", type.toString()));
             }
             assurer.invalidateMadeAssurances();
             assuree.invalidateReceivedAssurances();