Skip to content
Snippets Groups Projects
Commit f7ec3303 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Fixing errors with the default template and the subject translation

parent 272c105f
No related branches found
No related tags found
1 merge request!3New version 4 1
......@@ -35,7 +35,6 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extbase\Domain\Model\FrontendUser;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
......@@ -130,12 +129,8 @@ class MailController extends ActionController {
$templateFromFile->setSubject($subject);
}
} else {
if (is_array($subject)) {
$langSubject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject']['en'];
$templateFromFile->setSubject($langSubject);
} else {
$templateFromFile->setSubject($subject);
}
// set subject from register array
$templateFromFile->setSubject(LocalizationUtility::translate($subject, $this->extensionName));
if (file_exists($fallbackTemplateFile)) {
$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
......@@ -256,11 +251,12 @@ class MailController extends ActionController {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailTemplateService = $objectManager->get(
MailTemplateService::class, $parameters['selectedTemplate'], $parameters['selectedExtension']
);
$mailIsSend = FALSE;
foreach ($parameters['templates'] as $key => $template) {
$mailTemplateService->setLanguage($key);
$mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress($template['fromMail']);
......
......@@ -759,7 +759,7 @@ class MailTemplateService {
$templateKey = $config['template_key'];
$templatePath = ExtensionManagementUtility::extPath(
$extensionName
) . '/Resources/Private/Template/SgMail/' . ucfirst($config['template_key']);
) . 'Resources/Private/Templates/SgMail/' . ucfirst($config['template_key'] . '/');
if ($config['template_path']) {
$templatePath = $config['template_key'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment