[TASK] Move language labels to correct extension(s) 92/60092/4
authorSusanne Moog <susanne.moog@typo3.com>
Mon, 11 Mar 2019 12:43:45 +0000 (13:43 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Fri, 15 Mar 2019 15:20:23 +0000 (16:20 +0100)
The filelist module contained labels solely used in different extensions,
for example "sys_file_storage.*" labels which was only used by the `core` extension.
Those labels have been moved to their corresponding parent extension.

This patch is a prerequisite for making filelist uninstallable and part
one of decoupling the filelist module. For more information see the
Epic.

Related: #87878
Resolves: #87879
Releases: master
Change-Id: I4954f9e8c45866ce34f387ec637b347b0d681bd8
Reviewed-on: https://review.typo3.org/c/60092
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
typo3/sysext/core/Configuration/Resource/Driver/LocalDriverFlexForm.xml
typo3/sysext/core/Resources/Private/Language/locallang_core.xlf
typo3/sysext/core/Resources/Private/Language/locallang_mod_file.xlf
typo3/sysext/filelist/Resources/Private/Language/locallang_mod_file_list.xlf
typo3/sysext/filelist/Resources/Private/Templates/FileList/Search.html
typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php
typo3/sysext/recordlist/Resources/Private/Language/locallang_browse_links.xlf

index 876a3b1..0874092 100644 (file)
@@ -39,7 +39,7 @@ class ListUtility
             $name = $folder->getName();
             $role = $folder->getRole();
             if ($role !== FolderInterface::ROLE_DEFAULT) {
             $name = $folder->getName();
             $role = $folder->getRole();
             if ($role !== FolderInterface::ROLE_DEFAULT) {
-                $tempName = htmlspecialchars($lang->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:role_folder_' . $role));
+                $tempName = htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:role_folder_' . $role));
                 if (!empty($tempName) && ($tempName !== $name)) {
                     // Set new name and append original name
                     $name = $tempName . ' (' . $name . ')';
                 if (!empty($tempName) && ($tempName !== $name)) {
                     // Set new name and append original name
                     $name = $tempName . ' (' . $name . ')';
index 3745a08..d14d8da 100644 (file)
@@ -5,10 +5,10 @@
                <el>
                        <basePath>
                                <TCEforms>
                <el>
                        <basePath>
                                <TCEforms>
-                                       <label>LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_basePath</label>
+                                       <label>LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_basePath</label>
                                        <config>
                                                <type>input</type>
                                        <config>
                                                <type>input</type>
-                                               <placeholder>LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_basePath_placeholder</placeholder>
+                                               <placeholder>LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_basePath_placeholder</placeholder>
                                                <eval>required</eval>
                                                <size>30</size>
                                        </config>
                                                <eval>required</eval>
                                                <size>30</size>
                                        </config>
                        </basePath>
                        <pathType>
                                <TCEforms>
                        </basePath>
                        <pathType>
                                <TCEforms>
-                                       <label>LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType</label>
+                                       <label>LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_pathType</label>
                                        <config>
                                                <type>radio</type>
                                                <items type="array">
                                                        <numIndex index="0" type="array">
                                        <config>
                                                <type>radio</type>
                                                <items type="array">
                                                        <numIndex index="0" type="array">
-                                                               <numIndex index="0">LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType_relative</numIndex>
+                                                               <numIndex index="0">LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_pathType_relative</numIndex>
                                                                <numIndex index="1">relative</numIndex>
                                                        </numIndex>
                                                        <numIndex index="1" type="array">
                                                                <numIndex index="1">relative</numIndex>
                                                        </numIndex>
                                                        <numIndex index="1" type="array">
-                                                               <numIndex index="0">LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_pathType_absolute</numIndex>
+                                                               <numIndex index="0">LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_pathType_absolute</numIndex>
                                                                <numIndex index="1">absolute</numIndex>
                                                        </numIndex>
                                                </items>
                                                                <numIndex index="1">absolute</numIndex>
                                                        </numIndex>
                                                </items>
@@ -35,7 +35,7 @@
                        </pathType>
                        <caseSensitive>
                                <TCEforms>
                        </pathType>
                        <caseSensitive>
                                <TCEforms>
-                                       <label>LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:localDriverFlexform_caseSensitive</label>
+                                       <label>LLL:EXT:core/Resources/Private/Language/locallang_mod_file.xlf:sys_file_storage.localDriverFlexform_caseSensitive</label>
                                        <config>
                                                <type>check</type>
                                                <default>1</default>
                                        <config>
                                                <type>check</type>
                                                <default>1</default>
index 96a419b..1687759 100644 (file)
@@ -118,6 +118,9 @@ Do you want to continue WITHOUT saving?</source>
                        <trans-unit id="labels._LOCALIZATION_">
                                <source>Localization</source>
                        </trans-unit>
                        <trans-unit id="labels._LOCALIZATION_">
                                <source>Localization</source>
                        </trans-unit>
+                       <trans-unit id="labels._REF_">
+                               <source>Ref</source>
+                       </trans-unit>
                        <trans-unit id="labels.setFields">
                                <source>Set fields</source>
                        </trans-unit>
                        <trans-unit id="labels.setFields">
                                <source>Set fields</source>
                        </trans-unit>
index a0e7fc4..1fabd7e 100644 (file)
                        <trans-unit id="sys_file_storage.isOffline">
                                <source>offline</source>
                        </trans-unit>
                        <trans-unit id="sys_file_storage.isOffline">
                                <source>offline</source>
                        </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_basePath">
+                               <source>Base path</source>
+                       </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_basePath_placeholder">
+                               <source>Add storage path here. For example: myPath/folder/</source>
+                       </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_pathType">
+                               <source>Path type</source>
+                       </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_pathType_relative">
+                               <source>relative</source>
+                       </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_pathType_absolute">
+                               <source>absolute</source>
+                       </trans-unit>
+                       <trans-unit id="sys_file_storage.localDriverFlexform_caseSensitive">
+                               <source>Uses case sensitive identifiers</source>
+                       </trans-unit>
+                       <trans-unit id="role_folder_temporary">
+                               <source>Temporary files</source>
+                       </trans-unit>
+                       <trans-unit id="role_folder_recycler">
+                               <source>Recycler</source>
+                       </trans-unit>
                </body>
        </file>
 </xliff>
                </body>
        </file>
 </xliff>
index e92f080..855dcef 100644 (file)
                        <trans-unit id="c_rw">
                                <source>RW</source>
                        </trans-unit>
                        <trans-unit id="c_rw">
                                <source>RW</source>
                        </trans-unit>
-                       <trans-unit id="c__REF_">
-                               <source>Ref</source>
-                       </trans-unit>
                        <trans-unit id="files">
                                <source>files</source>
                        </trans-unit>
                        <trans-unit id="temp">
                                <source>Temporary files</source>
                        </trans-unit>
                        <trans-unit id="files">
                                <source>files</source>
                        </trans-unit>
                        <trans-unit id="temp">
                                <source>Temporary files</source>
                        </trans-unit>
-                       <trans-unit id="role_folder_temporary">
-                               <source>Temporary files</source>
-                       </trans-unit>
-                       <trans-unit id="role_folder_recycler">
-                               <source>Recycler</source>
-                       </trans-unit>
                        <trans-unit id="read">
                                <source>R</source>
                        </trans-unit>
                        <trans-unit id="read">
                                <source>R</source>
                        </trans-unit>
                        <trans-unit id="write">
                                <source>W</source>
                        </trans-unit>
                        <trans-unit id="write">
                                <source>W</source>
                        </trans-unit>
-                       <trans-unit id="paramError">
-                               <source>Parameter Error</source>
-                       </trans-unit>
-                       <trans-unit id="targetNoDir">
-                               <source>Target was not a directory!</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_basePath">
-                               <source>Base path</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_basePath_placeholder">
-                               <source>Add storage path here. For example: myPath/folder/</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_pathType">
-                               <source>Path type</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_pathType_relative">
-                               <source>relative</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_pathType_absolute">
-                               <source>absolute</source>
-                       </trans-unit>
-                       <trans-unit id="localDriverFlexform_caseSensitive">
-                               <source>Uses case sensitive identifiers</source>
-                       </trans-unit>
                        <trans-unit id="storageNotBrowsableTitle">
                                <source>Access denied.</source>
                        </trans-unit>
                        <trans-unit id="storageNotBrowsableTitle">
                                <source>Access denied.</source>
                        </trans-unit>
                        <trans-unit id="editMetadataForLanguage">
                                <source>Edit metadata of this file for %s</source>
                        </trans-unit>
                        <trans-unit id="editMetadataForLanguage">
                                <source>Edit metadata of this file for %s</source>
                        </trans-unit>
+                       <trans-unit id="paramError">
+                               <source>Parameter Error</source>
+                       </trans-unit>
+                       <trans-unit id="targetNoDir">
+                               <source>Target was not a directory!</source>
+                       </trans-unit>
                </body>
        </file>
 </xliff>
                </body>
        </file>
 </xliff>
index 35f7793..1913e84 100644 (file)
@@ -25,7 +25,7 @@
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_tstamp' )}</th>
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_size' )}</th>
                                        <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c_rw' )}</th>
-                                       <th class="nowrap">{f:translate( key:'LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_' )}</th>
+                                       <th class="nowrap">{f:translate( key:'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels._REF_' )}</th>
                                </tr>
                                </thead>
                                <tbody>
                                </tr>
                                </thead>
                                <tbody>
index 99f6bd9..da79e4c 100644 (file)
@@ -427,7 +427,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
                     $addParams,
                     'id="checkDisplayThumbs"'
                 )
                     $addParams,
                     'id="checkDisplayThumbs"'
                 )
-                . htmlspecialchars($lang->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:displayThumbs')) . '</label></div>';
+                . htmlspecialchars($lang->sL('LLL:EXT:recordlist/Resources/Private/Language/locallang_browse_links.xlf:displayThumbs')) . '</label></div>';
             $out .= $thumbNailCheck;
         } else {
             $out .= '<div style="padding-top: 15px;"></div>';
             $out .= $thumbNailCheck;
         } else {
             $out .= '<div style="padding-top: 15px;"></div>';
index fac6c60..30e43ce 100644 (file)
@@ -1587,7 +1587,7 @@ class DatabaseRecordList
                     break;
                 case '_REF_':
                     // References
                     break;
                 case '_REF_':
                     // References
-                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:c__REF_')) . ']</i>';
+                    $theData[$fCol] = '<i>[' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels._REF_')) . ']</i>';
                     break;
                 case '_LOCALIZATION_':
                     // Path
                     break;
                 case '_LOCALIZATION_':
                     // Path
index 5b25ee7..b939a73 100644 (file)
@@ -249,7 +249,7 @@ class FolderUtilityRenderer
         $markup[] = '       <span class="input-group-btn">';
         $markup[] = '           <button class="btn btn-default" type="submit">'
             . htmlspecialchars(
         $markup[] = '       <span class="input-group-btn">';
         $markup[] = '           <button class="btn btn-default" type="submit">'
             . htmlspecialchars(
-                $this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:search')
+                $this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:search')
             )
             . '</button>';
         $markup[] = '       </span>';
             )
             . '</button>';
         $markup[] = '       </span>';
index 41e859a..1a7b84c 100644 (file)
                        <trans-unit id="page_id">
                                <source>Page ID</source>
                        </trans-unit>
                        <trans-unit id="page_id">
                                <source>Page ID</source>
                        </trans-unit>
+                       <trans-unit id="displayThumbs">
+                               <source>Display thumbnails</source>
+                       </trans-unit>
                </body>
        </file>
 </xliff>
                </body>
        </file>
 </xliff>