Set the subject with the email template to allow theming

Signed-off-by: Joas Schilling <coding@schilljs.com>

3 files changed, 10 insertions, 4 deletions

diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
index 974a95618ad..cb622fa9b12 100644
--- a/settings/Controller/MailSettingsController.php
+++ b/settings/Controller/MailSettingsController.php
@@ -151,6 +151,7 @@ class MailSettingsController extends Controller {
 					'displayname' => $displayName,
 				]);
 
+				$template->setSubject($this->l10n->t('Email setting test'));
 				$template->addHeader();
 				$template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
 				$template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
@@ -158,7 +159,7 @@ class MailSettingsController extends Controller {
 
 				$message = $this->mailer->createMessage();
 				$message->setTo([$email => $displayName]);
-				$message->setSubject($this->l10n->t('Email setting test'));
+				$message->setSubject($template->renderSubject());
 				$message->setHtmlBody($template->renderHtml());
 				$message->setPlainBody($template->renderText());
 				$errors = $this->mailer->send($message);
diff --git a/settings/Hooks.php b/settings/Hooks.php
index 6f537796517..3da85b4ae74 100644
--- a/settings/Hooks.php
+++ b/settings/Hooks.php
@@ -122,6 +122,8 @@ class Hooks {
 				'emailAddress' => $user->getEMailAddress(),
 				'instanceUrl' => $instanceUrl,
 			]);
+
+			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
 			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
@@ -130,7 +132,7 @@ class Hooks {
 
 			$message = $this->mailer->createMessage();
 			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+			$message->setSubject($template->renderSubject());
 			$message->setBody($template->renderText(), 'text/plain');
 			$message->setHtmlBody($template->renderHtml());
 
@@ -193,6 +195,8 @@ class Hooks {
 				'oldEMailAddress' => $oldMailAddress,
 				'instanceUrl' => $instanceUrl,
 			]);
+
+			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
 			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
@@ -204,7 +208,7 @@ class Hooks {
 
 			$message = $this->mailer->createMessage();
 			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+			$message->setSubject($template->renderSubject());
 			$message->setBody($template->renderText(), 'text/plain');
 			$message->setHtmlBody($template->renderHtml());
 
diff --git a/settings/Mailer/NewUserMailHelper.php b/settings/Mailer/NewUserMailHelper.php
index c111ffeb4fa..af1627a08e3 100644
--- a/settings/Mailer/NewUserMailHelper.php
+++ b/settings/Mailer/NewUserMailHelper.php
@@ -124,6 +124,7 @@ class NewUserMailHelper {
 			'resetTokenGenerated' => $generatePasswordResetToken,
 		]);
 
+		$emailTemplate->setSubject($this->l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
 		$emailTemplate->addHeader();
 		if ($displayName === $userId) {
 			$emailTemplate->addHeading($this->l10n->t('Welcome aboard'));
@@ -159,7 +160,7 @@ class NewUserMailHelper {
 							 IEMailTemplate $emailTemplate) {
 		$message = $this->mailer->createMessage();
 		$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-		$message->setSubject($this->l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
+		$message->setSubject($emailTemplate->renderSubject());
 		$message->setHtmlBody($emailTemplate->renderHtml());
 		$message->setPlainBody($emailTemplate->renderText());
 		$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);