From 2ec2413946219fe492c38ec4946d7e19f7d1bfcc Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Tue, 21 Jul 2015 23:44:03 +0200
Subject: [PATCH] [TASK] EXT:dbal Uniform extension directory structure
Move mod1 directory to Modules/Dbal/
Move language files to Resources/PRivate/Language/
Resolves: #68451
Releases: master
Change-Id: I9e3c2238b2c71714c2f936a13dffc4029b3712f2
Reviewed-on: http://review.typo3.org/41796
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
---
.../dbal/Classes/Controller/ModuleController.php | 2 +-
typo3/sysext/dbal/{mod1 => Modules/Dbal}/index.php | 0
.../Private/Language}/locallang.xlf | 0
.../Private/Language}/locallang_mod.xlf | 0
typo3/sysext/dbal/ext_tables.php | 6 +++---
typo3/sysext/dbal/mod1/clear.gif | Bin 43 -> 0 bytes
6 files changed, 4 insertions(+), 4 deletions(-)
rename typo3/sysext/dbal/{mod1 => Modules/Dbal}/index.php (100%)
rename typo3/sysext/dbal/{mod1 => Resources/Private/Language}/locallang.xlf (100%)
rename typo3/sysext/dbal/{mod1 => Resources/Private/Language}/locallang_mod.xlf (100%)
delete mode 100644 typo3/sysext/dbal/mod1/clear.gif
diff --git a/typo3/sysext/dbal/Classes/Controller/ModuleController.php b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
index 1c420e2f7398..2069b5ebc5d3 100644
--- a/typo3/sysext/dbal/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
@@ -42,7 +42,7 @@ class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$this->MCONF = array(
'name' => $this->moduleName,
);
- $this->getLanguageService()->includeLLFile('EXT:dbal/mod1/locallang.xlf');
+ $this->getLanguageService()->includeLLFile('EXT:dbal/Resources/Private/Language/locallang.xlf');
parent::init();
}
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/Modules/Dbal/index.php
similarity index 100%
rename from typo3/sysext/dbal/mod1/index.php
rename to typo3/sysext/dbal/Modules/Dbal/index.php
diff --git a/typo3/sysext/dbal/mod1/locallang.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang.xlf
similarity index 100%
rename from typo3/sysext/dbal/mod1/locallang.xlf
rename to typo3/sysext/dbal/Resources/Private/Language/locallang.xlf
diff --git a/typo3/sysext/dbal/mod1/locallang_mod.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf
similarity index 100%
rename from typo3/sysext/dbal/mod1/locallang_mod.xlf
rename to typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf
diff --git a/typo3/sysext/dbal/ext_tables.php b/typo3/sysext/dbal/ext_tables.php
index d4d5ce939b79..0144f9cf3d9c 100644
--- a/typo3/sysext/dbal/ext_tables.php
+++ b/typo3/sysext/dbal/ext_tables.php
@@ -6,16 +6,16 @@ if (TYPO3_MODE === 'BE') {
'tools',
'txdbalM1',
'',
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/',
+ 'EXT:dbal/Modules/Dbal/',
array(
'script' => '_DISPATCH',
'access' => 'admin',
'name' => 'tools_txdbalM1',
'labels' => array(
'tabs_images' => array(
- 'tab' => '../Resources/Public/Icons/module-dbal.svg',
+ 'tab' => 'EXT:dbal/Resources/Public/Icons/module-dbal.svg',
),
- 'll_ref' => 'LLL:EXT:dbal/mod1/locallang_mod.xlf',
+ 'll_ref' => 'LLL:EXT:dbal/Resources/Private/Language/locallang_mod.xlf',
),
)
);
diff --git a/typo3/sysext/dbal/mod1/clear.gif b/typo3/sysext/dbal/mod1/clear.gif
deleted file mode 100644
index e1d2d83216e249399411d7e5caf10b5ece31db3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
scmZ?wbhEHbWMp7u_`tyM|Nnmm1_s5SEQ~;kK?g*DWE_~7To@Uw0od9HsQ>@~
--
GitLab