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

[TASK] Removing possible endless loop from sendMail; Marker Example values and...

[TASK] Removing possible endless loop from sendMail; Marker Example values and description can now come from translation file
parent a1b6c704
No related branches found
No related tags found
No related merge requests found
...@@ -222,8 +222,13 @@ class MailTemplateService { ...@@ -222,8 +222,13 @@ class MailTemplateService {
} else { } else {
// no language found and no default template // no language found and no default template
$this->setLanguage('en'); $this->setLanguage('en');
$this->sendEmail(); // does an english default template exist ?
return TRUE; if (file_exists($templatePath . $this->language . '.template.html')) {
$this->sendEmail();
return TRUE;
}
return FALSE;
} }
} }
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<f:for each="{selectedTemplate.marker}" as="marker"> <f:for each="{selectedTemplate.marker}" as="marker">
<tr> <tr>
<td>{marker.marker}</td> <td>{marker.marker}</td>
<td>{marker.value}</td> <td><f:translate key="{marker.value}">{marker.value}</f:translate></td>
<td>{marker.description}</td> <td><f:translate key="{marker.description}">{marker.description}</f:translate></td>
</tr> </tr>
</f:for> </f:for>
</table> </table>
......
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