upd: make email sender address fixed.

[gigi.git] / src / org / cacert / gigi / output / AssurancesDisplay.java

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 2266c6e8283966c69b358415f65fb9d7d5e1bc06..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;
@@ -26,7 +27,7 @@ public class AssurancesDisplay implements Outputable {
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         final Assurance[] assurances = (Assurance[]) vars.get(assuranceArray);
         if (assurer) {
-            vars.put("verb", l.getTranslation("To"));
+            vars.put("verb", l.getTranslation("To (User Id)"));
         } else {
             vars.put("verb", l.getTranslation("From"));
             vars.put("myName", "yes");
@@ -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().getPreferredName());
-                        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());