[TASK] Move language files to XLIFF 12/47712/2
authorFrancois Suter <francois@typo3.org>
Fri, 15 Apr 2016 15:32:52 +0000 (17:32 +0200)
committerFrancois Suter <francois@typo3.org>
Fri, 15 Apr 2016 15:35:47 +0000 (17:35 +0200)
And move to Resources/Private/Language.

Resolves: #75685
Releases: 2.0
Change-Id: I28f4b5c7f04ea467a1ed1db4adc3387c96f40823
Reviewed-on: https://review.typo3.org/47712
Reviewed-by: Francois Suter <francois@typo3.org>
Tested-by: Francois Suter <francois@typo3.org>
18 files changed:
ChangeLog
Classes/Ajax/AjaxHandler.php
Classes/UserFunction/FormEngine.php
Classes/Wizard/QueryCheckWizard.php
Configuration/TCA/Overrides/tx_datafilter_filters.php
Configuration/TCA/tx_dataquery_queries.php
Resources/Private/Language/locallang.xlf [new file with mode: 0644]
Resources/Private/Language/locallang_csh_txdatafilterfilters.xlf [new file with mode: 0644]
Resources/Private/Language/locallang_csh_txdataqueryqueries.xlf [new file with mode: 0644]
Resources/Private/Language/locallang_db.xlf [new file with mode: 0644]
composer.json
ext_conf_template.txt
ext_localconf.php
ext_tables.php
locallang.xml [deleted file]
locallang_csh_txdatafilterfilters.xml [deleted file]
locallang_csh_txdataqueryqueries.xml [deleted file]
locallang_db.xml [deleted file]

index a243b04..cfe04d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2016-04-15 Francois Suter (Cobweb)  <typo3@cobweb.ch>
 
        * Applied PSR-2 formatting and other cleanups, resolves #75678
+       * Moved language files to XLIFF, resolves #75685
 
 2015-09-27 Francois Suter (Cobweb)  <typo3@cobweb.ch>
 
index 5058b3b..568b7e1 100644 (file)
@@ -74,7 +74,7 @@ class AjaxHandler
             // Build the query
             $parsedQuery = $parser->buildQuery();
             // The query building completed, issue success message
-            $parsingTitle = $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.success');
+            $parsingTitle = $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.success');
             $parsingMessage = $parsedQuery;
 
             // Force a LIMIT to 1 and try executing the query
