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

[TASK] Refactoring languages WIP

parent f77f8cf9
No related branches found
No related tags found
1 merge request!3New version 4 1
Hide whitespace changes
Inline Side-by-side
Classes/Controller/MailController.php
+ 9
− 26
View file @ 077139a4
...@@ -245,40 +245,23 @@ class MailController extends ActionController { ...@@ -245,40 +245,23 @@ class MailController extends ActionController {
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
*/ */
public function sendTestMailAction(array $parameters = []) { public function sendTestMailAction(array $parameters = []) {
debug($parameters); foreach ($parameters['templates'] as $key => $template) {
die();
$this->saveTemplate(
$parameters['selectedExtension'], $parameters['selectedTemplate'], $parameters['selectedLanguageLeft'],
$parameters['contentLeft'], $parameters['subjectLeft'],
$parameters['fromNameLeft'], $parameters['fromMailLeft'], $parameters['ccLeft'], $parameters['bccLeft'],
$parameters['replyToLeft']
);
if ($parameters['selectedLanguageleft'] !== $parameters['selectedLanguageRight']) {
$this->saveTemplate( $this->saveTemplate(
$parameters['selectedExtension'], $parameters['selectedTemplate'], $parameters['selectedLanguageRight'], $parameters['selectedExtension'], $parameters['selectedTemplate'], $key,
$parameters['contentRight'], $parameters['subjectRight'], $template['content'], $template['subject'],
$parameters['fromNameRight'], $parameters['fromMailRight'], $parameters['ccRight'], $template['fromName'], $template['fromMail'], $template['cc'], $template['bcc'],
$parameters['bccRight'], $parameters['replyToRight'] $template['replyTo']
); );
} }
$objectManager = GeneralUtility::makeInstance(ObjectManager::class); $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */ /** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class); $mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailTemplateService->setLanguage($parameters['selectedLanguageLeft']); $mailIsSend = FALSE;
$mailTemplateService->setToAddresses($parameters['emailAddress']); foreach ($parameters['templates'] as $key => $template) {
$mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setLanguage($key);
$mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE);
if ($parameters['selectedLanguageRight'] !== $parameters['selectedLanguageLeft']) {
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailTemplateService->setLanguage($parameters['selectedLanguageRight']);
$mailTemplateService->setToAddresses($parameters['emailAddress']); $mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress('noreply@example.org'); $mailTemplateService->setFromAddress($template['fromMail']);
$mailTemplateService->setTemplateName($parameters['selectedTemplate']); $mailTemplateService->setTemplateName($parameters['selectedTemplate']);
$mailTemplateService->setExtensionKey($parameters['selectedExtension']); $mailTemplateService->setExtensionKey($parameters['selectedExtension']);
$mailIsSend = $mailTemplateService->sendEmail(TRUE); $mailIsSend = $mailTemplateService->sendEmail(TRUE);
......
Resources/Private/Templates/Mail/Index.html
+ 14
− 14
View file @ 077139a4
...@@ -91,32 +91,32 @@ ...@@ -91,32 +91,32 @@
<h3>{key}</h3> <h3>{key}</h3>
<div class="col-md-12"> <div class="col-md-12">
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label> <label for="parameters[templates][{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[{key}][fromName]" /> <f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[templates][{key}][fromName]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][fromMail]" class="">{f:translate(key:'backend.fromMail')}</label> <label for="parameters[templates][{key}][fromMail]" class="">{f:translate(key:'backend.fromMail')}</label>
<f:form.textfield type="email" class="form-control" value="{languageTemplate.fromMail}" name="parameters[{key}][fromMail]" /> <f:form.textfield type="email" class="form-control" value="{languageTemplate.fromMail}" name="parameters[templates][{key}][fromMail]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][cc]" class="">{f:translate(key:'backend.cc')}</label> <label for="parameters[templates][{key}][cc]" class="">{f:translate(key:'backend.cc')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.cc}" name="parameters[{key}][cc]" /> <f:form.textfield type="text" class="form-control" value="{languageTemplate.cc}" name="parameters[templates][{key}][cc]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][bcc]" class="">{f:translate(key:'backend.bcc')}</label> <label for="parameters[templates][{key}][bcc]" class="">{f:translate(key:'backend.bcc')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.bcc}" name="parameters[{key}][bcc]" /> <f:form.textfield type="text" class="form-control" value="{languageTemplate.bcc}" name="parameters[templates][{key}][bcc]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][replyTo]" class="">{f:translate(key:'backend.replyTo')}</label> <label for="parameters[templates][{key}][replyTo]" class="">{f:translate(key:'backend.replyTo')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.replyToLeft}" name="parameters[{key}][replyTo]" /> <f:form.textfield type="text" class="form-control" value="{languageTemplate.replyToLeft}" name="parameters[templates][{key}][replyTo]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][subject]" class="">{f:translate(key:'backend.subject')}</label> <label for="parameters[templates][{key}][subject]" class="">{f:translate(key:'backend.subject')}</label>
<f:form.textfield type="text" class="form-control" value="{languageTemplate.subjectLeft}" name="parameters[{key}][subject]" /> <f:form.textfield type="text" class="form-control" value="{languageTemplate.subjectLeft}" name="parameters[templates][{key}][subject]" />
</div> </div>
<div class="row form-group"> <div class="row form-group">
<label for="parameters[{key}][content]" class="">{f:translate(key:'backend.content')}</label> <label for="parameters[templates][{key}][content]" class="">{f:translate(key:'backend.content')}</label>
<f:form.textarea class="form-control" rows="15" name="parameters[{key}][content]" value="{languageTemplate.content}" /> <f:form.textarea class="form-control" rows="15" name="parameters[templates][{key}][content]" value="{languageTemplate.content}" />
</div> </div>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment