[TASK] Move backend translations into Database.xlf 08/60608/3
authorRalf Zimmermann <rz@tritum.de>
Sun, 28 Apr 2019 09:26:19 +0000 (11:26 +0200)
committerSusanne Moog <look@susi.dev>
Sun, 28 Apr 2019 12:12:04 +0000 (14:12 +0200)
Resolves: #88239
Releases: master, 9.5
Change-Id: I09df1600304e4f0cff6d4cab6f45b0c966525a3c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60608
Tested-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: Dominik Merkel <merkel.dominik@googlemail.com>
Tested-by: Björn Jacob <bjoern.jacob@tritum.de>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Dominik Merkel <merkel.dominik@googlemail.com>
Reviewed-by: Björn Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Joerg Kummer <typo3@enobe.de>
Reviewed-by: Susanne Moog <look@susi.dev>
typo3/sysext/form/Classes/Domain/Configuration/FlexformConfiguration/Processors/FinisherOptionGenerator.php
typo3/sysext/form/Resources/Private/Language/Database.xlf
typo3/sysext/form/Resources/Private/Language/locallang.xlf

index 418c0aa..eb7aeeb 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Form\Domain\Configuration\FlexformConfiguration\Processors;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -38,8 +39,8 @@ class FinisherOptionGenerator extends AbstractProcessor
     {
         parent::__construct($converterDto);
 
-        $this->languageService = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
-        $this->languageService->includeLLFile('EXT:form/Resources/Private/Language/locallang.xlf');
+        $this->languageService = GeneralUtility::makeInstance(LanguageService::class);
+        $this->languageService->includeLLFile('EXT:form/Resources/Private/Language/Database.xlf');
     }
 
     /**
index 72caa62..ee04f24 100644 (file)
@@ -7,6 +7,13 @@
                 <source>Form manager</source>
             </trans-unit>
 
+            <trans-unit id="default" xml:space="preserve">
+                <source>Default</source>
+            </trans-unit>
+             <trans-unit id="empty" xml:space="preserve">
+                <source>[Empty]</source>
+            </trans-unit>
+
             <trans-unit id="tt_content.pi_flexform.formframework.persistenceIdentifier" xml:space="preserve">
                 <source>Form definition</source>
             </trans-unit>
index a49094e..7cabb6d 100644 (file)
@@ -3,12 +3,6 @@
     <file t3:id="1475977066" source-language="en" datatype="plaintext" original="messages" date="2016-10-09T03:38:32Z" product-name="form">
         <header/>
         <body>
-            <trans-unit id="default" xml:space="preserve">
-                <source>Default</source>
-            </trans-unit>
-             <trans-unit id="empty" xml:space="preserve">
-                <source>[Empty]</source>
-            </trans-unit>
             <trans-unit id="element.ImageUpload.properties.SummaryPage.altText" xml:space="preserve">
                 <source>Uploaded image</source>
             </trans-unit>