[TASK] Correcting some issues when selecting templates/languages

Classes/Controller/MailController.php

@@ -58,16 +58,16 @@ class MailController extends ActionController {
 		$firstEntry = key(MailTemplateService::getRegisterArray());
 		$secondLevelFirstEntry = key(MailTemplateService::getRegisterArray()[$firstEntry]);
 
+		$templatePath = MailTemplateService::getRegisterArray()
+			[$firstEntry][$secondLevelFirstEntry]['templatePath'];
+		if (isset($selectedTemplate)) {
+			$templatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
+		}
+
 		$activatedLanguages = $this->languageRepository->findSelected();
 		$languages = ['en'];
 		foreach ($activatedLanguages as $language) {
 			$languages[] = $language->getLocale();
-
-			$templatePath = MailTemplateService::getRegisterArray()
-				[$firstEntry][$secondLevelFirstEntry]['templatePath'];
-			if (isset($selectedTemplate)) {
-				$templatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
-			}
 			$this->writeLanguageFile($language, $templatePath);
 		}
 
@@ -108,9 +108,18 @@ class MailController extends ActionController {
 			$this->view->assign('selectedTemplateKey', $selectedTemplateKey);
 			$this->view->assign('selectedExtensionKey', $selectedExtensionKey);
 
+			$this->view->assign(
+				'contentLeft', file_get_contents($templatePath . $selectedLanguageLeft . '.sg_mail.locallang.xlf')
+			);
+			$this->view->assign(
+				'contentRight', file_get_contents($templatePath . $selectedLanguageRight . '.sg_mail.locallang.xlf')
+			);
+
 		} else {
 			$this->view->assign('selectedLanguageLeft', 'en');
+			$this->view->assign('contentLeft', file_get_contents($templatePath . 'en.sg_mail.locallang.xlf'));
 			$this->view->assign('selectedLanguageRight', 'en');
+			$this->view->assign('contentRight', file_get_contents($templatePath . 'en.sg_mail.locallang.xlf'));
 		}
 	}
 

Classes/Service/MailTemplateService.php

@@ -53,9 +53,9 @@ class MailTemplateService {
 			'templateName' => $templateName
 		];
 
-		$defaultLangFile = $templatePath . 'sg_mail.locallang.xlf';
+		$defaultLangFile = $templatePath . 'en.sg_mail.locallang.xlf';
 		if (!file_exists($defaultLangFile)) {
-			$defaultLangFile = fopen($templatePath . 'sg_mail.locallang.xlf', 'w');
+			$defaultLangFile = fopen($templatePath . 'en.sg_mail.locallang.xlf', 'w');
 			$langFileContent = 'TEST';
 			fwrite($defaultLangFile, $langFileContent);
 		}

Resources/Private/Templates/Mail/Index.html

@@ -33,14 +33,14 @@
 						<sgm:be.menus.actionMenuItem label="{language}"
 							controller="Mail"
 							action="index"
-							arguments="{selectedLanguageLeft: language, selectedLanguageRight: selectedLanguageRight, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}"
+							arguments="{selectedLanguageLeft: language, selectedLanguageRight: selectedLanguageRight, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedExtension: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}"
 							additionalAttributes="{selected: 'selected'}" />
 					</f:then>
 					<f:else>
 						<sgm:be.menus.actionMenuItem label="{language}"
 							controller="Mail"
 							action="index"
-							arguments="{selectedLanguageLeft: language, selectedLanguageRight: selectedLanguageRight, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}" />
+							arguments="{selectedLanguageLeft: language, selectedLanguageRight: selectedLanguageRight, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedExtension: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}" />
 					</f:else>
 				</sgm:extendedIf>
 			</f:for>
@@ -48,7 +48,7 @@
 
 		<f:form method="post" controller="Mail" action="save">
 			<br />
-			<f:form.textarea class="col-md-12" rows="25"></f:form.textarea>
+			<f:form.textarea class="col-md-12" rows="25" value="{contentLeft}"></f:form.textarea>
 			<br />
 			<f:form.submit class="btn-default col-md-1" value="Save" />
 		</f:form>
@@ -63,14 +63,14 @@
 						<sgm:be.menus.actionMenuItem label="{language}"
 							controller="Mail"
 							action="index"
-							arguments="{selectedLanguageLeft: selectedLanguageLeft, selectedLanguageRight: language, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}"
+							arguments="{selectedLanguageLeft: selectedLanguageLeft, selectedLanguageRight: language, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedExtension: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}"
 							additionalAttributes="{selected: 'selected'}" />
 					</f:then>
 					<f:else>
 						<sgm:be.menus.actionMenuItem label="{language}"
 							controller="Mail"
 							action="index"
-							arguments="{selectedLanguageLeft: selectedLanguageLeft, selectedLanguageRight: language, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}" />
+							arguments="{selectedLanguageLeft: selectedLanguageLeft, selectedLanguageRight: language, selectedTemplate: selectedTemplateKey, selectedExtensionKey: selectedTemplate.extension, selectedExtension: selectedTemplate.extension, selectedTemplateKey: selectedTemplateKey}" />
 					</f:else>
 				</sgm:extendedIf>
 			</f:for>
@@ -78,7 +78,7 @@
 
 		<f:form method="post" controller="Mail" action="save">
 			<br />
-			<f:form.textarea class="col-md-12" rows="25"></f:form.textarea>
+			<f:form.textarea class="col-md-12" rows="25" value="{contentRight}"></f:form.textarea>
 			<br />
 			<f:form.submit class="btn-default col-md-1" value="Save" />
 		</f:form>