From f64b639a3c0540edc96a7dda12e264266f387e6c Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 10 Nov 2016 22:26:09 +0100
Subject: [PATCH] [TASK] Move all CSH language files from EXT:lang to
Resources/Private/Language
Move all CSH language files from ext:lang to Resources/Private/Language
Resolves: #78648
Releases: master
Change-Id: I88102b1291b1628e91a5e0ee9c54d648d0160a51
Reviewed-on: https://review.typo3.org/50585
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
---
.../Classes/Form/Element/SelectTreeElement.php | 2 +-
.../Utility/ExtensionManagementUtility.php | 4 ++--
typo3/sysext/core/ext_tables.php | 18 +++++++++---------
.../Language}/locallang_csh_be_groups.xlf | 0
.../Language}/locallang_csh_be_users.xlf | 0
.../Private/Language}/locallang_csh_corebe.xlf | 0
.../Private/Language}/locallang_csh_pages.xlf | 0
.../Language}/locallang_csh_sysfilem.xlf | 0
.../Language}/locallang_csh_syslang.xlf | 0
.../Language}/locallang_csh_sysnews.xlf | 0
.../Language}/locallang_csh_web_func.xlf | 0
.../Language}/locallang_csh_web_info.xlf | 0
12 files changed, 12 insertions(+), 12 deletions(-)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_be_groups.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_be_users.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_corebe.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_pages.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_sysfilem.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_syslang.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_sysnews.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_web_func.xlf (100%)
rename typo3/sysext/lang/{ => Resources/Private/Language}/locallang_csh_web_info.xlf (100%)
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
index a8725b9c9b04..d1ae3ff5711f 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
@@ -104,7 +104,7 @@ class SelectTreeElement extends AbstractFormElement
// add necessary labels for tree header
if ($showHeader) {
- $resultArray['additionalInlineLanguageLabelFiles'][] = 'EXT:lang/locallang_csh_corebe.xlf';
+ $resultArray['additionalInlineLanguageLabelFiles'][] = 'EXT:lang/Resources/Private/Language/locallang_csh_corebe.xlf';
}
$resultArray['requireJsModules']['selectTreeElement'] = [
'TYPO3/CMS/Backend/FormEngine/Element/SelectTreeElement' => 'function (SelectTreeElement) { SelectTreeElement.initialize(); }'
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 3eb14bb7c387..a9c6fac5a1ef 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -1072,10 +1072,10 @@ class ExtensionManagementUtility
/**
* Adds a reference to a locallang file with $GLOBALS['TCA_DESCR'] labels
* FOR USE IN ext_tables.php FILES
- * eg. \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:lang/locallang_csh_pages.xlf'); for the pages table or \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_layout', 'EXT:frontend/Resources/Private/Language/locallang_csh_weblayout.xlf'); for the Web > Page module.
+ * eg. \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:lang/Resources/Private/Language/locallang_csh_pages.xlf'); for the pages table or \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_layout', 'EXT:frontend/Resources/Private/Language/locallang_csh_weblayout.xlf'); for the Web > Page module.
*
* @param string $tca_descr_key Description key. Typically a database table (like "pages") but for applications can be other strings, but prefixed with "_MOD_")
- * @param string $file_ref File reference to locallang file, eg. "EXT:lang/locallang_csh_pages.xlf" (or ".xml")
+ * @param string $file_ref File reference to locallang file, eg. "EXT:lang/Resources/Private/Language/locallang_csh_pages.xlf" (or ".xml")
* @return void
*/
public static function addLLrefForTCAdescr($tca_descr_key, $file_ref)
diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php
index ac2be5712f3f..026c17e82752 100644
--- a/typo3/sysext/core/ext_tables.php
+++ b/typo3/sysext/core/ext_tables.php
@@ -94,15 +94,15 @@ $GLOBALS['TBE_STYLES'] = [];
* For information about using the CSH API in TYPO3 you should consult the
* documentation found in "Inside TYPO3"
*/
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:lang/locallang_csh_pages.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:lang/locallang_csh_be_users.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_groups', 'EXT:lang/locallang_csh_be_groups.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_filemounts', 'EXT:lang/locallang_csh_sysfilem.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_language', 'EXT:lang/locallang_csh_syslang.xlf');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_news', 'EXT:lang/locallang_csh_sysnews.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:lang/Resources/Private/Language/locallang_csh_pages.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_users', 'EXT:lang/Resources/Private/Language/locallang_csh_be_users.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('be_groups', 'EXT:lang/Resources/Private/Language/locallang_csh_be_groups.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_filemounts', 'EXT:lang/Resources/Private/Language/locallang_csh_sysfilem.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_language', 'EXT:lang/Resources/Private/Language/locallang_csh_syslang.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_news', 'EXT:lang/Resources/Private/Language/locallang_csh_sysnews.xlf');
// General Core
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('xMOD_csh_corebe', 'EXT:lang/locallang_csh_corebe.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('xMOD_csh_corebe', 'EXT:lang/Resources/Private/Language/locallang_csh_corebe.xlf');
// Web > Info
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:lang/locallang_csh_web_info.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:lang/Resources/Private/Language/locallang_csh_web_info.xlf');
// Web > Func
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_func', 'EXT:lang/locallang_csh_web_func.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_func', 'EXT:lang/Resources/Private/Language/locallang_csh_web_func.xlf');
diff --git a/typo3/sysext/lang/locallang_csh_be_groups.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_be_groups.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_be_groups.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_be_groups.xlf
diff --git a/typo3/sysext/lang/locallang_csh_be_users.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_be_users.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_be_users.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_be_users.xlf
diff --git a/typo3/sysext/lang/locallang_csh_corebe.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_corebe.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_corebe.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_corebe.xlf
diff --git a/typo3/sysext/lang/locallang_csh_pages.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_pages.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_pages.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_pages.xlf
diff --git a/typo3/sysext/lang/locallang_csh_sysfilem.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_sysfilem.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_sysfilem.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_sysfilem.xlf
diff --git a/typo3/sysext/lang/locallang_csh_syslang.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_syslang.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_syslang.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_syslang.xlf
diff --git a/typo3/sysext/lang/locallang_csh_sysnews.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_sysnews.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_sysnews.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_sysnews.xlf
diff --git a/typo3/sysext/lang/locallang_csh_web_func.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_web_func.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_web_func.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_web_func.xlf
diff --git a/typo3/sysext/lang/locallang_csh_web_info.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_csh_web_info.xlf
similarity index 100%
rename from typo3/sysext/lang/locallang_csh_web_info.xlf
rename to typo3/sysext/lang/Resources/Private/Language/locallang_csh_web_info.xlf
--
GitLab