[TASK] Move language and cshimages in info_pagetsconfig 58/41558/4
authorMichael Oehlhof <typo3@oehlhof.de>
Fri, 17 Jul 2015 11:03:56 +0000 (13:03 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 17 Jul 2015 13:52:27 +0000 (15:52 +0200)
Resolves: #68275
Releases: master
Change-Id: I6b514567529ea8adf6cac8a8c24cb64519bf4a70
Reviewed-on: http://review.typo3.org/41558
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
16 files changed:
typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png [new file with mode: 0644]
typo3/sysext/info_pagetsconfig/cshimages/img_1.png [deleted file]
typo3/sysext/info_pagetsconfig/cshimages/img_2.png [deleted file]
typo3/sysext/info_pagetsconfig/cshimages/img_3.png [deleted file]
typo3/sysext/info_pagetsconfig/cshimages/img_4.png [deleted file]
typo3/sysext/info_pagetsconfig/cshimages/img_5.png [deleted file]
typo3/sysext/info_pagetsconfig/ext_tables.php
typo3/sysext/info_pagetsconfig/locallang.xlf [deleted file]
typo3/sysext/info_pagetsconfig/locallang_csh_webinfo.xlf [deleted file]

index 7a23b7b..45dcedf 100644 (file)
@@ -28,7 +28,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
         * Constructor
         */
        public function __construct() {
-               $this->getLanguageService()->includeLLFile('EXT:info_pagetsconfig/locallang.xlf');
+               $this->getLanguageService()->includeLLFile('EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf');
        }
 
        /**
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf b/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..d478631
--- /dev/null
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814840" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="info_pagetsconfig">
+               <header/>
+               <body>
+                       <trans-unit id="tsconf_title">
+                               <source>Page TSconfig</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_0">
+                               <source>All</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1">
+                               <source>Module key ('mod') with overruling user settings</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1a">
+                               <source>Module: Web&gt;Page</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1b">
+                               <source>Module: Web&gt;View</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1c">
+                               <source>Module: Web&gt;Modules</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1d">
+                               <source>Module: Web&gt;List</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1e">
+                               <source>Module: Web&gt;Info</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1f">
+                               <source>Module: Web&gt;Func</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_parts_1g">
+                               <source>Module: Web&gt;Template</source>
+                       </trans-unit>
+                       <trans-unit id="tsconf_configFields">
+                               <source>View TSconfig fields content</source>
+                       </trans-unit>
+                       <trans-unit id="editThisColumn">
+                               <source>Edit the field '%s' for all listed pages</source>
+                       </trans-unit>
+                       <trans-unit id="editTSconfig">
+                               <source>Edit TSconfig for this page</source>
+                       </trans-unit>
+                       <trans-unit id="editTSconfig_all">
+                               <source>Edit TSconfig for all shown pages</source>
+                       </trans-unit>
+                       <trans-unit id="editTSconfig_default">
+                               <source>Default Configuration from TYPO3_CONF_VARS</source>
+                       </trans-unit>
+                       <trans-unit id="mod_pagetsconfig">
+                               <source>Page TSconfig</source>
+                       </trans-unit>
+                       <trans-unit id="sort_alphabetic">
+                               <source>Sort alphabetically:</source>
+                       </trans-unit>
+                       <trans-unit id="pagetitle">
+                               <source>Pagetitle:</source>
+                       </trans-unit>
+                       <trans-unit id="included_tsconfig_files">
+                               <source>Included Files:</source>
+                       </trans-unit>
+                       <trans-unit id="written_tsconfig_lines">
+                               <source>Lines:</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf b/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf
new file mode 100644 (file)
index 0000000..188aa77
--- /dev/null
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814841" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="info_pagetsconfig">
+               <header/>
+               <body>
+                       <trans-unit id="tsconfig_hierarchy.alttitle">
+                               <source>Page TSconfig hierarchy viewer</source>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_hierarchy.description">
+                               <source>Allows the user to view the compiled Page TSconfig structure for a branch of the pagetree.</source>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_hierarchy.details" xml:space="preserve">
+                               <source>This viewer is indispensable for getting an overview of Page TSconfig settings as they apply to various branches in the page tree. You can see the configuration structure of any page where all inherited Page TSconfig is parsed and the result shown. This helps you to evaluate that the settings you have applied are actually found at the correct position in the configuration tree.
+You can also see the Page TSconfig TypoScript code for each page in the root line with the viewer.
+
+See the links for more information about what Page TSconfig is.</source>
+                       </trans-unit>
+                       <trans-unit id="_tsconfig_hierarchy.seeAlso" xml:space="preserve">
+                               <source>_MOD_web_info:tsconfig_edit,
+pages:TSconfig,
+Page TSconfig objects | http://docs.typo3.org/typo3cms/TSconfigReference/PageTsconfig/Index.html</source>
+                               <note from="developer">A part of this string is an internal text, which must not be changed. Just copy this part into the translation field and do not change it. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="_tsconfig_hierarchy.image" xml:space="preserve">
+                               <source>EXT:info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png,
+EXT:info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png,</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_hierarchy.image_descr" xml:space="preserve">
+                               <source>This is how the parsed Page TSconfig tree can look. It contains the "sum" of all the configuration code from the root line and any default settings. This shows the whole tree but you can also select other top level objects (TLO) in the selector box in the top if you want to limit the view to a single branch
+One of the branches in Page TSconfig has the special property that it is overridden with any User TSconfig in the same object path given for the current backend user. When you view only the "mod" TLO any user settings for the current backend user are applied as well. Here it is evident that some additional settings must apply for the user since only "mod.SHARED.colPos_list" was actually found in Page TSconfig (according to the "All" view in the first image).</source>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_edit.alttitle">
+                               <source>Page TSconfig content viewer</source>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_edit.description">
+                               <source>Displays the raw TSconfig code of all pages in the current root line including any default code.</source>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_edit.details" xml:space="preserve">
+                               <source>The parsed Page TSconfig tree you see in the default view is actually compiled from this TSconfig code in the order it appears here. This view lets you see how the parsed version came to be.
+You can also click the edit-icons of the various pages to go directly to the TSconfig fields of the pages.</source>
+                       </trans-unit>
+                       <trans-unit id="_tsconfig_edit.seeAlso">
+                               <source>_MOD_web_info:tsconfig_hierarchy</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="_tsconfig_edit.image" xml:space="preserve">
+                               <source>EXT:info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png,
+EXT:info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png,
+EXT:info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="tsconfig_edit.image_descr" xml:space="preserve">
+                               <source>Shows the raw Page TSconfig code. First you see the default content from TYPO3_CONF_VARS (probably added by extensions), then the content from the "TSconfig" field of the first page in the root line ("Intro") and then for each root line page up to the current page (not shown in screenshot).
+In the bottom of the page you will see a link which will open editing forms for all of the TSconfig fields shown in the list!
+Here you see specifically the TSconfig fields of the first and second page in the rootline being edited. Notice the "TS" icon next to the first field - this will bring up a wizard that helps you to select among available Page TSconfig properties.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png
new file mode 100644 (file)
index 0000000..7c3b179
Binary files /dev/null and b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png
new file mode 100644 (file)
index 0000000..b039f42
Binary files /dev/null and b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png
new file mode 100644 (file)
index 0000000..a9dd936
Binary files /dev/null and b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png
new file mode 100644 (file)
index 0000000..a9016c4
Binary files /dev/null and b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png
new file mode 100644 (file)
index 0000000..7bbc563
Binary files /dev/null and b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png differ
diff --git a/typo3/sysext/info_pagetsconfig/cshimages/img_1.png b/typo3/sysext/info_pagetsconfig/cshimages/img_1.png
deleted file mode 100644 (file)
index 7c3b179..0000000
Binary files a/typo3/sysext/info_pagetsconfig/cshimages/img_1.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/cshimages/img_2.png b/typo3/sysext/info_pagetsconfig/cshimages/img_2.png
deleted file mode 100644 (file)
index b039f42..0000000
Binary files a/typo3/sysext/info_pagetsconfig/cshimages/img_2.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/cshimages/img_3.png b/typo3/sysext/info_pagetsconfig/cshimages/img_3.png
deleted file mode 100644 (file)
index a9dd936..0000000
Binary files a/typo3/sysext/info_pagetsconfig/cshimages/img_3.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/cshimages/img_4.png b/typo3/sysext/info_pagetsconfig/cshimages/img_4.png
deleted file mode 100644 (file)
index a9016c4..0000000
Binary files a/typo3/sysext/info_pagetsconfig/cshimages/img_4.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/cshimages/img_5.png b/typo3/sysext/info_pagetsconfig/cshimages/img_5.png
deleted file mode 100644 (file)
index 7bbc563..0000000
Binary files a/typo3/sysext/info_pagetsconfig/cshimages/img_5.png and /dev/null differ
index c837dfb..ea47542 100644 (file)
@@ -6,7 +6,7 @@ if (TYPO3_MODE === 'BE') {
                'web_info',
                \TYPO3\CMS\InfoPagetsconfig\Controller\InfoPageTyposcriptConfigController::class,
                NULL,
-               'LLL:EXT:info_pagetsconfig/locallang.xlf:mod_pagetsconfig'
+               'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:mod_pagetsconfig'
        );
 }
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/locallang_csh_webinfo.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf');
diff --git a/typo3/sysext/info_pagetsconfig/locallang.xlf b/typo3/sysext/info_pagetsconfig/locallang.xlf
deleted file mode 100644 (file)
index d478631..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814840" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="info_pagetsconfig">
-               <header/>
-               <body>
-                       <trans-unit id="tsconf_title">
-                               <source>Page TSconfig</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_0">
-                               <source>All</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1">
-                               <source>Module key ('mod') with overruling user settings</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1a">
-                               <source>Module: Web&gt;Page</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1b">
-                               <source>Module: Web&gt;View</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1c">
-                               <source>Module: Web&gt;Modules</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1d">
-                               <source>Module: Web&gt;List</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1e">
-                               <source>Module: Web&gt;Info</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1f">
-                               <source>Module: Web&gt;Func</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_parts_1g">
-                               <source>Module: Web&gt;Template</source>
-                       </trans-unit>
-                       <trans-unit id="tsconf_configFields">
-                               <source>View TSconfig fields content</source>
-                       </trans-unit>
-                       <trans-unit id="editThisColumn">
-                               <source>Edit the field '%s' for all listed pages</source>
-                       </trans-unit>
-                       <trans-unit id="editTSconfig">
-                               <source>Edit TSconfig for this page</source>
-                       </trans-unit>
-                       <trans-unit id="editTSconfig_all">
-                               <source>Edit TSconfig for all shown pages</source>
-                       </trans-unit>
-                       <trans-unit id="editTSconfig_default">
-                               <source>Default Configuration from TYPO3_CONF_VARS</source>
-                       </trans-unit>
-                       <trans-unit id="mod_pagetsconfig">
-                               <source>Page TSconfig</source>
-                       </trans-unit>
-                       <trans-unit id="sort_alphabetic">
-                               <source>Sort alphabetically:</source>
-                       </trans-unit>
-                       <trans-unit id="pagetitle">
-                               <source>Pagetitle:</source>
-                       </trans-unit>
-                       <trans-unit id="included_tsconfig_files">
-                               <source>Included Files:</source>
-                       </trans-unit>
-                       <trans-unit id="written_tsconfig_lines">
-                               <source>Lines:</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/info_pagetsconfig/locallang_csh_webinfo.xlf b/typo3/sysext/info_pagetsconfig/locallang_csh_webinfo.xlf
deleted file mode 100644 (file)
index 2b2f0f7..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814841" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="info_pagetsconfig">
-               <header/>
-               <body>
-                       <trans-unit id="tsconfig_hierarchy.alttitle">
-                               <source>Page TSconfig hierarchy viewer</source>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_hierarchy.description">
-                               <source>Allows the user to view the compiled Page TSconfig structure for a branch of the pagetree.</source>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_hierarchy.details" xml:space="preserve">
-                               <source>This viewer is indispensable for getting an overview of Page TSconfig settings as they apply to various branches in the page tree. You can see the configuration structure of any page where all inherited Page TSconfig is parsed and the result shown. This helps you to evaluate that the settings you have applied are actually found at the correct position in the configuration tree.
-You can also see the Page TSconfig TypoScript code for each page in the root line with the viewer.
-
-See the links for more information about what Page TSconfig is.</source>
-                       </trans-unit>
-                       <trans-unit id="_tsconfig_hierarchy.seeAlso" xml:space="preserve">
-                               <source>_MOD_web_info:tsconfig_edit,
-pages:TSconfig,
-Page TSconfig objects | http://docs.typo3.org/typo3cms/TSconfigReference/PageTsconfig/Index.html</source>
-                               <note from="developer">A part of this string is an internal text, which must not be changed. Just copy this part into the translation field and do not change it. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="_tsconfig_hierarchy.image" xml:space="preserve">
-                               <source>EXT:info_pagetsconfig/cshimages/img_1.png,
-EXT:info_pagetsconfig/cshimages/img_2.png,</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_hierarchy.image_descr" xml:space="preserve">
-                               <source>This is how the parsed Page TSconfig tree can look. It contains the "sum" of all the configuration code from the root line and any default settings. This shows the whole tree but you can also select other top level objects (TLO) in the selector box in the top if you want to limit the view to a single branch
-One of the branches in Page TSconfig has the special property that it is overridden with any User TSconfig in the same object path given for the current backend user. When you view only the "mod" TLO any user settings for the current backend user are applied as well. Here it is evident that some additional settings must apply for the user since only "mod.SHARED.colPos_list" was actually found in Page TSconfig (according to the "All" view in the first image).</source>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_edit.alttitle">
-                               <source>Page TSconfig content viewer</source>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_edit.description">
-                               <source>Displays the raw TSconfig code of all pages in the current root line including any default code.</source>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_edit.details" xml:space="preserve">
-                               <source>The parsed Page TSconfig tree you see in the default view is actually compiled from this TSconfig code in the order it appears here. This view lets you see how the parsed version came to be.
-You can also click the edit-icons of the various pages to go directly to the TSconfig fields of the pages.</source>
-                       </trans-unit>
-                       <trans-unit id="_tsconfig_edit.seeAlso">
-                               <source>_MOD_web_info:tsconfig_hierarchy</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="_tsconfig_edit.image" xml:space="preserve">
-                               <source>EXT:info_pagetsconfig/cshimages/img_3.png,
-EXT:info_pagetsconfig/cshimages/img_4.png,
-EXT:info_pagetsconfig/cshimages/img_5.png</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="tsconfig_edit.image_descr" xml:space="preserve">
-                               <source>Shows the raw Page TSconfig code. First you see the default content from TYPO3_CONF_VARS (probably added by extensions), then the content from the "TSconfig" field of the first page in the root line ("Intro") and then for each root line page up to the current page (not shown in screenshot).
-In the bottom of the page you will see a link which will open editing forms for all of the TSconfig fields shown in the list!
-Here you see specifically the TSconfig fields of the first and second page in the rootline being edited. Notice the "TS" icon next to the first field - this will bring up a wizard that helps you to select among available Page TSconfig properties.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>