vars.put("method", assurance.getMethod());
Name to = assurance.getTo();
if (assurer) {
- vars.put("linkId", assurance.getTo().getOwner().getId());
+ vars.put("linkId", to == null ? "" : to.getOwner().getId());
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("myName", to == null ? l.getTranslation("own name removed") : to);
}
vars.put("date", assurance.getDate());
- vars.put("location", assurance.getLocation());
+ vars.put("location", assurance.getLocation() + " (" + (assurance.getCountry() == null ? l.getTranslation("not given") : assurance.getCountry().getName()) + ")");
vars.put("points", assurance.getPoints());
i++;
return true;