From 5e835b0818a0d19a5821852e0559cd849e8601ef Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 3 May 2016 21:15:42 +0200
Subject: [PATCH] [TASK] Remove legacy CSH label for impexp
For 4.5 a label for import/export was overridden and an extra file
was created for handling the legacy label.
The label is now merged into the original file and the overriding
option is removed.
Resolves: #76039
Releases: master
Change-Id: I9b2ad90cf2687a72041c1d3f38400fb689b59760
Reviewed-on: https://review.typo3.org/48003
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Resources/Private/Language/locallang_csh.xlf | 4 ++--
.../Private/Language/locallang_csh_45.xlf | 14 --------------
typo3/sysext/impexp/ext_tables.php | 2 --
3 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 typo3/sysext/impexp/Resources/Private/Language/locallang_csh_45.xlf
diff --git a/typo3/sysext/impexp/Resources/Private/Language/locallang_csh.xlf b/typo3/sysext/impexp/Resources/Private/Language/locallang_csh.xlf
index 26b5ba6c040b..d4d961ca3076 100644
--- a/typo3/sysext/impexp/Resources/Private/Language/locallang_csh.xlf
+++ b/typo3/sysext/impexp/Resources/Private/Language/locallang_csh.xlf
@@ -273,8 +273,8 @@ Entering a file name to save to makes it possible to write your export directly
<source>To import TYPO3 T3D/XML files into the page tree you click any page in the page tree (including the root page!), select "More options" and then "Import from .t3d". This will bring up the import interface where you can select a file to import or upload a new one.</source>
</trans-unit>
<trans-unit id="import.details" xml:space="preserve">
- <source><b>Tip: Import into a Sys Folder</b>
-To make sure that no records are lost during the import, you can make yourself safe by importing into a SysFolder you create first. After the import you can move all records to the final destinations. An example of such a scenario is if you configured the export to include relations; In that case a number of records may follow the export outside the page tree structure you are exporting. To make sure that all of these external records are written to the database, importing into a SysFolder is a good idea.
+ <source><b>Tip: Import into a Folder</b>
+To make sure that no records are lost during the import, you can make yourself safe by importing into a Folder you create first. After the import you can move all records to the final destinations. An example of such a scenario is if you configured the export to include relations; In that case a number of records may follow the export outside the page tree structure you are exporting. To make sure that all of these external records are written to the database, importing into a Folder is a good idea.
<b>Error messages:</b> Remember to consult the Message-tab before/after importing to see if there are any error messages there!</source>
</trans-unit>
diff --git a/typo3/sysext/impexp/Resources/Private/Language/locallang_csh_45.xlf b/typo3/sysext/impexp/Resources/Private/Language/locallang_csh_45.xlf
deleted file mode 100644
index 36628e9abbf0..000000000000
--- a/typo3/sysext/impexp/Resources/Private/Language/locallang_csh_45.xlf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
- <file t3:id="1415814830" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="impexp">
- <header/>
- <body>
- <trans-unit id="import.details" xml:space="preserve">
- <source><b>Tip: Import into a Folder</b>
-To make sure that no records are lost during the import, you can make yourself safe by importing into a Folder you create first. After the import you can move all records to the final destinations. An example of such a scenario is if you configured the export to include relations; In that case a number of records may follow the export outside the page tree structure you are exporting. To make sure that all of these external records are written to the database, importing into a Folder is a good idea.
-
-<b>Error messages:</b> Remember to consult the Message-tab before/after importing to see if there are any error messages there!</source>
- </trans-unit>
- </body>
- </file>
-</xliff>
diff --git a/typo3/sysext/impexp/ext_tables.php b/typo3/sysext/impexp/ext_tables.php
index 70203e19af7f..bfafd3e0e222 100644
--- a/typo3/sysext/impexp/ext_tables.php
+++ b/typo3/sysext/impexp/ext_tables.php
@@ -11,8 +11,6 @@ if (TYPO3_MODE === 'BE') {
'icon' => 'EXT:impexp/Resources/Public/Images/export.gif'
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('xMOD_tx_impexp', 'EXT:impexp/Resources/Private/Language/locallang_csh.xlf');
- // CSH labels for TYPO3 4.5 and greater. These labels override the ones set above, while still falling back to the original labels if no translation is available.
- $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:impexp/Resources/Private/Language/locallang_csh.xml'][] = 'EXT:impexp/Resources/Private/Language/locallang_csh_45.xlf';
// Special context menu actions for the import/export module
$importExportActions = '
9000 = DIVIDER
--
GitLab