[TASK] Use simple syntax for labels in module registration 34/47134/3
authorBenni Mack <benni@typo3.org>
Sun, 6 Mar 2016 02:38:13 +0000 (03:38 +0100)
committerJan Helke <typo3@helke.de>
Sun, 6 Mar 2016 09:43:14 +0000 (10:43 +0100)
Resolves: #74363
Releases: master
Change-Id: Ic9cd97f5b1dc6654020782e91a49330fb4bfcfbe
Reviewed-on: https://review.typo3.org/47134
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
14 files changed:
typo3/sysext/backend/Classes/Module/ModuleLoader.php
typo3/sysext/backend/ext_tables.php
typo3/sysext/core/Documentation/Changelog/master/Deprecation-72827-ModuleIconConfigurationViaLabelstabs_imagestab.rst
typo3/sysext/core/ext_tables.php
typo3/sysext/dbal/ext_tables.php
typo3/sysext/func/ext_tables.php
typo3/sysext/info/ext_tables.php
typo3/sysext/install/ext_tables.php
typo3/sysext/lowlevel/ext_tables.php
typo3/sysext/recordlist/ext_tables.php
typo3/sysext/scheduler/ext_tables.php
typo3/sysext/setup/ext_tables.php
typo3/sysext/taskcenter/ext_tables.php
typo3/sysext/tstemplate/ext_tables.php

index 5e969c7..dfc1806 100644 (file)
@@ -173,7 +173,7 @@ class ModuleLoader
         $finalModuleConfiguration = $setupInformation['configuration'];
         $finalModuleConfiguration['name'] = $name;
         // Language processing. This will add module labels and image reference to the internal ->moduleLabels array of the LANG object.
-        $this->addLabelsForModule($name, $setupInformation['labels']);
+        $this->addLabelsForModule($name, ($finalModuleConfiguration['labels'] ?? $setupInformation['labels']));
 
         // Default script setup
         if ($setupInformation['configuration']['script'] === '_DISPATCH' || isset($setupInformation['configuration']['routeTarget'])) {
index 87d03b3..e5d39f7 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_layout',
             'icon' => 'EXT:backend/Resources/Public/Icons/module-page.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:backend/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:backend/Resources/Private/Language/locallang_mod.xlf'
         )
     );
 
index 5f2ac7e..2e20cc4 100644 (file)
@@ -43,8 +43,6 @@ Replace the ``[labels][tabs_images][tab]`` with ``[icon]`` in ``ext_tables.php``
             'name' => 'system_dbint',
             'workspaces' => 'online',
             'icon' => 'EXT:lowlevel/Resources/Public/Icons/module-dbint.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf'
         )
-    );
\ No newline at end of file
+    );
index 53be210..1a5fced 100644 (file)
@@ -61,46 +61,34 @@ $GLOBALS['TBE_MODULES'] = array(
     'help' => '',
     '_configuration' => array(
         'web' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_web.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_web.xlf',
             'name' => 'web',
             'iconIdentifier' => 'module-web'
         ),
         'file' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_file.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_file.xlf',
             'navigationFrameModule' => 'file_navframe',
             'name' => 'file',
             'workspaces' => 'online,custom',
             'iconIdentifier' => 'module-file'
         ),
         'user' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_usertools.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_usertools.xlf',
             'name' => 'user',
             'iconIdentifier' => 'status-user-backend'
         ),
         'tools' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_admintools.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_admintools.xlf',
             'name' => 'tools',
             'iconIdentifier' => 'module-tools'
         ),
         'system' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_system.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_system.xlf',
             'name' => 'system',
             'iconIdentifier' => 'module-system'
         ),
         'help' => array(
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_help.xlf'
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_help.xlf',
             'name' => 'help',
             'iconIdentifier' => 'module-help'
         )
index 880c6b4..8729237 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'admin',
             'name' => 'tools_txdbalM1',
             'icon' => 'EXT:dbal/Resources/Public/Icons/module-dbal.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:dbal/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:dbal/Resources/Private/Language/locallang_mod.xlf'
         )
     );
 }
index a3ddb70..02b6f7d 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_func',
             'icon' => 'EXT:func/Resources/Public/Icons/module-func.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_web_func.xlf',
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_web_func.xlf'
         )
     );
 }
index 1b83637..41714a0 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_info',
             'icon' => 'EXT:info/Resources/Public/Icons/module-info.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_web_info.xlf',
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_web_info.xlf'
         )
     );
 }
index 58fa1db..3869055 100644 (file)
@@ -21,9 +21,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'admin',
             'name' => 'system_extinstall',
             'icon' => 'EXT:install/Resources/Public/Icons/module-install.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:install/Resources/Private/Language/BackendModule.xlf',
-            ),
+            'labels' => 'LLL:EXT:install/Resources/Private/Language/BackendModule.xlf'
         )
     );
 }
index 73736a4..cf37907 100644 (file)
@@ -13,9 +13,7 @@ if (TYPO3_MODE === 'BE') {
             'name' => 'system_dbint',
             'workspaces' => 'online',
             'icon' => 'EXT:lowlevel/Resources/Public/Icons/module-dbint.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf'
         )
     );
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
@@ -29,9 +27,7 @@ if (TYPO3_MODE === 'BE') {
             'name' => 'system_config',
             'workspaces' => 'online',
             'icon' => 'EXT:lowlevel/Resources/Public/Icons/module-config.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf',
-            ),
+            'labels' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf'
         )
     );
 }
index 19dcd17..1cd7e78 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'user,group',
             'name' => 'web_list',
             'icon' => 'EXT:recordlist/Resources/Public/Icons/module-list.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:lang/locallang_mod_web_list.xlf',
-            ),
+            'labels' => 'LLL:EXT:lang/locallang_mod_web_list.xlf'
         )
     );
 
index 9fa1984..44ca256 100644 (file)
@@ -13,9 +13,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'admin',
             'name' => 'system_txschedulerM1',
             'icon' => 'EXT:scheduler/Resources/Public/Icons/module-scheduler.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:scheduler/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:scheduler/Resources/Private/Language/locallang_mod.xlf'
         )
     );
 
index 117a595..a784569 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'group,user',
             'name' => 'user_setup',
             'icon' => 'EXT:setup/Resources/Public/Icons/module-setup.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:setup/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:setup/Resources/Private/Language/locallang_mod.xlf'
         )
     );
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
index 6ba59cc..5b01500 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'group,user',
             'name' => 'user_task',
             'icon' => 'EXT:taskcenter/Resources/Public/Icons/module-taskcenter.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:taskcenter/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:taskcenter/Resources/Private/Language/locallang_mod.xlf'
         )
     );
 }
index d12e8ed..7a41246 100644 (file)
@@ -12,9 +12,7 @@ if (TYPO3_MODE === 'BE') {
             'access' => 'admin',
             'name' => 'web_ts',
             'icon' => 'EXT:tstemplate/Resources/Public/Icons/module-tstemplate.svg',
-            'labels' => array(
-                'll_ref' => 'LLL:EXT:tstemplate/Resources/Private/Language/locallang_mod.xlf',
-            ),
+            'labels' => 'LLL:EXT:tstemplate/Resources/Private/Language/locallang_mod.xlf'
         )
     );