From 52e0fbd64afb6bba5f3823bf49cffe2334299cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= <stephan@grossberndt.de>
Date: Mon, 18 Dec 2017 16:06:02 +0100
Subject: [PATCH] [BUGFIX] Use correct path and add missing labels in TCA of
 extensionmanager

Releases: master, 8.7, 7.6
Resolves: #83375
Change-Id: Id998c9fb688b8dcd41f09a0b863f87e8290adb2a
Reviewed-on: https://review.typo3.org/55149
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
---
 ...xtensionmanager_domain_model_extension.php | 30 +++++++++----------
 ...tensionmanager_domain_model_repository.php | 12 ++++----
 .../Private/Language/locallang_db.xlf         |  8 ++++-
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
index 1d03af40053b..f168052853bc 100644
--- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
+++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php
@@ -16,14 +16,14 @@ return [
     ],
     'columns' => [
         'extension_key' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.extensionkey',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.extensionkey',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'version' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.version',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.version',
             'config' => [
                 'type' => 'input',
                 'size' => 30
@@ -35,21 +35,21 @@ return [
             ]
         ],
         'integer_version' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.integerversion',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.integerversion',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'title' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.title',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'description' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.description',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.description',
             'config' => [
                 'type' => 'text',
                 'cols' => 30,
@@ -57,7 +57,7 @@ return [
             ]
         ],
         'state' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.state',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.state',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -66,7 +66,7 @@ return [
             ]
         ],
         'category' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.category',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.category',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -75,7 +75,7 @@ return [
             ]
         ],
         'last_updated' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.lastupdated',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.lastupdated',
             'config' => [
                 'type' => 'input',
                 'renderType' => 'inputDateTime',
@@ -83,7 +83,7 @@ return [
             ]
         ],
         'update_comment' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.updatecomment',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.updatecomment',
             'config' => [
                 'type' => 'text',
                 'cols' => 30,
@@ -91,42 +91,42 @@ return [
             ]
         ],
         'author_name' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authorname',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authorname',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'author_email' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authoremail',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.authoremail',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ]
         ],
         'current_version' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.currentversion',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.currentversion',
             'config' => [
                 'type' => 'check',
                 'size' => 1
             ]
         ],
         'review_state' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.reviewstate',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.reviewstate',
             'config' => [
                 'type' => 'check',
                 'size' => 1
             ]
         ],
         'md5hash' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.md5hash',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.md5hash',
             'config' => [
                 'type' => 'input',
                 'size' => 1,
             ],
         ],
         'serialized_dependencies' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_extension.serializedDependencies',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_extension.serializedDependencies',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
index d039276b7954..b854e10ca160 100644
--- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
+++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php
@@ -16,42 +16,42 @@ return [
     ],
     'columns' => [
         'title' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.title',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ],
         ],
         'description' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.description',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.description',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ],
         ],
         'wsdl_url' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.wsdlUrl',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.wsdlUrl',
             'config' => [
                 'type' => 'input',
                 'size' => 30
             ],
         ],
         'mirror_list_url' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.mirrorListUrl',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.mirrorListUrl',
             'config' => [
                 'type' => 'text',
                 'cols' => 30,
             ],
         ],
         'last_update' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.lastUpdate',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.lastUpdate',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
             ],
         ],
         'extension_count' => [
-            'label' => 'LLL:EXT:extensionmanager/Resources/Private/locallang_db.xlf:tx_extensionmanager_domain_model_repository.extensionCount',
+            'label' => 'LLL:EXT:extensionmanager/Resources/Private/Language/locallang_db.xlf:tx_extensionmanager_domain_model_repository.extensionCount',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/extensionmanager/Resources/Private/Language/locallang_db.xlf
index fe63ac458444..17b083813491 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Language/locallang_db.xlf
+++ b/typo3/sysext/extensionmanager/Resources/Private/Language/locallang_db.xlf
@@ -45,6 +45,12 @@
 			<trans-unit id="tx_extensionmanager_domain_model_extension.integerversion">
 				<source>Integer Version</source>
 			</trans-unit>
+			<trans-unit id="tx_extensionmanager_domain_model_extension.currentversion">
+				<source>Current Version</source>
+			</trans-unit>
+			<trans-unit id="tx_extensionmanager_domain_model_extension.serializedDependencies">
+				<source>Serialized dependencies</source>
+			</trans-unit>
 			<trans-unit id="tx_extensionmanager_domain_model_repository">
 				<source>Repository</source>
 			</trans-unit>
@@ -68,4 +74,4 @@
 			</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>
-- 
GitLab