This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 1ee68198408f1cf706ef0b8a04841d9076d8baed Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Nov 7 10:23:25 2014 +0100 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) --- .../wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java | 6 +++++- .../resources/email/AddBoatToUserAllegroWalletEmail_en.mustache | 3 +-- .../resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java index e00230a..cf34d97 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java @@ -47,13 +47,17 @@ public class AddBoatToUserAllegroWalletEmail extends WaoMail { String subject = I18n.l( getLocale(), "wao.email.addBoatToUserAllegroWallet.subject", - I18n.l(getLocale(), obsProgram.getI18nKey()), + getObsProgramLabel(), boat.getRegistrationCode(), observer.getLogin() ); return subject; } + public String getObsProgramLabel() { + return I18n.l(getLocale(), obsProgram.getI18nKey()); + } + public void setBoat(Boat boat) { this.boat = boat; } diff --git a/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache b/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache index 38827af..cd5df4a 100644 --- a/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache +++ b/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache @@ -1,7 +1,6 @@ Hello, -Please, add boat {{boat.registrationCode}} to the ALLEGRO wallet of the observer -{{observer.fullName}} {{observer.company.name}} ({{observer.login}}). +Please, add boat {{boat.registrationCode}} to the {{obsProgramLabel}} ALLEGRO wallet of the observer {{observer.fullName}} {{observer.company.name}} ({{observer.login}}). {{info}} diff --git a/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache b/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache index d496d0d..f3d0dfd 100644 --- a/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache +++ b/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache @@ -1,7 +1,6 @@ Bonjour, -Merci d'ajouter le navire {{boat.registrationCode}} au portefeuille ALLEGRO de l'observateur -{{observer.fullName}} {{observer.company.name}} ({{observer.login}}). +Merci d'ajouter le navire {{boat.registrationCode}} au portefeuille ALLEGRO {{obsProgramLabel}} de l'observateur {{observer.fullName}} {{observer.company.name}} ({{observer.login}}). {{info}} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.