[TASK] Move language file in ext:t3editor 78/41778/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 21 Jul 2015 14:45:18 +0000 (16:45 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 21 Jul 2015 16:22:38 +0000 (18:22 +0200)
Resolves: #68427
Releases: master
Change-Id: I5f58d427be6b7f202705bdbe5c906d041791f62d
Reviewed-on: http://review.typo3.org/41778
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/t3editor/Classes/CodeCompletion.php
typo3/sysext/t3editor/Classes/T3editor.php
typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
typo3/sysext/t3editor/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/t3editor/locallang.xlf [deleted file]

index c56c685..895aca3 100644 (file)
@@ -28,7 +28,7 @@ class CodeCompletion {
         * Default constructor
         */
        public function __construct() {
-               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
+               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/Resources/Private/Language/locallang.xlf');
        }
 
        /**
index 4cc6d1a..0926bb9 100644 (file)
@@ -164,7 +164,7 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface {
         * Creates a new instance of the class
         */
        public function __construct() {
-               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
+               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/Resources/Private/Language/locallang.xlf');
                // Disable pmktextarea to avoid conflicts (thanks Peter Klein for this suggestion)
                $GLOBALS['BE_USER']->uc['disablePMKTextarea'] = 1;
 
index d92d67c..69bf9d1 100644 (file)
@@ -33,7 +33,7 @@ class TypoScriptReferenceLoader {
         * Default constructor
         */
        public function __construct() {
-               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/locallang.xlf');
+               $GLOBALS['LANG']->includeLLFile('EXT:t3editor/Resources/Private/Language/locallang.xlf');
        }
 
        /**
diff --git a/typo3/sysext/t3editor/Resources/Private/Language/locallang.xlf b/typo3/sysext/t3editor/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..1023bc7
--- /dev/null
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814999" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="t3editor">
+               <header/>
+               <body>
+                       <trans-unit id="deactivate">
+                               <source>Deactivate t3editor</source>
+                       </trans-unit>
+                       <trans-unit id="template">
+                               <source>Template</source>
+                       </trans-unit>
+                       <trans-unit id="file">
+                               <source>File</source>
+                       </trans-unit>
+                       <trans-unit id="delimiter">
+                               <source>:</source>
+                       </trans-unit>
+                       <trans-unit id="constants">
+                               <source>Constants</source>
+                       </trans-unit>
+                       <trans-unit id="setup">
+                               <source>Setup</source>
+                       </trans-unit>
+                       <trans-unit id="unknownContentType">
+                               <source>Unknown content type:</source>
+                       </trans-unit>
+                       <trans-unit id="pageIDInteger">
+                               <source>Syntax error: Parameter pageID must be a valid integer.</source>
+                       </trans-unit>
+                       <trans-unit id="noPermission">
+                               <source>Access denied: No permission to template records.</source>
+                       </trans-unit>
+                       <trans-unit id="typeIDMissing">
+                               <source>Syntax error: At least parameter typeID has to be supplied.</source>
+                       </trans-unit>
+                       <trans-unit id="js.label_lines">
+                               <source>lines</source>
+                       </trans-unit>
+                       <trans-unit id="js.label_documentModified">
+                               <source>document has been modified</source>
+                       </trans-unit>
+                       <trans-unit id="js.label_errorWhileSaving">
+                               <source>An error occurred while saving the data.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/t3editor/locallang.xlf b/typo3/sysext/t3editor/locallang.xlf
deleted file mode 100644 (file)
index 1023bc7..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814999" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:37Z" product-name="t3editor">
-               <header/>
-               <body>
-                       <trans-unit id="deactivate">
-                               <source>Deactivate t3editor</source>
-                       </trans-unit>
-                       <trans-unit id="template">
-                               <source>Template</source>
-                       </trans-unit>
-                       <trans-unit id="file">
-                               <source>File</source>
-                       </trans-unit>
-                       <trans-unit id="delimiter">
-                               <source>:</source>
-                       </trans-unit>
-                       <trans-unit id="constants">
-                               <source>Constants</source>
-                       </trans-unit>
-                       <trans-unit id="setup">
-                               <source>Setup</source>
-                       </trans-unit>
-                       <trans-unit id="unknownContentType">
-                               <source>Unknown content type:</source>
-                       </trans-unit>
-                       <trans-unit id="pageIDInteger">
-                               <source>Syntax error: Parameter pageID must be a valid integer.</source>
-                       </trans-unit>
-                       <trans-unit id="noPermission">
-                               <source>Access denied: No permission to template records.</source>
-                       </trans-unit>
-                       <trans-unit id="typeIDMissing">
-                               <source>Syntax error: At least parameter typeID has to be supplied.</source>
-                       </trans-unit>
-                       <trans-unit id="js.label_lines">
-                               <source>lines</source>
-                       </trans-unit>
-                       <trans-unit id="js.label_documentModified">
-                               <source>document has been modified</source>
-                       </trans-unit>
-                       <trans-unit id="js.label_errorWhileSaving">
-                               <source>An error occurred while saving the data.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>