[TASK] Respect subject, removed subject translation

Classes/Controller/MailController.php

@@ -143,13 +143,10 @@ class MailController extends ActionController {
 				$templateFromFile->setLanguage($key);
 				$templates[$key] = $templateFromFile;
 
+				$templateFromFile->setSubject($subject);
 				if (file_exists($defaultTemplateFile)) {
 					$templateFromFile->setContent(file_get_contents($defaultTemplateFile));
-					$templateFromFile->setSubject($subject);
 				} else {
-					// set subject from register array
-					$templateFromFile->setSubject(LocalizationUtility::translate($subject, $this->extensionName));
-
 					if (file_exists($fallbackTemplateFile)) {
 						$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
 					}
@@ -162,7 +159,7 @@ class MailController extends ActionController {
 
 		// calculating optimal column width for the view
 		$colspace = 4;
-		$templateCount = count($templates);
+		$templateCount = \count($templates);
 		if ($templateCount % 2 === 0 && $templateCount <= 4) {
 			$colspace = 6;
 		} elseif ($templateCount === 1) {

Classes/Service/MailTemplateService.php

@@ -331,11 +331,6 @@ class MailTemplateService {
 			if (is_array($subject)) {
 				$subject = self::getRegisterArray(
 				)[$this->extensionKey][$this->templateName]['subject'][$this->language];
-			} else {
-				$subject = LocalizationUtility::translate(
-					self::getRegisterArray()[$this->extensionKey][$this->templateName]['subject'],
-					$this->extensionKey
-				);
 			}
 		}
 		$this->mailMessage->setSubject($subject);