diff --git a/src/main/java/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java b/src/main/java/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java index 8f16ccac4..b8db99847 100644 --- a/src/main/java/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java +++ b/src/main/java/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java @@ -68,7 +68,7 @@ public void run(FormSubmission formSubmission, Submission providerSubmission) { String familySubmissionConfirmationId = familySubmission.getShortCode(); Locale locale = - providerSubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag( + familySubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag( "es") : Locale.ENGLISH; String senderName = messageSource.getMessage("email.general.sender-name", null, locale); diff --git a/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java b/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java index 486284048..7361814ca 100644 --- a/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java +++ b/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java @@ -17,6 +17,7 @@ import org.ilgcc.app.utils.ProviderSubmissionUtilities; import org.ilgcc.jobs.SendEmailJob; import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Component; @Slf4j @@ -26,6 +27,8 @@ public class SendProviderConfirmationEmail implements Action { protected static String EMAIL_SENT_STATUS_INPUT_NAME = "providerConfirmationEmailSent"; protected static String RECIPIENT_EMAIL_INPUT_NAME = "providerResponseContactEmail"; + protected static Locale locale; + protected static MessageSource messageSource; protected final SubmissionRepositoryService submissionRepositoryService; @@ -42,15 +45,14 @@ public SendProviderConfirmationEmail(SendEmailJob sendEmailJob, MessageSource me @Override public void run(Submission submission) { if (!skipEmailSend(submission)) { - Locale locale = - submission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag( - "es") : Locale.ENGLISH; Optional> emailData = getEmailData(submission); if (emailData.isEmpty()) { return; } + locale = LocaleContextHolder.getLocale(); + ILGCCEmail email = ILGCCEmail.createProviderConfirmationEmail(getSenderName(locale), getRecipientEmail(submission), setSubject(emailData.get(), locale), new Content("text/html", setBodyCopy(emailData.get(), locale)), submission.getId());