@@ -89,19 +89,19 @@ class AjaxHandler
                 $executionSeverity = FlashMessage::ERROR;
                 $errorMessage = $databaseConnection->sql_error();
                 $executionMessage = sprintf(
-                        $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.executionFailed'),
+                        $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.executionFailed'),
                         $errorMessage
                 );
             } else {
-                $executionMessage = $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.executionSuccessful');
+                $executionMessage = $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.executionSuccessful');
             }
         } catch (\Exception $e) {
             // The query parsing failed, issue error message
             $parsingSeverity = FlashMessage::ERROR;
-            $parsingTitle = $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.failure');
+            $parsingTitle = $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.failure');
             $exceptionCode = $e->getCode();
             // Display "improved" exception message (if available)
-            $parsingMessage = $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.exception-' . $exceptionCode);
+            $parsingMessage = $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.exception-' . $exceptionCode);
             // If some unexpected exception occurred, display original message
             if (empty($parsingMessage)) {
                 $parsingMessage = $e->getMessage();
@@ -121,7 +121,7 @@ class AjaxHandler
             $flashMessage = GeneralUtility::makeInstance(
                     FlashMessage::class,
                     $warningMessage,
-                    $languageService->sL('LLL:EXT:dataquery/locallang.xml:query.warning'),
+                    $languageService->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:query.warning'),
                     FlashMessage::WARNING
             );
             $flashMessageQueue->enqueue($flashMessage);
index 9a32ea7..b0c1fdf 100644 (file)
@@ -75,10 +75,10 @@ class FormEngine
      */
     public function renderFulltextIndices($parameters, UserElement $userField)
     {
-        $output = $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.no_index_or_missing_table');
+        $output = $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.no_index_or_missing_table');
 
         if (empty($parameters['row']['sql_query'])) {
-            $output = $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.no_query');
+            $output = $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.no_query');
         } else {
 
             // Fetch the query parts
@@ -112,11 +112,11 @@ class FormEngine
         foreach ($fields as $index => $indexedFields) {
             $output .= sprintf(
                     '%s <strong>fulltext:%s AS foo</strong>',
-                    $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.syntax_for_query'),
+                    $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.syntax_for_query'),
                     $index
             );
             $output .= sprintf(
-                    '<br/>' . $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.indexed_fields') . '<br/>',
+                    '<br/>' . $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.indexed_fields') . '<br/>',
                     $index,
                     $indexedFields
             );
@@ -134,16 +134,16 @@ class FormEngine
     {
         $outputs = array();
 
-        $string = $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.no_index');
+        $string = $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.no_index');
         $outputs[] = sprintf($string, $this->table);
 
         $tables = $this->analyser->getTables();
         if (!empty($tables)) {
             $listOfTables = implode(', ', $tables);
-            $string = $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.tables_list');
+            $string = $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.tables_list');
             $outputs[] = sprintf($string, $listOfTables);
         } else {
-            $outputs[] = $this->language->sL('LLL:EXT:dataquery/locallang_db.xlf:fulltext.no_table_found');
+            $outputs[] = $this->language->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:fulltext.no_table_found');
         }
         return implode('<br>', $outputs);
     }
index 11c3de8..21f5ecd 100644 (file)
@@ -56,9 +56,9 @@ class QueryCheckWizard
                 'var TX_DATAQUERY = {
                                fieldId : "' . $matches[1] . '",
                                labels : {
-                                       "debugTab" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/locallang.xml:wizard.check.debugTab') . '",
-                                       "previewTab" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/locallang.xml:wizard.check.previewTab') . '",
-                                       "validateButton" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/locallang.xml:wizard.check.validateButton') . '"
+                                       "debugTab" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:wizard.check.debugTab') . '",
+                                       "previewTab" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:wizard.check.previewTab') . '",
+                                       "validateButton" : "' . $GLOBALS['LANG']->sL('LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:wizard.check.validateButton') . '"
                                }
                        };'
         );
index a2dc2db..d59dc38 100644 (file)
@@ -5,7 +5,7 @@ if (!defined ('TYPO3_MODE'))    die ('Access denied.');
 $tempColumns = array(
        'tx_dataquery_sql' => array(
                'exclude' => TRUE,
-               'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_datafilter_filters.tx_dataquery_sql',
+               'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_datafilter_filters.tx_dataquery_sql',
                'config' => array(
                        'type' => 'text',
                        'cols' => '30',
@@ -19,5 +19,5 @@ $tempColumns = array(
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
        'tx_datafilter_filters',
-       '--div--;LLL:EXT:dataquery/locallang_db.xml:sql, tx_dataquery_sql'
+       '--div--;LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:sql, tx_dataquery_sql'
 );
index 6b6a9e9..9a4960f 100644 (file)
@@ -3,7 +3,7 @@ if (!defined ('TYPO3_MODE'))    die ('Access denied.');
 
 return array(
        'ctrl' => array (
-               'title' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries',
+               'title' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries',
                'label' => 'title',
                'descriptionColumn' => 'description',
                'tstamp' => 'tstamp',
@@ -44,7 +44,7 @@ return array(
                ),
                'title' => array(
                        'exclude' => 0,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.title',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.title',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30',
@@ -53,7 +53,7 @@ return array(
                ),
                'description' => array(
                        'exclude' => 0,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.description',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.description',
                        'config' => array(
                                'type' => 'text',
                                'cols' => '30',
@@ -62,7 +62,7 @@ return array(
                ),
                'sql_query' => array(
                        'exclude' => 0,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.sql_query',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.sql_query',
                        'config' => array(
                                'type' => 'text',
                                'cols' => '30',
@@ -71,7 +71,7 @@ return array(
                                        '_PADDING' => 2,
                                        'check' => array(
                                                'type' => 'userFunc',
-                                               'userFunc' => 'Tesseract\Dataquery\Wizard\QueryCheckWizard->render'
+                                               'userFunc' => 'Tesseract\\Dataquery\\Wizard\\QueryCheckWizard->render'
                                        )
                                )
                        )
@@ -86,7 +86,7 @@ return array(
                ),
                'cache_duration' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.cache_duration',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.cache_duration',
                        'config' => array(
                                'type' => 'input',
                                'size' => 20,
@@ -96,20 +96,20 @@ return array(
                ),
                'ignore_enable_fields' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_enable_fields',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_enable_fields',
                        'config' => array(
                                'type' => 'radio',
                                'default' => 0,
                                'items' => array(
-                                       array('LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_enable_fields.I.0', '0'), # don't ignore
-                                       array('LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_enable_fields.I.1', '1'), # ignore everything
-                                       array('LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_enable_fields.I.2', '2'), # ignore partially
+                                       array('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_enable_fields.I.0', '0'), # don't ignore
+                                       array('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_enable_fields.I.1', '1'), # ignore everything
+                                       array('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_enable_fields.I.2', '2'), # ignore partially
                                ),
                        )
                ),
                'ignore_time_for_tables' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_time_for_tables',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_time_for_tables',
                        'config' => array(
                                'type' => 'input',
                                'size' => 255,
@@ -118,7 +118,7 @@ return array(
                ),
                'ignore_disabled_for_tables' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_disabled_for_tables',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_disabled_for_tables',
                        'config' => array(
                                'type' => 'input',
                                'size' => 255,
@@ -127,7 +127,7 @@ return array(
                ),
                'ignore_fegroup_for_tables' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_fegroup_for_tables',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_fegroup_for_tables',
                        'config' => array(
                                'type' => 'input',
                                'size' => 255,
@@ -136,18 +136,18 @@ return array(
                ),
                'ignore_language_handling' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_language_handling',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_language_handling',
                        'config' => array(
                                'type' => 'check',
                                'default' => 0,
                                'items' => array(
-                                       array('LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.ignore_language_handling.I.0', ''),
+                                       array('LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.ignore_language_handling.I.0', ''),
                                ),
                        )
                ),
                'skip_overlays_for_tables' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.skip_overlays_for_tables',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.skip_overlays_for_tables',
                        'config' => array(
                                'type' => 'input',
                                'size' => 255,
@@ -155,7 +155,7 @@ return array(
                ),
                'get_versions_directly' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.get_versions_directly',
+                       'label' => 'LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.get_versions_directly',
                        'config' => array(
                                'type' => 'input',
                                'size' => 255,
@@ -165,7 +165,7 @@ return array(
        'types' => array(
                '0' => array(
                        'showitem' => 'hidden, title;;1, sql_query, fulltext_indices,
-                                                       --div--;LLL:EXT:dataquery/locallang_db.xml:tx_dataquery_queries.tab.advanced, cache_duration, ignore_enable_fields;;2, ignore_language_handling;;3, get_versions_directly'
+                                                       --div--;LLL:EXT:dataquery/Resources/Private/Language/locallang_db.xlf:tx_dataquery_queries.tab.advanced, cache_duration, ignore_enable_fields;;2, ignore_language_handling;;3, get_versions_directly'
                )
        ),
        'palettes' => array(
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..fb10b11
--- /dev/null
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+       <file source-language="en" datatype="plaintext" original="messages" date="2016-04-15T15:19:46Z" product-name="dataquery">
+               <header/>
+               <body>
+                       <trans-unit id="limits" xml:space="preserve">
+                               <source>Limits</source>
+                       </trans-unit>
+                       <trans-unit id="query.success" xml:space="preserve">
+                               <source>The query was parsed successfully</source>
+                       </trans-unit>
+                       <trans-unit id="query.failure" xml:space="preserve">
+                               <source>The query is not valid</source>
+                       </trans-unit>
+                       <trans-unit id="query.warning" xml:space="preserve">
+                               <source>Problems in the query</source>
+                       </trans-unit>
+                       <trans-unit id="query.executionSuccessful" xml:space="preserve">
+                               <source>The query was executed successfully. Note that this is probably not the query that will be eventually executed, as it misses all the filters, TYPO3-specific conditions, etc.</source>
+                       </trans-unit>
+                       <trans-unit id="query.executionFailed" xml:space="preserve">
+                               <source>The query execution failed with the following error: %s</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1272556228" xml:space="preserve">
+                               <source>The SELECT keyword is missing. Please add it.</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1272556601" xml:space="preserve">
+                               <source>The FROM keyword is missing or is written in lowercase. Please add it or use uppercase.</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1280323976" xml:space="preserve">
+                               <source>No columns selected. Nothing was detected between the SELECT and the FROM keywords.</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1272954424" xml:space="preserve">
+                               <source>Bad SQL syntax, opening and closing brackets are not balanced. Note that Data Query supports only a sub-set of SQL features. It may also be that the query uses unsupported SQL elements. Please refer to the manual.</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1280323639" xml:space="preserve">
+                               <source>No table name was found after the FROM statement. Note that Data Query supports only a sub-set of SQL features. It may also be that the query uses unsupported SQL elements. Please refer to the manual.</source>
+                       </trans-unit>
+                       <trans-unit id="query.exception-1313354033" xml:space="preserve">
+                               <source>A &quot;uid&quot; field seems to be missing for the main table. You must set it manually when using the DISTINCT keyword. Please refer to the manual.</source>
+                       </trans-unit>
+                       <trans-unit id="wizard.check.debugTab" xml:space="preserve">
+                               <source>Validate</source>
+                       </trans-unit>
+                       <trans-unit id="wizard.check.previewTab" xml:space="preserve">
+                               <source>Preview</source>
+                       </trans-unit>
+                       <trans-unit id="wizard.check.debugQuery" xml:space="preserve">
+                               <source>Validate the query</source>
+                       </trans-unit>
+                       <trans-unit id="wizard.check.previewQuery" xml:space="preserve">
+                               <source>Preview query results</source>
+                       </trans-unit>
+                       <trans-unit id="wizard.check.validateButton" xml:space="preserve">
+                               <source>Validate Query</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_csh_txdatafilterfilters.xlf b/Resources/Private/Language/locallang_csh_txdatafilterfilters.xlf
new file mode 100644 (file)
index 0000000..838ade5
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+       <file source-language="en" datatype="plaintext" original="messages" date="2016-04-15T15:19:54Z" product-name="dataquery">
+               <header/>
+               <body>
+                       <trans-unit id="tx_dataquery_sql.alttitle" xml:space="preserve">
+                               <source>SQL WHERE</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_sql.description" xml:space="preserve">
+                               <source>Additional SQL statements that will be added to the WHERE clause.</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_sql.details" xml:space="preserve">
+                               <source>
+                               This field works in relation with the dataquery extension.
+                               Any SQL entered here will be added to the WHERE clause of the SQL query assembled by dataquery. Do not add the keyword &quot;WHERE&quot; yourself.
+                               Expressions can be used inside these statements, but don't forget to use the fullQuoteStr function to guard against SQL injection!
+                       </source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_csh_txdataqueryqueries.xlf b/Resources/Private/Language/locallang_csh_txdataqueryqueries.xlf
new file mode 100644 (file)
index 0000000..4dcd62e
--- /dev/null
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+       <file source-language="en" datatype="plaintext" original="messages" date="2016-04-15T15:20:01Z" product-name="dataquery">
+               <header/>
+               <body>
+                       <trans-unit id=".alttitle" xml:space="preserve">
+                               <source>Data Queries</source>
+                       </trans-unit>
+                       <trans-unit id=".description" xml:space="preserve">
+                               <source>Data Queries are a SQL-based Data Provider for use with the Tesseract framework</source>
+                       </trans-unit>
+                       <trans-unit id=".syntax" xml:space="preserve">
+                               <source>
+                               Data Queries enable you to write SQL queries without worrying about all the TYPO3-specific mechanisms like enable fields or translation handling.
+                               There's a restriction on what SQL elements you can use in the queries and how to write such queries. Please refer to the manual for more information.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="hidden.alttitle" xml:space="preserve">
+                               <source>Hide</source>
+                       </trans-unit>
+                       <trans-unit id="hidden.description" xml:space="preserve">
+                               <source>This field is not actively used inside Tesseract.</source>
+                       </trans-unit>
+                       <trans-unit id="hidden.details" xml:space="preserve">
+                               <source>
+                               This field is not considered by the existing components of Tesseract. It could be used to give a visual indication of an obsolete query.
+                               May be used actively in the future or remove altogether.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="title.alttitle" xml:space="preserve">
+                               <source>Title</source>
+                       </trans-unit>
+                       <trans-unit id="title.description" xml:space="preserve">
+                               <source>Some significant name or label for the query.</source>
+                       </trans-unit>
+                       <trans-unit id="description.alttitle" xml:space="preserve">
+                               <source>Description</source>
+                       </trans-unit>
+                       <trans-unit id="description.description" xml:space="preserve">
+                               <source>Purely descriptive field. Can be used for entering any necessary information about the query.</source>
+                       </trans-unit>
+                       <trans-unit id="sql_query.alttitle" xml:space="preserve">
+                               <source>SQL query</source>
+                       </trans-unit>
+                       <trans-unit id="sql_query.description" xml:space="preserve">
+                               <source>SQL-based query to the local database.</source>
+                       </trans-unit>
+                       <trans-unit id="sql_query.details" xml:space="preserve">
+                               <source>
+                               SQL queries entered in this field don't need to cater for TYPO3 specifics like enable fields or such. This is all handled automatically unless disabled (see the &quot;Advanced&quot; tab).
+                               Not all SQL syntactic elements can be used. Furthermore the query has to be written in a certain way. Please refer to the manual for a complete overview of these conditions.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="cache_duration.alttitle" xml:space="preserve">
+                               <source>Cache duration</source>
+                       </trans-unit>
+                       <trans-unit id="cache_duration.description" xml:space="preserve">
+                               <source>Number of seconds during which the result of the query must be stored.</source>
+                       </trans-unit>
+                       <trans-unit id="cache_duration.details" xml:space="preserve">
+                               <source>
+                               The Data Query tool performs some quite complex operations on the data sets retrieved from the database. It is worth storing the result into a cache table to prevent repeating these operations needlessly.
+                               This cache can be quite large and may even crash your database when writing to it. Please take care to set the &quot;Cache limit&quot; parameter in the extension configuration to some appropriate value.
+                               Setting the cache duration to 0 will effectively disable caching for that query.
+                               Refer to the manual for more details about caching.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="ignore_enable_fields.alttitle" xml:space="preserve">
+                               <source>Ignore enable fields</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_enable_fields.description" xml:space="preserve">
+                               <source>Choose a behavior with regards to the handling of enable fields.</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_enable_fields.details" xml:space="preserve">
+                               <source>
+                               Enables fields are those defined as such in the TCA of each table. They are generally the hidden or disabled field, the start and end time and the fe_groups access rights.
+                               By default Data Query automatically respects all these fields and adds the corresponding conditions to the SQL query. However it is possible to disable this behavior.
+                               Check the &quot;Ignore all fields&quot; radio button to totally disable this behavior for all tables. On the other hand you can check the &quot;Ignore some fields for some tables&quot; button and define exactly which enable fields should be ignored for which table in the three text fields that follow. Enter comma-separated table names to exclude one or more tables. Use &quot;*&quot; to ignore all of them. Leave blank to ignore none.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="ignore_time_for_tables.description" xml:space="preserve">
+                               <source>List tables for which the start and end time condition should not apply.</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_time_for_tables.syntax" xml:space="preserve">
+                               <source>
+                               Enter a comma-separated list of table names, e.g.
+
+                               pages,tt_content
+
+                               Use &quot;*&quot; to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="ignore_disabled_for_tables.description" xml:space="preserve">
+                               <source>List tables for which the hidden or disabled condition should not apply.</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_disabled_for_tables.syntax" xml:space="preserve">
+                               <source>
+                               Enter a comma-separated list of table names, e.g.
+
+                               pages,tt_content
+
+                               Use &quot;*&quot; to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="ignore_fegroup_for_tables.description" xml:space="preserve">
+                               <source>List tables for which the access rights condition should not apply.</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_fegroup_for_tables.syntax" xml:space="preserve">
+                               <source>
+                               Enter a comma-separated list of table names, e.g.
+
+                               pages,tt_content
+
+                               Use &quot;*&quot; to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="ignore_language_handling.alttitle" xml:space="preserve">
+                               <source>Translation handling</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_language_handling.description" xml:space="preserve">
+                               <source>Checking this box disables the automatic use of all fields related to translation handling, as defined in the TCA.</source>
+                       </trans-unit>
+                       <trans-unit id="ignore_language_handling.details" xml:space="preserve">
+                               <source>
+                               Checking this box generally makes sense only in a site with a single language.
+                               It can also be used in special situations when the language selection is written in the SQL query itself, or when querying tables that may not follow the usual TYPO3 language handling pattern.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="skip_overlays_for_tables.description" xml:space="preserve">
+                               <source>Comma-separated list of tables for which neither the language conditions, nor the translation overlay mechanism should be applied.</source>
+                       </trans-unit>
+                       <trans-unit id="get_versions_directly.description" xml:space="preserve">
+                               <source>List tables for which to get the version overlays straightaway rather than the placeholder records.</source>
+                       </trans-unit>
+                       <trans-unit id="get_versions_directly.details" xml:space="preserve">
+                               <source>
+                               By default Data Query will get the placeholders for new or modified records and then overlay these with the appropriate workspace version.
+
+                               However if your query contains JOINs between versioned records, the chances are that the relations between those records is found only in the workspace version of the record and not the placeholder. In such a case, the workspace version should be selected directly be entering the relevant table names in that field.
+
+                               NOTE: this feature should be considered as still experimental. It has been tested successfully in some situations, but some other scenarios may not be covered.
+                       </source>
+                       </trans-unit>
+                       <trans-unit id="get_versions_directly.seeAlso" xml:space="preserve">
+                               <source>TYPO3 Core API | http://typo3.org/documentation/document-library/core-documentation/doc_core_api/current/</source>
+                       </trans-unit>
+                       <trans-unit id="get_versions_directly.syntax" xml:space="preserve">
+                               <source>
+                               Enter a comma-separated list of table names, e.g.
+
+                               pages,tt_content
+
+                               Use &quot;*&quot; to apply this parameter all tables. On the contrary, leave blank for applying it to none.
+                       </source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
new file mode 100644 (file)
index 0000000..2248d17
--- /dev/null
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+       <file source-language="en" datatype="plaintext" original="messages" date="2016-04-15T15:20:08Z" product-name="dataquery">
+               <header/>
+               <body>
+                       <trans-unit id="tx_dataquery_queries" xml:space="preserve">
+                               <source>Data Query</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.tab.advanced" xml:space="preserve">
+                               <source>Advanced</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.title" xml:space="preserve">
+                               <source>Title</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.description" xml:space="preserve">
+                               <source>Description</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.sql_query" xml:space="preserve">
+                               <source>SQL Query</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.fulltext_indices" xml:space="preserve">
+                               <source>Full Text Indices</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.cache_duration" xml:space="preserve">
+                               <source>Cache duration (in seconds)</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_enable_fields" xml:space="preserve">
+                               <source>Ignore enable fields</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_enable_fields.I.0" xml:space="preserve">
+                               <source>Don't ignore any fields</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_enable_fields.I.1" xml:space="preserve">
+                               <source>Ignore all fields</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_enable_fields.I.2" xml:space="preserve">
+                               <source>Ignore some fields for some tables (defined below)</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_time_for_tables" xml:space="preserve">
+                               <source>Ignore start time and end time condition for tables:</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_disabled_for_tables" xml:space="preserve">
+                               <source>Ignore &quot;hidden&quot; field for tables:</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_fegroup_for_tables" xml:space="preserve">
+                               <source>Ignore access rights for tables:</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_language_handling" xml:space="preserve">
+                               <source>Language handling</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.ignore_language_handling.I.0" xml:space="preserve">
+                               <source>Ignore language handling (show records from all languages)</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.skip_overlays_for_tables" xml:space="preserve">
+                               <source>Don't overlay tables:</source>
+                       </trans-unit>
+                       <trans-unit id="tx_dataquery_queries.get_versions_directly" xml:space="preserve">
+                               <source>Directly get version overlays for tables:</source>
+                       </trans-unit>
+                       <trans-unit id="wizards.add_dataquery" xml:space="preserve">
+                               <source>Add a new Data Query</source>
+                       </trans-unit>
+                       <trans-unit id="tx_datafilter_filters.tx_dataquery_sql" xml:space="preserve">
+                               <source>Additional SQL WHERE clause</source>
+                       </trans-unit>
+                       <trans-unit id="sql" xml:space="preserve">
+                               <source>SQL</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.no_query" xml:space="preserve">
+                               <source>To check for FULLTEXT indices, please write a query first and save it at least once.</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.table_name" xml:space="preserve">
+                               <source>Table (with FULLTEXT index)</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.fulltext_fields" xml:space="preserve">
+                               <source>Fields composing the FULLTEXT index</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.no_index_or_missing_table" xml:space="preserve">
+                               <source>No FULLTEXT index found for this table or incomplete SQL query.</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.no_index" xml:space="preserve">
+                               <source>No FULLTEXT index for table &quot;%s&quot;.</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.tables_list" xml:space="preserve">
+                               <source>FULLTEXT index found in table(s): %s</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.no_table_found" xml:space="preserve">
+                               <source>Actually, I couldn't find any tables having a FULLTEXT index.</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.indexed_fields" xml:space="preserve">
+                               <source>where &quot;%s&quot; is an index composed by fields: %s</source>
+                       </trans-unit>
+                       <trans-unit id="fulltext.syntax_for_query" xml:space="preserve">
+                               <source>Marker to be placed in the SELECT part:</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
\ No newline at end of file
index 2682a17..8a14034 100644 (file)
                        "Tesseract\\Dataquery\\": "Classes/"
                }
        },
-       "autoload-dev": {
-               "psr-4": {
-                       "Tesseract\\Dataquery\\Tests\\": "Tests/",
-                       "TYPO3\\CMS\\Core\\Tests\\": "vendor/typo3/cms/typo3/sysext/core/Tests/"
-               }
-       },
        "version": "2.0.0",
        "require": {
                "typo3/cms-core": ">=7.6.0,<8.0",
index d8991f9..3488b42 100644 (file)
@@ -1,4 +1,4 @@
-# customsubcategory=limits=LLL:EXT:dataquery/locallang.xml:limits
+# customsubcategory=limits=LLL:EXT:dataquery/Resources/Private/Language/locallang.xlf:limits
 
 # cat=basic/limits/; type=integer; label=Cache limit: Limit size (in bytes) beyond which the cache is not written to preserve the database. Leave empty or set to 0 for no limits.
 cacheLimit = 1000000
index 3ec514b..b13a933 100644 (file)
@@ -32,11 +32,11 @@ if (!defined ('TYPO3_MODE')) {
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearAllCache_additionalTables']['tx_dataquery_cache'] = 'tx_dataquery_cache';
 
 // Register a hook to clear the cache for a given page
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearPageCacheEval']['tx_dataquery'] = 'Tesseract\Dataquery\Cache\CacheHandler->clearCache';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearPageCacheEval']['tx_dataquery'] = 'Tesseract\\Dataquery\\Cache\\CacheHandler->clearCache';
 
 // Register a hook with datafilter to handle the extra field added by dataquery
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['datafilter']['postprocessReturnValue']['tx_dataquery'] = \Tesseract\Dataquery\Hook\DataFilterHook::class;
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['datafilter']['postprocessEmptyFilterCheck']['tx_dataquery'] = \Tesseract\Dataquery\Hook\DataFilterHook::class;
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['datafilter']['postprocessReturnValue']['tx_dataquery'] = 'Tesseract\\Dataquery\\Hook\\DataFilterHook';
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['datafilter']['postprocessEmptyFilterCheck']['tx_dataquery'] = 'Tesseract\\Dataquery\\Hook\\DataFilterHook';
 
 // Register wizard validation method with generic BE ajax calls handler
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler(
index f1f27ea..fd89188 100644 (file)
@@ -20,7 +20,7 @@ $iconRegistry->registerIcon(
 // Add context sensitive help (csh) for this table
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
         'tx_dataquery_queries',
-        'EXT:' . $_EXTKEY . '/locallang_csh_txdataqueryqueries.xml'
+        'EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_csh_txdataqueryqueries.xlf'
 );
 
 // Register dataquery as a Data Provider
@@ -30,7 +30,7 @@ $GLOBALS['TCA']['tt_content']['columns']['tx_displaycontroller_provider2']['conf
 // Add a wizard for adding a dataquery
 $addDataqueryWizard = array(
        'type' => 'script',
-       'title' => 'LLL:EXT:' . $_EXTKEY . '/locallang_db.xml:wizards.add_dataquery',
+       'title' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_db.xlf:wizards.add_dataquery',
        'script' => 'wizard_add.php',
        'module' => array(
                'name' => 'wizard_add'
@@ -48,5 +48,5 @@ $GLOBALS['TCA']['tt_content']['columns']['tx_displaycontroller_provider2']['conf
 // Add context sensitive help (csh) for the added field
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
         'tx_datafilter_filters',
-        'EXT:' . $_EXTKEY . '/locallang_csh_txdatafilterfilters.xml'
+        'EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_csh_txdatafilterfilters.xlf'
 );
diff --git a/locallang.xml b/locallang.xml
deleted file mode 100644 (file)
index 0babe96..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<T3locallang>
-    <meta type="array">
-        <description>Labels for EM</description>
-        <type>module</type>
-        <csh_table></csh_table>
-        <labelContext type="array">
-        </labelContext>
-    </meta>
-    <data type="array">
-        <languageKey index="default" type="array">
-            <label index="limits">Limits</label>
-            <label index="query.success">The query was parsed successfully</label>
-                       <label index="query.failure">The query is not valid</label>
-                       <label index="query.warning">Problems in the query</label>
-            <label index="query.executionSuccessful">The query was executed successfully. Note that this is probably not the query that will be eventually executed, as it misses all the filters, TYPO3-specific conditions, etc.</label>
-            <label index="query.executionFailed">The query execution failed with the following error: %s</label>
-            <label index="query.exception-1272556228">The SELECT keyword is missing. Please add it.</label>
-            <label index="query.exception-1272556601">The FROM keyword is missing or is written in lowercase. Please add it or use uppercase.</label>
-            <label index="query.exception-1280323976">No columns selected. Nothing was detected between the SELECT and the FROM keywords.</label>
-            <label index="query.exception-1272954424">Bad SQL syntax, opening and closing brackets are not balanced. Note that Data Query supports only a sub-set of SQL features. It may also be that the query uses unsupported SQL elements. Please refer to the manual.</label>
-                       <label index="query.exception-1280323639">No table name was found after the FROM statement. Note that Data Query supports only a sub-set of SQL features. It may also be that the query uses unsupported SQL elements. Please refer to the manual.</label>
-                       <label index="query.exception-1313354033">A "uid" field seems to be missing for the main table. You must set it manually when using the DISTINCT keyword. Please refer to the manual.</label>
-            <label index="wizard.check.debugTab">Validate</label>
-            <label index="wizard.check.previewTab">Preview</label>
-            <label index="wizard.check.debugQuery">Validate the query</label>
-            <label index="wizard.check.previewQuery">Preview query results</label>
-            <label index="wizard.check.validateButton">Validate Query</label>
-        </languageKey>
-    </data>
-</T3locallang>
\ No newline at end of file
diff --git a/locallang_csh_txdatafilterfilters.xml b/locallang_csh_txdatafilterfilters.xml
deleted file mode 100644 (file)
index 95bfe30..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- $Id$-->
-<T3locallang>
-       <meta type="array">
-               <description>Contents of dataquery csh for additional fields in datafilter</description>
-               <type>CSH</type>
-               <csh_table>tx_datafilter_filters</csh_table>
-               <fileId>EXT:dataquery/locallang_csh_txdatafilterfilters.xml</fileId>
-               <labelContext type="array">
-               </labelContext>
-       </meta>
-       <data type="array">
-               <languageKey index="default" type="array">
-                       <label index="tx_dataquery_sql.alttitle">SQL WHERE</label>
-                       <label index="tx_dataquery_sql.description">Additional SQL statements that will be added to the WHERE clause.</label>
-                       <label index="tx_dataquery_sql.details">
-                               This field works in relation with the dataquery extension.
-                               Any SQL entered here will be added to the WHERE clause of the SQL query assembled by dataquery. Do not add the keyword "WHERE" yourself.
-                               Expressions can be used inside these statements, but don't forget to use the fullQuoteStr function to guard against SQL injection!
-                       </label>
-               </languageKey>
-       </data>
-</T3locallang>
diff --git a/locallang_csh_txdataqueryqueries.xml b/locallang_csh_txdataqueryqueries.xml
deleted file mode 100644 (file)
index e7c40b0..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- $Id$-->
-<T3locallang>
-       <meta type="array">
-               <description>Contents of dataquery csh</description>
-               <type>CSH</type>
-               <csh_table>tx_dataquery_queries</csh_table>
-               <fileId>EXT:dataquery/locallang_csh_txdataqueryqueries.xml</fileId>
-               <labelContext type="array">
-               </labelContext>
-       </meta>
-       <data type="array">
-               <languageKey index="default" type="array">
-                       <label index=".alttitle">Data Queries</label>
-                       <label index=".description">Data Queries are a SQL-based Data Provider for use with the Tesseract framework</label>
-                       <label index=".syntax">
-                               Data Queries enable you to write SQL queries without worrying about all the TYPO3-specific mechanisms like enable fields or translation handling.
-                               There's a restriction on what SQL elements you can use in the queries and how to write such queries. Please refer to the manual for more information.
-                       </label>
-                       <label index="hidden.alttitle">Hide</label>
-                       <label index="hidden.description">This field is not actively used inside Tesseract.</label>
-                       <label index="hidden.details">
-                               This field is not considered by the existing components of Tesseract. It could be used to give a visual indication of an obsolete query.
-                               May be used actively in the future or remove altogether.
-                       </label>
-                       <label index="title.alttitle">Title</label>
-                       <label index="title.description">Some significant name or label for the query.</label>
-                       <label index="description.alttitle">Description</label>
-                       <label index="description.description">Purely descriptive field. Can be used for entering any necessary information about the query.</label>
-                       <label index="sql_query.alttitle">SQL query</label>
-                       <label index="sql_query.description">SQL-based query to the local database.</label>
-                       <label index="sql_query.details">
-                               SQL queries entered in this field don't need to cater for TYPO3 specifics like enable fields or such. This is all handled automatically unless disabled (see the "Advanced" tab).
-                               Not all SQL syntactic elements can be used. Furthermore the query has to be written in a certain way. Please refer to the manual for a complete overview of these conditions.
-                       </label>
-                       <label index="cache_duration.alttitle">Cache duration</label>
-                       <label index="cache_duration.description">Number of seconds during which the result of the query must be stored.</label>
-                       <label index="cache_duration.details">
-                               The Data Query tool performs some quite complex operations on the data sets retrieved from the database. It is worth storing the result into a cache table to prevent repeating these operations needlessly.
-                               This cache can be quite large and may even crash your database when writing to it. Please take care to set the "Cache limit" parameter in the extension configuration to some appropriate value.
-                               Setting the cache duration to 0 will effectively disable caching for that query.
-                               Refer to the manual for more details about caching.
-                       </label>
-                       <label index="ignore_enable_fields.alttitle">Ignore enable fields</label>
-                       <label index="ignore_enable_fields.description">Choose a behavior with regards to the handling of enable fields.</label>
-                       <label index="ignore_enable_fields.details">
-                               Enables fields are those defined as such in the TCA of each table. They are generally the hidden or disabled field, the start and end time and the fe_groups access rights.
-                               By default Data Query automatically respects all these fields and adds the corresponding conditions to the SQL query. However it is possible to disable this behavior.
-                               Check the "Ignore all fields" radio button to totally disable this behavior for all tables. On the other hand you can check the "Ignore some fields for some tables" button and define exactly which enable fields should be ignored for which table in the three text fields that follow. Enter comma-separated table names to exclude one or more tables. Use "*" to ignore all of them. Leave blank to ignore none.
-                       </label>
-                       <label index="ignore_time_for_tables.description">List tables for which the start and end time condition should not apply.</label>
-                       <label index="ignore_time_for_tables.syntax">
-                               Enter a comma-separated list of table names, e.g.
-
-                               pages,tt_content
-
-                               Use "*" to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
-                       </label>
-                       <label index="ignore_disabled_for_tables.description">List tables for which the hidden or disabled condition should not apply.</label>
-                       <label index="ignore_disabled_for_tables.syntax">
-                               Enter a comma-separated list of table names, e.g.
-
-                               pages,tt_content
-
-                               Use "*" to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
-                       </label>
-                       <label index="ignore_fegroup_for_tables.description">List tables for which the access rights condition should not apply.</label>
-                       <label index="ignore_fegroup_for_tables.syntax">
-                               Enter a comma-separated list of table names, e.g.
-
-                               pages,tt_content
-
-                               Use "*" to skip the condition for all tables. On the contrary, leave blank for the condition to apply to all tables.
-                       </label>
-                       <label index="ignore_language_handling.alttitle">Translation handling</label>
-                       <label index="ignore_language_handling.description">Checking this box disables the automatic use of all fields related to translation handling, as defined in the TCA.</label>
-                       <label index="ignore_language_handling.details">
-                               Checking this box generally makes sense only in a site with a single language.
-                               It can also be used in special situations when the language selection is written in the SQL query itself, or when querying tables that may not follow the usual TYPO3 language handling pattern.
-                       </label>
-                       <label index="skip_overlays_for_tables.description">Comma-separated list of tables for which neither the language conditions, nor the translation overlay mechanism should be applied.</label>
-                       <label index="get_versions_directly.description">List tables for which to get the version overlays straightaway rather than the placeholder records.</label>
-                       <label index="get_versions_directly.details">
-                               By default Data Query will get the placeholders for new or modified records and then overlay these with the appropriate workspace version.
-
-                               However if your query contains JOINs between versioned records, the chances are that the relations between those records is found only in the workspace version of the record and not the placeholder. In such a case, the workspace version should be selected directly be entering the relevant table names in that field.
-
-                               NOTE: this feature should be considered as still experimental. It has been tested successfully in some situations, but some other scenarios may not be covered.
-                       </label>
-                       <label index="get_versions_directly.seeAlso">TYPO3 Core API | http://typo3.org/documentation/document-library/core-documentation/doc_core_api/current/</label>
-                       <label index="get_versions_directly.syntax">
-                               Enter a comma-separated list of table names, e.g.
-
-                               pages,tt_content
-
-                               Use "*" to apply this parameter all tables. On the contrary, leave blank for applying it to none.
-                       </label>
-               </languageKey>
-       </data>
-</T3locallang>
diff --git a/locallang_db.xml b/locallang_db.xml
deleted file mode 100644 (file)
index 5f72487..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<T3locallang>
-       <meta type="array">
-               <type>database</type>
-               <description>Language labels for database tables/fields belonging to extension 'dataquery'</description>
-       </meta>
-       <data type="array">
-               <languageKey index="default" type="array">
-                       <label index="tx_dataquery_queries">Data Query</label>
-                       <label index="tx_dataquery_queries.tab.advanced">Advanced</label>
-                       <label index="tx_dataquery_queries.title">Title</label>
-                       <label index="tx_dataquery_queries.description">Description</label>
-                       <label index="tx_dataquery_queries.sql_query">SQL Query</label>
-                       <label index="tx_dataquery_queries.fulltext_indices">Full Text Indices</label>
-                       <label index="tx_dataquery_queries.cache_duration">Cache duration (in seconds)</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields">Ignore enable fields</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.0">Don't ignore any fields</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.1">Ignore all fields</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.2">Ignore some fields for some tables (defined below)</label>
-                       <label index="tx_dataquery_queries.ignore_time_for_tables">Ignore start time and end time condition for tables:</label>
-                       <label index="tx_dataquery_queries.ignore_disabled_for_tables">Ignore "hidden" field for tables:</label>
-                       <label index="tx_dataquery_queries.ignore_fegroup_for_tables">Ignore access rights for tables:</label>
-                       <label index="tx_dataquery_queries.ignore_language_handling">Language handling</label>
-                       <label index="tx_dataquery_queries.ignore_language_handling.I.0">Ignore language handling (show records from all languages)</label>
-                       <label index="tx_dataquery_queries.skip_overlays_for_tables">Don't overlay tables:</label>
-                       <label index="tx_dataquery_queries.get_versions_directly">Directly get version overlays for tables:</label>
-                       <label index="wizards.add_dataquery">Add a new Data Query</label>
-                       <label index="tx_datafilter_filters.tx_dataquery_sql">Additional SQL WHERE clause</label>
-                       <label index="sql">SQL</label>
-                       <label index="fulltext.no_query">To check for FULLTEXT indices, please write a query first and save it at least once.</label>
-                       <label index="fulltext.table_name">Table (with FULLTEXT index)</label>
-                       <label index="fulltext.fulltext_fields">Fields composing the FULLTEXT index</label>
-                       <label index="fulltext.no_index_or_missing_table">No FULLTEXT index found for this table or incomplete SQL query.</label>
-                       <label index="fulltext.no_index">No FULLTEXT index for table "%s".</label>
-                       <label index="fulltext.tables_list">FULLTEXT index found in table(s): %s</label>
-                       <label index="fulltext.no_table_found">Actually, I couldn't find any tables having a FULLTEXT index.</label>
-                       <label index="fulltext.indexed_fields">where "%s" is an index composed by fields: %s</label>
-                       <label index="fulltext.syntax_for_query">Marker to be placed in the SELECT part:</label>
-               </languageKey>
-               <languageKey index="fr" type="array">
-                       <label index="tx_dataquery_queries">Requête</label>
-                       <label index="tx_dataquery_queries.tab.advanced">Avancé</label>
-                       <label index="tx_dataquery_queries.title">Titre</label>
-                       <label index="tx_dataquery_queries.description">Description</label>
-                       <label index="tx_dataquery_queries.sql_query">Requête SQL</label>
-                       <label index="tx_dataquery_queries.cache_duration">Durée du cache (en secondes)</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields">Ignorer les champs d'activation</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.0">Ne pas ignorer les champs</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.1">Ignorer tous les champs</label>
-                       <label index="tx_dataquery_queries.ignore_enable_fields.I.2">Ignorer certains champs pour certaines tables (à définir ci-dessous)</label>
-                       <label index="tx_dataquery_queries.ignore_time_for_tables">Ignorer les dates de début et de fin pour les tables:</label>
-                       <label index="tx_dataquery_queries.ignore_disabled_for_tables">Ignorer le champ "Caché" pour les tables:</label>
-                       <label index="tx_dataquery_queries.ignore_fegroup_for_tables">Ignorer les droits d'accès pour les tables:</label>
-                       <label index="tx_dataquery_queries.ignore_language_handling">Ignorer les langues</label>
-                       <label index="tx_dataquery_queries.ignore_language_handling.I.0">Ne pas considérer les critères de langue (afficher les enregistrements de toutes les langues)</label>
-                       <label index="tx_dataquery_queries.skip_overlays_for_tables">Ne pas surcharger les langues pour les tables:</label>
-                       <label index="tx_dataquery_queries.get_versions_directly">Sélectionner directement les versions de travail pour les tables:</label>
-                       <label index="wizards.add_dataquery">Ajouter une nouvelle requête</label>
-                       <label index="tx_datafilter_filters.tx_dataquery_sql">Clause SQL WHERE additionnelle</label>
-                       <label index="sql">SQL</label>
-               </languageKey>
-       </data>
-</T3locallang>
\ No newline at end of file