X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FAssurancesDisplay.java;h=8f0e6cabb54085287700e059db012ec1729aec35;hb=7243641e3fc1ded767f1070a7300a099ad98ecad;hp=b0908c5df3c9781fb2ef9511d129c930be4db360;hpb=79d4df03750305ae922b992dfb1d56200ba82336;p=gigi.git

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index b0908c5d..8f0e6cab 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -4,22 +4,20 @@ 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;
 import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {
 
-    private static Template template;
+    private static final Template template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
 
     private boolean assurer;
 
     public String assuranceArray;
 
-    static {
-        template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
-    }
-
     public AssurancesDisplay(String assuranceArray, boolean assurer) {
         this.assuranceArray = assuranceArray;
         this.assurer = assurer;
@@ -29,9 +27,10 @@ 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");
         }
 
         IterableDataset assuranceGroup = new IterableDataset() {
@@ -46,10 +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().getName());
+                        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().getName());
+                        vars.put("verbVal", assurance.getFrom().getPreferredName());
+                        vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                     }
                     vars.put("date", assurance.getDate());
                     vars.put("location", assurance.getLocation());