Skip to content
Snippets Groups Projects

fix: message du courriel de suppression de compte. refs #8916

Merged Olivier Maury requested to merge fix-email-suppression-compte into main
2 files
+ 8
11
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -438,7 +438,6 @@ public class MailService {
return sj.toString();
}
/**
* Format to display user(usermail).
*/
@@ -605,10 +604,10 @@ public class MailService {
final SimpleDateFormat sdt = new SimpleDateFormat("dd/MM/yyyy");
final Date fourteenDays = DateUtils.addDays(new Date(), 14);
if (account.getEmail() == null) {
LOGGER.info("This account : " + account.toString() + "has no email address.");
LOGGER.info("This account : {} has no email address.", account);
try {
send(new Mail(adminI18n.format("emailAccountDeletionNoAddressSubject"),
String.format(adminI18n.format("emailAccountDeletionNoAddressBody"),
send(new Mail(adminI18n.format("emailReminderAccountDeletionNoAddressSubject"),
String.format(adminI18n.format("emailReminderAccountDeletionNoAddressBody"),
account.toString(), sdt.format(fourteenDays), applicationURL)));
} catch (final SendMailException e) {
LOGGER.catching(e);
@@ -640,7 +639,7 @@ public class MailService {
final SimpleDateFormat sdt = new SimpleDateFormat("dd/MM/yyyy");
final Date fourteenDays = DateUtils.addDays(new Date(), 14);
if (account.getEmail() == null) {
LOGGER.info("This account : " + account.toString() + "has no email address.");
LOGGER.info("This account : {} has no email address.", account);
try {
send(new Mail(adminI18n.format("emailAccountDeletedNoAddressSubject"),
String.format(adminI18n.format("emailAccountDeletedNoAddressBody"),
@@ -652,8 +651,8 @@ public class MailService {
}
final I18n i18n = new I18n("fr.soeretempo.sido.gwt.server.resources.messages", locale);
LOGGER.traceEntry("Send mail to={}", account.getEmail());
final Mail mail = new Mail(i18n.format("emailReminderAccountDeletionSubject"));
final String body = String.format(i18n.format("emailReminderAccountDeletionBody",
final Mail mail = new Mail(i18n.format("emailAccountDeletedSubject"));
final String body = String.format(i18n.format("emailAccountDeletedBody",
account.getUserName(), sdt.format(fourteenDays), applicationURL));
mail.setMessage(body);
mail.setTo(account.getEmail());
@@ -664,6 +663,4 @@ public class MailService {
}
LOGGER.traceExit();
}
}
Loading