[TASK] Switching to sys lang, wip

Classes/Controller/MailController.php

@@ -108,7 +108,7 @@ class MailController extends ActionController {
 			if ($template === NULL) {
 				$defaultTemplatePath = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templatePath'];
 				$defaultTemplateFile = $defaultTemplatePath . $key . '.' . 'template.html';
-				$fallbackTemplateFile = $defaultTemplatePath . 'en.' . 'template.html';
+				$fallbackTemplateFile = $defaultTemplatePath . 'template.html';
 
 				$templateFromFile = new Template();
 				$templateFromFile->setLanguage($key);
@@ -133,7 +133,10 @@ class MailController extends ActionController {
 					} else {
 						$templateFromFile->setSubject($subject);
 					}
-					$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
+
+					if (file_exists($fallbackTemplateFile)) {
+						$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
+					}
 				}
 			} else {
 				$templates[$key] = $template;
@@ -151,7 +154,7 @@ class MailController extends ActionController {
 
 		$this->view->assign('colspace', $colspace);
 		$this->view->assign('languageTemplates', $templates);
-		$this->view->assign('languageLabels', BackendService::getLanguageLabels());
+		$this->view->assign('languageLabels', BackendService::getLanguageLabels($languages));
 		$this->view->assign('templates', MailTemplateService::getRegisterArray());
 
 		$templateDescription = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['description'];

Classes/Service/BackendService.php

@@ -155,6 +155,11 @@ class BackendService {
 
 		$languages = [];
 
+		// adding default language
+		$languages[] = ['isocode' => LocalizationUtility::translate(
+			'backend.language_default', 'SgMail'
+		), 'name' => LocalizationUtility::translate('backend.language_default', 'SgMail')];
+
 		foreach ($rows as $language) {
 			$languages[] = ['isocode' => $language['language_isocode'],
 				'name' => $language['title']];
@@ -166,23 +171,18 @@ class BackendService {
 	/**
 	 * get an array of all the labels for the activated languages
 	 *
+	 * @param array $languages
 	 * @return array
 	 * @throws \InvalidArgumentException
 	 */
-	public static function getLanguageLabels() {
-		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-		/** @var LanguageRepository $languageRepository */
-		$languageRepository = $objectManager->get(LanguageRepository::class);
-		$activatedLanguages = $languageRepository->findSelected();
+	public static function getLanguageLabels(array $languages) {
+		$languageLabels = [];
 
-		$languages = [];
-		$languages['en'] = LocalizationUtility::translate('backend.language_default', 'SgMail');
-
-		foreach ($activatedLanguages as $language) {
-			$languages[$language->getLocale()] = $language->getLabel();
+		foreach ($languages as $language) {
+			$languageLabels[$language['isocode']] = $language['name'];
 		}
 
-		return $languages;
+		return $languageLabels;
 	}
 
 	/**