Merge branch 'master' into upgrade_TYPO3v12_phase3

Classes/Controller/JoblistController.php

@@ -738,7 +738,12 @@ class JoblistController extends ActionController {
 			'phone' => $applyData->getPhone(),
 			'mobile' => $applyData->getMobile(),
 			'email' => $applyData->getEmail(),
-			'message' => $applyData->getFirstName()
+			'message' => $applyData->getFirstName(),
+			'freetextField1' => $applyData->getFreetextField1(),
+			'freetextField2' => $applyData->getFreetextField2(),
+			'freetextField3' => $applyData->getFreetextField3(),
+			'freetextField4' => $applyData->getFreetextField4(),
+			'freetextField5' => $applyData->getFreetextField5()
 		];
 	}
 

Configuration/SgMail/ApplicantMail.php

@@ -115,5 +115,35 @@ EOT
 			'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore...',
 			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.message'
 		],
+		[
+			'marker' => 'application.freetextField1',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField1'
+		],
+		[
+			'marker' => 'application.freetextField2',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField2'
+		],
+		[
+			'marker' => 'application.freetextField3',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField3'
+		],
+		[
+			'marker' => 'application.freetextField4',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField4'
+		],
+		[
+			'marker' => 'application.freetextField5',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField5'
+		],
 	]
 ];

Configuration/SgMail/ApplicationMail.php

@@ -140,5 +140,35 @@ EOT
 			'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore...',
 			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.message'
 		],
+		[
+			'marker' => 'application.freetextField1',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField1'
+		],
+		[
+			'marker' => 'application.freetextField2',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField2'
+		],
+		[
+			'marker' => 'application.freetextField3',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField3'
+		],
+		[
+			'marker' => 'application.freetextField4',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField4'
+		],
+		[
+			'marker' => 'application.freetextField5',
+			'type' => \SGalinski\SgMail\Service\MailTemplateService::MARKER_TYPE_STRING,
+			'value' => '',
+			'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.freetextField5'
+		],
 	]
 ];

Resources/Private/Language/de.locallang.xlf

@@ -77,6 +77,26 @@
 				<source><![CDATA[Zip]]></source>
 				<target><![CDATA[Plz]]></target>
 			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField1" approved="yes">
+				<source><![CDATA[Free text field 1]]></source>
+				<target><![CDATA[Freitextfeld 1]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField2" approved="yes">
+				<source><![CDATA[Free text field 2]]></source>
+				<target><![CDATA[Freitextfeld 2]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField3" approved="yes">
+				<source><![CDATA[Free text field 3]]></source>
+				<target><![CDATA[Freitextfeld 3]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField4" approved="yes">
+				<source><![CDATA[Free text field 4]]></source>
+				<target><![CDATA[Freitextfeld 4]]></target>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField5" approved="yes">
+				<source><![CDATA[Free text field 5]]></source>
+				<target><![CDATA[Freitextfeld 5]]></target>
+			</trans-unit>
 			<trans-unit id="backend.button_create" approved="yes">
 				<source><![CDATA[New]]></source>
 				<target><![CDATA[Neu]]></target>

Resources/Private/Language/locallang.xlf

@@ -60,6 +60,21 @@
 			<trans-unit id="application_mail.marker.zip">
 				<source><![CDATA[Zip]]></source>
 			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField1">
+				<source><![CDATA[Free text field 1]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField2">
+				<source><![CDATA[Free text field 2]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField3">
+				<source><![CDATA[Free text field 3]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField4">
+				<source><![CDATA[Free text field 4]]></source>
+			</trans-unit>
+			<trans-unit id="application_mail.marker.freetextField5">
+				<source><![CDATA[Free text field 5]]></source>
+			</trans-unit>
 			<trans-unit id="backend.button_create">
 				<source><![CDATA[New]]></source>
 			</trans-unit>