[TASK] Move language in indexed_search 92/41592/3
authorMichael Oehlhof <typo3@oehlhof.de>
Fri, 17 Jul 2015 18:47:47 +0000 (20:47 +0200)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Fri, 17 Jul 2015 21:26:06 +0000 (23:26 +0200)
Resolves: #68292
Releases: master
Change-Id: Ic2cc96d6aea1bc37bd7d62f6b812102f24e94d76
Reviewed-on: http://review.typo3.org/41592
Reviewed-by: Patrick Kollodzik <patrick.kollodzik@googlemail.com>
Tested-by: Patrick Kollodzik <patrick.kollodzik@googlemail.com>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
14 files changed:
typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php [changed mode: 0644->0755]
typo3/sysext/indexed_search/Classes/FileContentParser.php
typo3/sysext/indexed_search/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/indexed_search/Configuration/TCA/index_config.php
typo3/sysext/indexed_search/Resources/Private/Language/locallang_csh_indexcfg.xlf [new file with mode: 0644]
typo3/sysext/indexed_search/Resources/Private/Language/locallang_db.xlf [new file with mode: 0644]
typo3/sysext/indexed_search/Resources/Private/Language/locallang_main.xlf [new file with mode: 0644]
typo3/sysext/indexed_search/Resources/Private/Language/locallang_pi.xlf [new file with mode: 0644]
typo3/sysext/indexed_search/ext_tables.php
typo3/sysext/indexed_search/locallang.xlf [deleted file]
typo3/sysext/indexed_search/locallang_csh_indexcfg.xlf [deleted file]
typo3/sysext/indexed_search/locallang_db.xlf [deleted file]
typo3/sysext/indexed_search/pi/class.tx_indexed_search_pi_wizicon.php
typo3/sysext/indexed_search/pi/locallang.xlf [deleted file]

old mode 100644 (file)
new mode 100755 (executable)
index bdd22fb..36fecbc
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
 
 use TYPO3\CMS\Core\Html\HtmlParser;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Index search frontend
@@ -33,14 +34,6 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
        public $prefixId = 'tx_indexedsearch';
 
        /**
-        * Path to this script relative to the extension dir.
-        *
-        * @var string
-        * @TODO This is still set to the "old" class location since the locallang.xlf file in the same dir is loaded by pi_loadLL
-        */
-       public $scriptRelPath = 'pi/class.tx_indexedsearch.php';
-
-       /**
         * Extension key.
         *
         * @var string
@@ -189,7 +182,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
        public function main($content, $conf) {
                // Initialize:
                $this->conf = $conf;
-               $this->pi_loadLL();
+               $this->LOCAL_LANG = $this->getLanguageService()->includeLLFile('EXT:indexed_search/Resources/Private/Language/locallang_pi.xlf' , FALSE, TRUE);
                $this->pi_setPiVarDefaults();
                // Initialize:
                $this->initialize();
@@ -2371,4 +2364,12 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
        public function getJoinPagesForQuery() {
                return (bool)$this->join_pages;
        }
+
+       /**
+        * Returns the Language Service
+        * @return LanguageService
+        */
+       protected function getLanguageService() {
+               return $GLOBALS['LANG'];
+       }
 }
index cfec8da..cb10c65 100644 (file)
@@ -62,7 +62,7 @@ class FileContentParser {
                // Ignore extensions
                $ignoreExtensions = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', strtolower($indexerConfig['ignoreExtensions']), TRUE);
                if (in_array($extension, $ignoreExtensions)) {
-                       $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:ignoreExtensions'), $extension), 1);
+                       $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:ignoreExtensions'), $extension), 1);
                        return FALSE;
                }
                // Switch on file extension:
@@ -78,10 +78,10 @@ class FileContentParser {
                                                $this->pdf_mode = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($indexerConfig['pdf_mode'], -100, 100);
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsNotFound'), $pdfPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:pdfToolsNotFound'), $pdfPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:pdfToolsDisabled'), 1);
                                }
                                break;
                        case 'doc':
@@ -92,10 +92,10 @@ class FileContentParser {
                                                $this->app['catdoc'] = $catdocPath . 'catdoc' . $exe;
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:catdocNotFound'), $catdocPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:catdocNotFound'), $catdocPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:catdocDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:catdocDisabled'), 1);
                                }
                                break;
                        case 'pps':
@@ -109,10 +109,10 @@ class FileContentParser {
                                                $this->app['ppthtml'] = $ppthtmlPath . 'ppthtml' . $exe;
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:ppthtmlNotFound'), $ppthtmlPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:ppthtmlNotFound'), $ppthtmlPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:ppthtmlDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:ppthtmlDisabled'), 1);
                                }
                                break;
                        case 'xls':
@@ -124,10 +124,10 @@ class FileContentParser {
                                                $this->app['xlhtml'] = $xlhtmlPath . 'xlhtml' . $exe;
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:xlhtmlNotFound'), $xlhtmlPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:xlhtmlNotFound'), $xlhtmlPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:xlhtmlDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:xlhtmlDisabled'), 1);
                                }
                                break;
                        case 'sxc':
@@ -148,10 +148,10 @@ class FileContentParser {
                                                $this->app['unzip'] = $unzipPath . 'unzip' . $exe;
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:unzipNotFound'), $unzipPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:unzipNotFound'), $unzipPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:unzipDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:unzipDisabled'), 1);
                                }
                                break;
                        case 'rtf':
@@ -162,10 +162,10 @@ class FileContentParser {
                                                $this->app['unrtf'] = $unrtfPath . 'unrtf' . $exe;
                                                $extOK = TRUE;
                                        } else {
-                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:unrtfNotFound'), $unrtfPath), 3);
+                                               $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:unrtfNotFound'), $unrtfPath), 3);
                                        }
                                } else {
-                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/locallang.xlf:unrtfDisabled'), 1);
+                                       $this->pObj->log_setTSlogMessage($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:unrtfDisabled'), 1);
                                }
                                break;
                        case 'txt':
@@ -276,13 +276,13 @@ class FileContentParser {
                        case 'pdf':
                                // PDF
                                if ($indexerConfig['pdftools']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.PDF'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.PDF'), $extension);
                                }
                                break;
                        case 'doc':
                                // Catdoc
                                if ($indexerConfig['catdoc']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.DOC'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.DOC'), $extension);
                                }
                                break;
                        case 'pps':
@@ -291,56 +291,56 @@ class FileContentParser {
                                // MS PowerPoint
                                // ppthtml
                                if ($indexerConfig['ppthtml']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.PP'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.PP'), $extension);
                                }
                                break;
                        case 'xls':
                                // MS Excel
                                // Xlhtml
                                if ($indexerConfig['xlhtml']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.XLS'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.XLS'), $extension);
                                }
                                break;
                        case 'sxc':
                                // Open Office Calc.
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXC'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.SXC'), $extension);
                                }
                                break;
                        case 'sxi':
                                // Open Office Impress
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXI'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.SXI'), $extension);
                                }
                                break;
                        case 'sxw':
                                // Open Office Writer
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.SXW'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.SXW'), $extension);
                                }
                                break;
                        case 'ods':
                                // Oasis OpenDocument Spreadsheet
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODS'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.ODS'), $extension);
                                }
                                break;
                        case 'odp':
                                // Oasis OpenDocument Presentation
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODP'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.ODP'), $extension);
                                }
                                break;
                        case 'odt':
                                // Oasis OpenDocument Text
                                if ($indexerConfig['unzip']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.ODT'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.ODT'), $extension);
                                }
                                break;
                        case 'rtf':
                                // Catdoc
                                if ($indexerConfig['unrtf']) {
-                                       return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.RTF'), $extension);
+                                       return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.RTF'), $extension);
                                }
                                break;
                        case 'jpeg':
@@ -349,25 +349,25 @@ class FileContentParser {
 
                        case 'tif':
                                // PHP EXIF
-                               return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.Images'), $extension);
+                               return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.Images'), $extension);
                                break;
                        case 'html':
 
                        case 'htm':
                                // PHP strip-tags()
-                               return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.HTML'), $extension);
+                               return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.HTML'), $extension);
                                break;
                        case 'txt':
                                // Raw text
-                               return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.TXT'), $extension);
+                               return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.TXT'), $extension);
                                break;
                        case 'csv':
                                // Raw text
-                               return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.CSV'), $extension);
+                               return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.CSV'), $extension);
                                break;
                        case 'xml':
                                // PHP strip-tags()
-                               return sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:extension.XML'), $extension);
+                               return sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:extension.XML'), $extension);
                                break;
                        default:
                                // Do nothing
@@ -443,7 +443,7 @@ class FileContentParser {
                                                        unlink($tempFileName);
                                                } else {
                                                        $content = '';
-                                                       $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/locallang.xlf:pdfToolsFailed'), $absFile), 2);
+                                                       $this->pObj->log_setTSlogMessage(sprintf($this->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:pdfToolsFailed'), $absFile), 2);
                                                }
                                                if ((string)$content !== '') {
                                                        $contentArr = $this->pObj->splitRegularContent($this->removeEndJunk($content));
index f85b931..5a1cff8 100644 (file)
@@ -3,7 +3,7 @@ defined('TYPO3_MODE') or die();
 
 // Register "old" FE plugin and hide layout, select_key and pages fields in BE
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(
-       array('LLL:EXT:indexed_search/locallang.xlf:mod_indexed_search', 'indexed_search'),
+       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_main.xlf:mod_indexed_search', 'indexed_search'),
        'list_type',
        'indexed_search'
 );
index 704c0d7..a9b31bf 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 return array(
        'ctrl' => array(
-               'title' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config',
+               'title' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config',
                'label' => 'title',
                'descriptionColumn' => 'description',
                'tstamp' => 'tstamp',
@@ -38,7 +38,7 @@ return array(
                        )
                ),
                'title' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.title',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.title',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30',
@@ -46,7 +46,7 @@ return array(
                        )
                ),
                'description' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.description',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.description',
                        'config' => array(
                                'type' => 'text',
                                'cols' => '30',
@@ -54,41 +54,41 @@ return array(
                        )
                ),
                'type' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.type',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type',
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.0', '0'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.1', '1'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.2', '2'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.3', '3'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.4', '4'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.type.I.5', '5')
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.0', '0'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.1', '1'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.2', '2'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.3', '3'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.4', '4'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.type.I.5', '5')
                                ),
                                'size' => 1,
                                'maxitems' => 1
                        )
                ),
                'depth' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth',
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.0', '0'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.1', '1'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.2', '2'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.depth.I.3', '3')
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.0', '0'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.1', '1'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.2', '2'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.depth.I.3', '3')
                                ),
                                'size' => 1,
                                'maxitems' => 1
                        )
                ),
                'table2index' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.table2index',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.table2index',
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.table2index.I.0', '0')
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.table2index.I.0', '0')
                                ),
                                'special' => 'tables',
                                'size' => 1,
@@ -96,7 +96,7 @@ return array(
                        )
                ),
                'alternative_source_pid' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.alternative_source_pid',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.alternative_source_pid',
                        'config' => array(
                                'type' => 'group',
                                'internal_type' => 'db',
@@ -112,7 +112,7 @@ return array(
                        )
                ),
                'indexcfgs' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.indexcfgs',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.indexcfgs',
                        'config' => array(
                                'type' => 'group',
                                'internal_type' => 'db',
@@ -128,48 +128,48 @@ return array(
                        )
                ),
                'get_params' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.get_params',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.get_params',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30'
                        )
                ),
                'fieldlist' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.fields',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.fields',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30'
                        )
                ),
                'externalUrl' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.externalUrl',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.externalUrl',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30'
                        )
                ),
                'chashcalc' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.chashcalc',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.chashcalc',
                        'config' => array(
                                'type' => 'check'
                        )
                ),
                'filepath' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.filepath',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.filepath',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30'
                        )
                ),
                'extensions' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.extensions',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.extensions',
                        'config' => array(
                                'type' => 'input',
                                'size' => '30'
                        )
                ),
                'url_deny' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.url_deny',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.url_deny',
                        'config' => array(
                                'type' => 'text',
                                'cols' => '30',
@@ -177,14 +177,14 @@ return array(
                        )
                ),
                'records_indexonchange' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.records_indexonchange',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.records_indexonchange',
                        'config' => array(
                                'type' => 'check',
                                'default' => '0'
                        )
                ),
                'timer_next_indexing' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_next_indexing',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_next_indexing',
                        'config' => array(
                                'type' => 'input',
                                'size' => '12',
@@ -194,7 +194,7 @@ return array(
                        )
                ),
                'timer_offset' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_offset',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_offset',
                        'config' => array(
                                'type' => 'input',
                                'size' => '8',
@@ -204,13 +204,13 @@ return array(
                        )
                ),
                'timer_frequency' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_frequency',
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.0', '3600'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.1', '86400'),
-                                       array('LLL:EXT:indexed_search/locallang_db.xlf:index_config.timer_frequency.I.2', '604800')
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_frequency.I.0', '3600'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_frequency.I.1', '86400'),
+                                       array('LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.timer_frequency.I.2', '604800')
                                ),
                                'size' => 1,
                                'maxitems' => 1,
@@ -218,7 +218,7 @@ return array(
                        )
                ),
                'recordsbatch' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.recordsbatch',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.recordsbatch',
                        'config' => array(
                                'type' => 'input',
                                'size' => '8',
@@ -229,7 +229,7 @@ return array(
                        )
                ),
                'set_id' => array(
-                       'label' => 'LLL:EXT:indexed_search/locallang_db.xlf:index_config.set_id',
+                       'label' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.set_id',
                        'config' => array(
                                'type' => 'none'
                        )
@@ -249,7 +249,7 @@ return array(
                        'showitem' => 'title, --palette--;;1, timer_next_indexing, timer_offset, timer_frequency, set_id, type, externalUrl, depth, url_deny',
                ),
                '4' => array(
-                       'showitem' => 'title, --palette--;;1, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type, alternative_source_pid;LLL:EXT:indexed_search/locallang_db.xlf:index_config.rootpage, depth',
+                       'showitem' => 'title, --palette--;;1, description, timer_next_indexing, timer_offset, timer_frequency, set_id, type, alternative_source_pid;LLL:EXT:indexed_search/Resources/Private/Language/locallang_db.xlf:index_config.rootpage, depth',
                ),
                '5' => array(
                        'showitem' => 'title, description, type, indexcfgs',
diff --git a/typo3/sysext/indexed_search/Resources/Private/Language/locallang_csh_indexcfg.xlf b/typo3/sysext/indexed_search/Resources/Private/Language/locallang_csh_indexcfg.xlf
new file mode 100644 (file)
index 0000000..206fe66
--- /dev/null
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814832" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
+               <header/>
+               <body>
+                       <trans-unit id=".description">
+                               <source>The Indexed Search configuration allows you to set up indexing of resources which are external to the TYPO3 page tree. This could be a library of records (like news), a directory structure of files (like PDFs) or an external URL to be crawled to some depth - or third-party content provided from other extensions via hooks.</source>
+                       </trans-unit>
+                       <trans-unit id=".details">
+                               <source>The Indexing Configuration records are used to set up how the indexing occurs, at which time and related to which part of the page tree. An important requirement to keep in mind is that the "crawler" extension must be installed since the indexing engine uses the "crawler" extensions queue as a timing device - and using the "crawler" extension means using a cron-job to activate it from the shell.</source>
+                       </trans-unit>
+                       <trans-unit id="title.description">
+                               <source>Provide a title for the configuration.</source>
+                       </trans-unit>
+                       <trans-unit id="description.description">
+                               <source>If needed, give it a description or put other important notes in this field.</source>
+                       </trans-unit>
+                       <trans-unit id="hidden.description">
+                               <source>Disable the configuration by this checkbox. If disabled, the configuration will be bypassed by the crawlers cron job.</source>
+                       </trans-unit>
+                       <trans-unit id="hidden.details">
+                               <source>Notice; Disabling the indexing process will not hide already indexed content in search results!</source>
+                       </trans-unit>
+                       <trans-unit id="_hidden.seeAlso">
+                               <source>index_config:starttime</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="starttime.description">
+                               <source>Set a start time for the configuration. If set, the configuration will be bypassed by the crawlers cron job until this time is reached.</source>
+                       </trans-unit>
+                       <trans-unit id="_starttime.seeAlso">
+                               <source>index_config:hidden</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="timer_frequency.description">
+                               <source>Use this setting to adjust how often you would like a re-indexing process to run for the configuration.</source>
+                       </trans-unit>
+                       <trans-unit id="_timer_frequency.seeAlso" xml:space="preserve">
+                               <source>index_config:timer_next_indexing,
+index_config:timer_offset</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="timer_offset.description">
+                               <source>The offset adjusts at what time of day you want the indexing process to run.</source>
+                       </trans-unit>
+                       <trans-unit id="_timer_offset.seeAlso">
+                               <source>index_config:timer_frequency</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="timer_next_indexing.description">
+                               <source>This field contains the date and time of the next occurring indexing session. If left blank the next indexing will occur as soon as the cron-script is run again (typically within the next minute) and afterwards set to the next time according to frequency and offset.</source>
+                       </trans-unit>
+                       <trans-unit id="_timer_next_indexing.seeAlso" xml:space="preserve">
+                               <source>index_config:timer_offset,
+index_config:timer_frequency</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="type.description">
+                               <source>Select the type of Indexing Configuration here.</source>
+                       </trans-unit>
+                       <trans-unit id="type.details" xml:space="preserve">
+                               <source>&lt;b&gt;Records&lt;/b&gt; - You will be able to index records on a specified page from a specified database table. You can determine which fields from that record you want to index and how additional GET parameters should look like when linking to the search result.
+&lt;b&gt;Files&lt;/b&gt; - Allows you to index a whole directory of files from the fileadmin/ folder. You can optionally specify how many levels of recursion you want.
+&lt;b&gt;External URL&lt;/b&gt; - Allows you to index an external site and search it from your TYPO3 installation! You can specify how deep the crawler should go on that external URL.
+&lt;b&gt;Page tree&lt;/b&gt; - Allows you to index the page tree using the cron script. This type will not be useful as a category for searching like the other types.
+&lt;b&gt;Meta configuration&lt;/b&gt; - Points to a collection of other indexing configurations in which the search will be done. Cannot be used for cron-job based indexing.
+&lt;b&gt;Custom&lt;/b&gt; - Other extensions might register custom types of configurations.</source>
+                       </trans-unit>
+                       <trans-unit id="table2index.description">
+                               <source>Specify the database table to index records from.</source>
+                       </trans-unit>
+                       <trans-unit id="alternative_source_pid.description">
+                               <source>By default the indexer will select records from the page id where the Indexing Configuration is stored. If you want an alternative page as the source of your records you can enter it here.</source>
+                       </trans-unit>
+                       <trans-unit id="_alternative_source_pid.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="get_params.description">
+                               <source>Enter the GET parameters necessary to display the search results. You can use ###UID### as a marker in the parameter template.</source>
+                       </trans-unit>
+                       <trans-unit id="get_params.details" xml:space="preserve">
+                               <source>Notice: The GET parameters are appended to the URL of the page where the Indexing Configuration is stored (which must be the page where a plugin exists that can display the records with the given parameters!).
+Example value: "&amp;showUid=###UID###"</source>
+                       </trans-unit>
+                       <trans-unit id="_get_params.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="fieldlist.description">
+                               <source>Enter a comma-list of fields to be indexed. The first field name will be used for the search result title.</source>
+                       </trans-unit>
+                       <trans-unit id="fieldlist.details">
+                               <source>&lt;b&gt;Example:&lt;/b&gt; "header,bodytext,image_caption" would index the Header, Bodytext and Image Caption fields from "tt_content". Notice that you must use the real database field names, don't spell them wrong!</source>
+                       </trans-unit>
+                       <trans-unit id="_fieldlist.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="chashcalc.description">
+                               <source>If checked, the URL in the search result for records will be encoded with a "&amp;cHash" parameter to make it cacheable. Use only if supported by the plugin!</source>
+                       </trans-unit>
+                       <trans-unit id="_chashcalc.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="recordsbatch.description">
+                               <source>Enter how many records to index for each instance of the indexing process (how many per minute). Default is 100 records.</source>
+                       </trans-unit>
+                       <trans-unit id="_recordsbatch.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="records_indexonchange.description">
+                               <source>If set, new and changed records from this table will be indexed through a hook in the core (TCEmain) meaning that they will be searchable immediately after addition to the system.</source>
+                       </trans-unit>
+                       <trans-unit id="_records_indexonchange.seeAlso">
+                               <source>index_config:table2index</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="externalUrl.description">
+                               <source>Enter the URL of the external website you want to index.</source>
+                       </trans-unit>
+                       <trans-unit id="url_deny.description">
+                               <source>Enter a URL on each line inside of which the crawler should not decend.</source>
+                       </trans-unit>
+                       <trans-unit id="url_deny.details" xml:space="preserve">
+                               <source>Example:
+If you wish to index "http://typo3.org/" but not "http://typo3.org/extensions/" and "http://typo3.org/downloads/" then you simply enter those two URLs into the box like this:
+
+http://typo3.org/downloads/
+http://typo3.org/extensions/</source>
+                       </trans-unit>
+                       <trans-unit id="_url_deny.seeAlso">
+                               <source>index_config:externalUrl</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="filepath.description">
+                               <source>Enter a filepath inside fileadmin/ where you want the files to be indexed.</source>
+                       </trans-unit>
+                       <trans-unit id="filepath.details">
+                               <source>Example: "fileadmin/newsletters/"</source>
+                       </trans-unit>
+                       <trans-unit id="extensions.description">
+                               <source>If you want to index only specific files in the directory, enter a list of file extensions here. For example: "html,pdf,doc"</source>
+                       </trans-unit>
+                       <trans-unit id="_extensions.seeAlso">
+                               <source>index_config:filepath</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="depth.description">
+                               <source>Levels of recursion.</source>
+                       </trans-unit>
+                       <trans-unit id="depth.details">
+                               <source>For file indexing it is the level of directories to decend. For External URLs it's the depth to which the crawler will go with links.</source>
+                       </trans-unit>
+                       <trans-unit id="_depth.seeAlso" xml:space="preserve">
+                               <source>index_config:externalUrl,
+index_config:filepath</source>
+                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
+                       </trans-unit>
+                       <trans-unit id="indexcfgs.description">
+                               <source>When a search is conducted in this indexing configuration the actual search will take place in the indexed content from the configurations listed here. You can also enter pages and if you do so the search will take place in indexing configurations found on those pages.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/indexed_search/Resources/Private/Language/locallang_db.xlf
new file mode 100644 (file)
index 0000000..7ed5237
--- /dev/null
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814833" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
+               <header/>
+               <body>
+                       <trans-unit id="index_config">
+                               <source>Indexing Configuration</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.title">
+                               <source>Title:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.description">
+                               <source>Description:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type.I.1">
+                               <source>Database Records</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type.I.2">
+                               <source>Filepath on server</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type.I.3">
+                               <source>External URL</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type.I.4">
+                               <source>Page tree</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type.I.5">
+                               <source>Meta configuration</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.type">
+                               <source>Type:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.depth.I.0">
+                               <source>Single page</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.depth.I.1">
+                               <source>1 Level</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.depth.I.2">
+                               <source>2 Levels</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.depth.I.3">
+                               <source>3 Levels</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.depth">
+                               <source>Depth:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.table2index">
+                               <source>Table to index:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.alternative_source_pid">
+                               <source>Alternative Source Page:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.get_params">
+                               <source>GET parameter string (with ###UID### substitution):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.fields">
+                               <source>Fields (first is title):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.externalUrl">
+                               <source>External URL (eg. "http://www.domain.org/"):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.chashcalc">
+                               <source>Calculate cHash (force caching)?</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.filepath">
+                               <source>Filepath:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.extensions">
+                               <source>Limit to extensions (commalist):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.url_deny">
+                               <source>Enter sub-URLs in which not to decend:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.records_indexonchange">
+                               <source>Index Records immediately when saved?:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_next_indexing">
+                               <source>Next indexing is scheduled (if empty, then immediately):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_offset">
+                               <source>Timing offset from midnight:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_frequency">
+                               <source>How often would you like a re-index?:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_frequency.I.0">
+                               <source>Every hour</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_frequency.I.1">
+                               <source>Every day (24 hours)</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.timer_frequency.I.2">
+                               <source>Every week</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.recordsbatch">
+                               <source>How many records to index a minute (default is 100):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.set_id">
+                               <source>Session ID (if &gt; zero, then indexing job is running):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.indexcfgs">
+                               <source>Indexing configurations:</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.parameterCfgs">
+                               <source>Parameter combination configuration ([tablename]:&amp;[param]=###UID###):</source>
+                       </trans-unit>
+                       <trans-unit id="index_config.rootpage">
+                               <source>Root page:</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Language/locallang_main.xlf b/typo3/sysext/indexed_search/Resources/Private/Language/locallang_main.xlf
new file mode 100644 (file)
index 0000000..ddae11c
--- /dev/null
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814831" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
+               <header/>
+               <body>
+                       <trans-unit id="mod_indexed_search">
+                               <source>Indexed search</source>
+                       </trans-unit>
+                       <trans-unit id="mod2_indexed_search">
+                               <source>Indexed search statistics</source>
+                       </trans-unit>
+                       <trans-unit id="ignoreExtensions">
+                               <source>Extension %s was set to be ignored.</source>
+                       </trans-unit>
+                       <trans-unit id="pdfToolsNotFound">
+                               <source>PDF tools was not found in paths '%1$spdftotext' and/or '%1$spdfinfo'"</source>
+                       </trans-unit>
+                       <trans-unit id="pdfToolsDisabled">
+                               <source>PDF tools disabled</source>
+                       </trans-unit>
+                       <trans-unit id="pdfToolsFailed">
+                               <source>PDFtoText Failed on this document: '%s'. Maybe the PDF file is locked for printing or encrypted.</source>
+                       </trans-unit>
+                       <trans-unit id="catdocNotFound">
+                               <source>'catdoc' tool for reading Word-files was not found in path '%scatdoc'</source>
+                       </trans-unit>
+                       <trans-unit id="catdocDisabled">
+                               <source>catdoc tools (Word-files) disabled</source>
+                       </trans-unit>
+                       <trans-unit id="ppthtmlNotFound">
+                               <source>'ppthtml' tool for reading Powerpoint-files was not found in path '%sppthtml'</source>
+                       </trans-unit>
+                       <trans-unit id="ppthtmlDisabled">
+                               <source>ppthtml tools (Powerpoint-files) disabled</source>
+                       </trans-unit>
+                       <trans-unit id="xlhtmlNotFound">
+                               <source>'xlhtml' tool for reading Excel-files was not found in path '%sxlhtml'</source>
+                       </trans-unit>
+                       <trans-unit id="xlhtmlDisabled">
+                               <source>xlhtml tools (Excel-files) disabled</source>
+                       </trans-unit>
+                       <trans-unit id="unzipNotFound">
+                               <source>'unzip' tool for reading OpenOffice.org-files was not found in path '%sunzip'</source>
+                       </trans-unit>
+                       <trans-unit id="unzipDisabled">
+                               <source>unzip tool (OpenOffice.org-files) disabled</source>
+                       </trans-unit>
+                       <trans-unit id="unrtfNotFound">
+                               <source>'unrtf' tool for reading RTF-files was not found in path '%sunrtf'</source>
+                       </trans-unit>
+                       <trans-unit id="unrtfDisabled">
+                               <source>unrtf tool (RTF-files) disabled</source>
+                       </trans-unit>
+                       <trans-unit id="extension.PDF">
+                               <source>PDF (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.DOC">
+                               <source>MS Word (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.PP">
+                               <source>MS Powerpoint (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.XLS">
+                               <source>MS Excel (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.SXC">
+                               <source>OpenOffice.org Calc (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.SXI">
+                               <source>OpenOffice.org Impress (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.SXW">
+                               <source>OpenOffice.org Writer (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.ODS">
+                               <source>ODF Spreadsheet (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.ODP">
+                               <source>ODF Presentation (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.ODT">
+                               <source>ODF Text (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.RTF">
+                               <source>Rich Text Format (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.images">
+                               <source>Images (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.HTML">
+                               <source>Webpages (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.TXT">
+                               <source>Textfiles (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.CSV">
+                               <source>Comma-Separated Values (*.%s)</source>
+                       </trans-unit>
+                       <trans-unit id="extension.XML">
+                               <source>Extensible Markup Language (*.%s)</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/indexed_search/Resources/Private/Language/locallang_pi.xlf b/typo3/sysext/indexed_search/Resources/Private/Language/locallang_pi.xlf
new file mode 100644 (file)
index 0000000..cfbec5b
--- /dev/null
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814837" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
+               <header/>
+               <body>
+                       <trans-unit id="default_search_word_entry">
+                               <source>Search for</source>
+                       </trans-unit>
+                       <trans-unit id="submit_button_label">
+                               <source>Search</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_0">
+                               <source>Distinct word</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_1">
+                               <source>Part of word</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_2">
+                               <source>First part of word</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_3">
+                               <source>Last part of word</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_10">
+                               <source>Sounds like</source>
+                       </trans-unit>
+                       <trans-unit id="opt_type_20">
+                               <source>Sentence</source>
+                       </trans-unit>
+                       <trans-unit id="opt_defOp_0">
+                               <source>All words (AND)</source>
+                       </trans-unit>
+                       <trans-unit id="opt_defOp_1">
+                               <source>Any words (OR)</source>
+                       </trans-unit>
+                       <trans-unit id="opt_sections_0">
+                               <source>Whole site</source>
+                       </trans-unit>
+                       <trans-unit id="opt_sections_-1">
+                               <source>Only this page</source>
+                       </trans-unit>
+                       <trans-unit id="opt_sections_-2">
+                               <source>Top + level 1</source>
+                       </trans-unit>
+                       <trans-unit id="opt_sections_-3">
+                               <source>Level 2 and out</source>
+                       </trans-unit>
+                       <trans-unit id="opt_freeIndexUid_-1">
+                               <source>All, mixed</source>
+                       </trans-unit>
+                       <trans-unit id="opt_freeIndexUid_-2">
+                               <source>All, categorized</source>
+                       </trans-unit>
+                       <trans-unit id="opt_freeIndexUid_0">
+                               <source>Pages</source>
+                       </trans-unit>
+                       <trans-unit id="opt_freeIndexUid_header_-1">
+                               <source>Mixed categories</source>
+                       </trans-unit>
+                       <trans-unit id="opt_freeIndexUid_header_0">
+                               <source>Website Pages</source>
+                       </trans-unit>
+                       <trans-unit id="opt_media_-1">
+                               <source>All media</source>
+                       </trans-unit>
+                       <trans-unit id="opt_media_0">
+                               <source>Internal pages</source>
+                       </trans-unit>
+                       <trans-unit id="opt_media_-2">
+                               <source>All External</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_rank_flag">
+                               <source>Weight/Frequency</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_rank_freq">
+                               <source>Frequency</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_rank_first">
+                               <source>Close to top</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_rank_count">
+                               <source>Number of words</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_mtime">
+                               <source>Date Modified</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_title">
+                               <source>Document title</source>
+                       </trans-unit>
+                       <trans-unit id="opt_order_crdate">
+                               <source>Creation date</source>
+                       </trans-unit>
+                       <trans-unit id="opt_group_sections">
+                               <source>Section hierarchy</source>
+                       </trans-unit>
+                       <trans-unit id="opt_group_flat">
+                               <source>Flat list</source>
+                       </trans-unit>
+                       <trans-unit id="opt_lang_-1">
+                               <source>All languages</source>
+                       </trans-unit>
+                       <trans-unit id="opt_lang_0">
+                               <source>Default</source>
+                       </trans-unit>
+                       <trans-unit id="opt_desc_0">
+                               <source>Highest first</source>
+                       </trans-unit>
+                       <trans-unit id="opt_desc_1">
+                               <source>Lowest first</source>
+                       </trans-unit>
+                       <trans-unit id="opt_RL1">
+                               <source>Level 1:</source>
+                       </trans-unit>
+                       <trans-unit id="opt_RL1ALL">
+                               <source>All pages on level 1</source>
+                       </trans-unit>
+                       <trans-unit id="opt_RL2">
+                               <source>- Level 2:</source>
+                       </trans-unit>
+                       <trans-unit id="opt_RL2ALL">
+                               <source>- All pages on level 2</source>
+                       </trans-unit>
+                       <trans-unit id="form_legend">
+                               <source>Search form</source>
+                       </trans-unit>
+                       <trans-unit id="form_searchFor">
+                               <source>Search for:</source>
+                       </trans-unit>
+                       <trans-unit id="form_extResume">
+                               <source>Extended resume</source>
+                       </trans-unit>
+                       <trans-unit id="form_atATime">
+                               <source>at a time</source>
+                       </trans-unit>
+                       <trans-unit id="form_orderBy">
+                               <source>Order by:</source>
+                       </trans-unit>
+                       <trans-unit id="form_fromSection">
+                               <source>From section:</source>
+                       </trans-unit>
+                       <trans-unit id="form_freeIndexUid">
+                               <source>Category:</source>
+                       </trans-unit>
+                       <trans-unit id="form_searchIn">
+                               <source>Search in:</source>
+                       </trans-unit>
+                       <trans-unit id="form_match">
+                               <source>Match:</source>
+                       </trans-unit>
+                       <trans-unit id="form_style">
+                               <source>Style:</source>
+                       </trans-unit>
+                       <trans-unit id="rules_header">
+                               <source>Rules:</source>
+                       </trans-unit>
+                       <trans-unit id="rules_text" xml:space="preserve">
+                               <source>Only words with 2 or more characters are accepted
+Max 200 chars total
+Space is used to split words, "" can be used to search for a whole string (not indexed search then)
+AND, OR and NOT are prefix words, overruling the default operator
++/|/- equals AND, OR and NOT as operators.
+All search words are converted to lowercase.</source>
+                       </trans-unit>
+                       <trans-unit id="searchFor">
+                               <source>Search for</source>
+                       </trans-unit>
+                       <trans-unit id="searchFor_or">
+                               <source>or</source>
+                       </trans-unit>
+                       <trans-unit id="searchFor_and">
+                               <source>and</source>
+                       </trans-unit>
+                       <trans-unit id="searchFor_butNot">
+                               <source>but not</source>
+                       </trans-unit>
+                       <trans-unit id="noResults">
+                               <source>NO results found.</source>
+                       </trans-unit>
+                       <trans-unit id="inSection">
+                               <source>in the section</source>
+                       </trans-unit>
+                       <trans-unit id="inNsection">
+                               <source>in %s section:</source>
+                       </trans-unit>
+                       <trans-unit id="inNsections">
+                               <source>in %s sections:</source>
+                       </trans-unit>
+                       <trans-unit id="word_page">
+                               <source>page</source>
+                       </trans-unit>
+                       <trans-unit id="word_pages">
+                               <source>pages</source>
+                       </trans-unit>
+                       <trans-unit id="unnamedSection">
+                               <source>Other</source>
+                       </trans-unit>
+                       <trans-unit id="link_regularSearch">
+                               <source>Regular search</source>
+                       </trans-unit>
+                       <trans-unit id="link_advancedSearch">
+                               <source>Advanced search</source>
+                       </trans-unit>
+                       <trans-unit id="res_path">
+                               <source>Path:</source>
+                       </trans-unit>
+                       <trans-unit id="res_modified">
+                               <source>Modified:</source>
+                       </trans-unit>
+                       <trans-unit id="res_created">
+                               <source>Created:</source>
+                       </trans-unit>
+                       <trans-unit id="res_size">
+                               <source>Size:</source>
+                       </trans-unit>
+                       <trans-unit id="res_noResume">
+                               <source>Note: This search hit may not accurately match the content on this page. The page resume cannot be shown.</source>
+                       </trans-unit>
+                       <trans-unit id="res_otherMatching">
+                               <source>Other matching pages in the same document:</source>
+                       </trans-unit>
+                       <trans-unit id="res_otherPageAsWell">
+                               <source>INFO: There was another page indexed as well... Probably indexed with another or no usergroup.</source>
+                       </trans-unit>
+                       <trans-unit id="res_memberGroups">
+                               <source>Require membership of group numbers %s</source>
+                       </trans-unit>
+                       <trans-unit id="pi_list_browseresults_prev">
+                               <source>&lt; Previous</source>
+                       </trans-unit>
+                       <trans-unit id="pi_list_browseresults_page">
+                               <source>Page</source>
+                       </trans-unit>
+                       <trans-unit id="pi_list_browseresults_next">
+                               <source>Next &gt;</source>
+                       </trans-unit>
+                       <trans-unit id="pi_list_browseresults_display">
+                               <source>Displaying results ###TAG_BEGIN###%1$s to %2$s###TAG_END### out of ###TAG_BEGIN###%3$s###TAG_END###</source>
+                       </trans-unit>
+                       <trans-unit id="local_operator_AND">
+                               <source>AND</source>
+                       </trans-unit>
+                       <trans-unit id="local_operator_OR">
+                               <source>OR</source>
+                       </trans-unit>
+                       <trans-unit id="local_operator_NOT">
+                               <source>NOT</source>
+                       </trans-unit>
+                       <trans-unit id="makerating_addToCurrentSearch">
+                               <source>Add to current search words</source>
+                       </trans-unit>
+                       <trans-unit id="maketitle_matches">
+                               <source>matches</source>
+                       </trans-unit>
+                       <trans-unit id="pi_wizard_title">
+                               <source>Indexed Search</source>
+                       </trans-unit>
+                       <trans-unit id="pi_wizard_description">
+                               <source>Search based on a database stored index.</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
index 910d517..769f4b2 100644 (file)
@@ -24,4 +24,4 @@ if (TYPO3_MODE === 'BE') {
 }
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('index_config');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('index_config', 'EXT:indexed_search/locallang_csh_indexcfg.xlf');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('index_config', 'EXT:indexed_search/Resources/Private/Language/locallang_csh_indexcfg.xlf');
diff --git a/typo3/sysext/indexed_search/locallang.xlf b/typo3/sysext/indexed_search/locallang.xlf
deleted file mode 100644 (file)
index ddae11c..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814831" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
-               <header/>
-               <body>
-                       <trans-unit id="mod_indexed_search">
-                               <source>Indexed search</source>
-                       </trans-unit>
-                       <trans-unit id="mod2_indexed_search">
-                               <source>Indexed search statistics</source>
-                       </trans-unit>
-                       <trans-unit id="ignoreExtensions">
-                               <source>Extension %s was set to be ignored.</source>
-                       </trans-unit>
-                       <trans-unit id="pdfToolsNotFound">
-                               <source>PDF tools was not found in paths '%1$spdftotext' and/or '%1$spdfinfo'"</source>
-                       </trans-unit>
-                       <trans-unit id="pdfToolsDisabled">
-                               <source>PDF tools disabled</source>
-                       </trans-unit>
-                       <trans-unit id="pdfToolsFailed">
-                               <source>PDFtoText Failed on this document: '%s'. Maybe the PDF file is locked for printing or encrypted.</source>
-                       </trans-unit>
-                       <trans-unit id="catdocNotFound">
-                               <source>'catdoc' tool for reading Word-files was not found in path '%scatdoc'</source>
-                       </trans-unit>
-                       <trans-unit id="catdocDisabled">
-                               <source>catdoc tools (Word-files) disabled</source>
-                       </trans-unit>
-                       <trans-unit id="ppthtmlNotFound">
-                               <source>'ppthtml' tool for reading Powerpoint-files was not found in path '%sppthtml'</source>
-                       </trans-unit>
-                       <trans-unit id="ppthtmlDisabled">
-                               <source>ppthtml tools (Powerpoint-files) disabled</source>
-                       </trans-unit>
-                       <trans-unit id="xlhtmlNotFound">
-                               <source>'xlhtml' tool for reading Excel-files was not found in path '%sxlhtml'</source>
-                       </trans-unit>
-                       <trans-unit id="xlhtmlDisabled">
-                               <source>xlhtml tools (Excel-files) disabled</source>
-                       </trans-unit>
-                       <trans-unit id="unzipNotFound">
-                               <source>'unzip' tool for reading OpenOffice.org-files was not found in path '%sunzip'</source>
-                       </trans-unit>
-                       <trans-unit id="unzipDisabled">
-                               <source>unzip tool (OpenOffice.org-files) disabled</source>
-                       </trans-unit>
-                       <trans-unit id="unrtfNotFound">
-                               <source>'unrtf' tool for reading RTF-files was not found in path '%sunrtf'</source>
-                       </trans-unit>
-                       <trans-unit id="unrtfDisabled">
-                               <source>unrtf tool (RTF-files) disabled</source>
-                       </trans-unit>
-                       <trans-unit id="extension.PDF">
-                               <source>PDF (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.DOC">
-                               <source>MS Word (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.PP">
-                               <source>MS Powerpoint (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.XLS">
-                               <source>MS Excel (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.SXC">
-                               <source>OpenOffice.org Calc (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.SXI">
-                               <source>OpenOffice.org Impress (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.SXW">
-                               <source>OpenOffice.org Writer (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.ODS">
-                               <source>ODF Spreadsheet (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.ODP">
-                               <source>ODF Presentation (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.ODT">
-                               <source>ODF Text (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.RTF">
-                               <source>Rich Text Format (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.images">
-                               <source>Images (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.HTML">
-                               <source>Webpages (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.TXT">
-                               <source>Textfiles (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.CSV">
-                               <source>Comma-Separated Values (*.%s)</source>
-                       </trans-unit>
-                       <trans-unit id="extension.XML">
-                               <source>Extensible Markup Language (*.%s)</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/indexed_search/locallang_csh_indexcfg.xlf b/typo3/sysext/indexed_search/locallang_csh_indexcfg.xlf
deleted file mode 100644 (file)
index 206fe66..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814832" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
-               <header/>
-               <body>
-                       <trans-unit id=".description">
-                               <source>The Indexed Search configuration allows you to set up indexing of resources which are external to the TYPO3 page tree. This could be a library of records (like news), a directory structure of files (like PDFs) or an external URL to be crawled to some depth - or third-party content provided from other extensions via hooks.</source>
-                       </trans-unit>
-                       <trans-unit id=".details">
-                               <source>The Indexing Configuration records are used to set up how the indexing occurs, at which time and related to which part of the page tree. An important requirement to keep in mind is that the "crawler" extension must be installed since the indexing engine uses the "crawler" extensions queue as a timing device - and using the "crawler" extension means using a cron-job to activate it from the shell.</source>
-                       </trans-unit>
-                       <trans-unit id="title.description">
-                               <source>Provide a title for the configuration.</source>
-                       </trans-unit>
-                       <trans-unit id="description.description">
-                               <source>If needed, give it a description or put other important notes in this field.</source>
-                       </trans-unit>
-                       <trans-unit id="hidden.description">
-                               <source>Disable the configuration by this checkbox. If disabled, the configuration will be bypassed by the crawlers cron job.</source>
-                       </trans-unit>
-                       <trans-unit id="hidden.details">
-                               <source>Notice; Disabling the indexing process will not hide already indexed content in search results!</source>
-                       </trans-unit>
-                       <trans-unit id="_hidden.seeAlso">
-                               <source>index_config:starttime</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="starttime.description">
-                               <source>Set a start time for the configuration. If set, the configuration will be bypassed by the crawlers cron job until this time is reached.</source>
-                       </trans-unit>
-                       <trans-unit id="_starttime.seeAlso">
-                               <source>index_config:hidden</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="timer_frequency.description">
-                               <source>Use this setting to adjust how often you would like a re-indexing process to run for the configuration.</source>
-                       </trans-unit>
-                       <trans-unit id="_timer_frequency.seeAlso" xml:space="preserve">
-                               <source>index_config:timer_next_indexing,
-index_config:timer_offset</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="timer_offset.description">
-                               <source>The offset adjusts at what time of day you want the indexing process to run.</source>
-                       </trans-unit>
-                       <trans-unit id="_timer_offset.seeAlso">
-                               <source>index_config:timer_frequency</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="timer_next_indexing.description">
-                               <source>This field contains the date and time of the next occurring indexing session. If left blank the next indexing will occur as soon as the cron-script is run again (typically within the next minute) and afterwards set to the next time according to frequency and offset.</source>
-                       </trans-unit>
-                       <trans-unit id="_timer_next_indexing.seeAlso" xml:space="preserve">
-                               <source>index_config:timer_offset,
-index_config:timer_frequency</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="type.description">
-                               <source>Select the type of Indexing Configuration here.</source>
-                       </trans-unit>
-                       <trans-unit id="type.details" xml:space="preserve">
-                               <source>&lt;b&gt;Records&lt;/b&gt; - You will be able to index records on a specified page from a specified database table. You can determine which fields from that record you want to index and how additional GET parameters should look like when linking to the search result.
-&lt;b&gt;Files&lt;/b&gt; - Allows you to index a whole directory of files from the fileadmin/ folder. You can optionally specify how many levels of recursion you want.
-&lt;b&gt;External URL&lt;/b&gt; - Allows you to index an external site and search it from your TYPO3 installation! You can specify how deep the crawler should go on that external URL.
-&lt;b&gt;Page tree&lt;/b&gt; - Allows you to index the page tree using the cron script. This type will not be useful as a category for searching like the other types.
-&lt;b&gt;Meta configuration&lt;/b&gt; - Points to a collection of other indexing configurations in which the search will be done. Cannot be used for cron-job based indexing.
-&lt;b&gt;Custom&lt;/b&gt; - Other extensions might register custom types of configurations.</source>
-                       </trans-unit>
-                       <trans-unit id="table2index.description">
-                               <source>Specify the database table to index records from.</source>
-                       </trans-unit>
-                       <trans-unit id="alternative_source_pid.description">
-                               <source>By default the indexer will select records from the page id where the Indexing Configuration is stored. If you want an alternative page as the source of your records you can enter it here.</source>
-                       </trans-unit>
-                       <trans-unit id="_alternative_source_pid.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="get_params.description">
-                               <source>Enter the GET parameters necessary to display the search results. You can use ###UID### as a marker in the parameter template.</source>
-                       </trans-unit>
-                       <trans-unit id="get_params.details" xml:space="preserve">
-                               <source>Notice: The GET parameters are appended to the URL of the page where the Indexing Configuration is stored (which must be the page where a plugin exists that can display the records with the given parameters!).
-Example value: "&amp;showUid=###UID###"</source>
-                       </trans-unit>
-                       <trans-unit id="_get_params.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="fieldlist.description">
-                               <source>Enter a comma-list of fields to be indexed. The first field name will be used for the search result title.</source>
-                       </trans-unit>
-                       <trans-unit id="fieldlist.details">
-                               <source>&lt;b&gt;Example:&lt;/b&gt; "header,bodytext,image_caption" would index the Header, Bodytext and Image Caption fields from "tt_content". Notice that you must use the real database field names, don't spell them wrong!</source>
-                       </trans-unit>
-                       <trans-unit id="_fieldlist.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="chashcalc.description">
-                               <source>If checked, the URL in the search result for records will be encoded with a "&amp;cHash" parameter to make it cacheable. Use only if supported by the plugin!</source>
-                       </trans-unit>
-                       <trans-unit id="_chashcalc.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="recordsbatch.description">
-                               <source>Enter how many records to index for each instance of the indexing process (how many per minute). Default is 100 records.</source>
-                       </trans-unit>
-                       <trans-unit id="_recordsbatch.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="records_indexonchange.description">
-                               <source>If set, new and changed records from this table will be indexed through a hook in the core (TCEmain) meaning that they will be searchable immediately after addition to the system.</source>
-                       </trans-unit>
-                       <trans-unit id="_records_indexonchange.seeAlso">
-                               <source>index_config:table2index</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="externalUrl.description">
-                               <source>Enter the URL of the external website you want to index.</source>
-                       </trans-unit>
-                       <trans-unit id="url_deny.description">
-                               <source>Enter a URL on each line inside of which the crawler should not decend.</source>
-                       </trans-unit>
-                       <trans-unit id="url_deny.details" xml:space="preserve">
-                               <source>Example:
-If you wish to index "http://typo3.org/" but not "http://typo3.org/extensions/" and "http://typo3.org/downloads/" then you simply enter those two URLs into the box like this:
-
-http://typo3.org/downloads/
-http://typo3.org/extensions/</source>
-                       </trans-unit>
-                       <trans-unit id="_url_deny.seeAlso">
-                               <source>index_config:externalUrl</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="filepath.description">
-                               <source>Enter a filepath inside fileadmin/ where you want the files to be indexed.</source>
-                       </trans-unit>
-                       <trans-unit id="filepath.details">
-                               <source>Example: "fileadmin/newsletters/"</source>
-                       </trans-unit>
-                       <trans-unit id="extensions.description">
-                               <source>If you want to index only specific files in the directory, enter a list of file extensions here. For example: "html,pdf,doc"</source>
-                       </trans-unit>
-                       <trans-unit id="_extensions.seeAlso">
-                               <source>index_config:filepath</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="depth.description">
-                               <source>Levels of recursion.</source>
-                       </trans-unit>
-                       <trans-unit id="depth.details">
-                               <source>For file indexing it is the level of directories to decend. For External URLs it's the depth to which the crawler will go with links.</source>
-                       </trans-unit>
-                       <trans-unit id="_depth.seeAlso" xml:space="preserve">
-                               <source>index_config:externalUrl,
-index_config:filepath</source>
-                               <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
-                       </trans-unit>
-                       <trans-unit id="indexcfgs.description">
-                               <source>When a search is conducted in this indexing configuration the actual search will take place in the indexed content from the configurations listed here. You can also enter pages and if you do so the search will take place in indexing configurations found on those pages.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/indexed_search/locallang_db.xlf b/typo3/sysext/indexed_search/locallang_db.xlf
deleted file mode 100644 (file)
index 7ed5237..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814833" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
-               <header/>
-               <body>
-                       <trans-unit id="index_config">
-                               <source>Indexing Configuration</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.title">
-                               <source>Title:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.description">
-                               <source>Description:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type.I.1">
-                               <source>Database Records</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type.I.2">
-                               <source>Filepath on server</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type.I.3">
-                               <source>External URL</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type.I.4">
-                               <source>Page tree</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type.I.5">
-                               <source>Meta configuration</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.type">
-                               <source>Type:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.0">
-                               <source>Single page</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.1">
-                               <source>1 Level</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.2">
-                               <source>2 Levels</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth.I.3">
-                               <source>3 Levels</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.depth">
-                               <source>Depth:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.table2index">
-                               <source>Table to index:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.alternative_source_pid">
-                               <source>Alternative Source Page:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.get_params">
-                               <source>GET parameter string (with ###UID### substitution):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.fields">
-                               <source>Fields (first is title):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.externalUrl">
-                               <source>External URL (eg. "http://www.domain.org/"):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.chashcalc">
-                               <source>Calculate cHash (force caching)?</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.filepath">
-                               <source>Filepath:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.extensions">
-                               <source>Limit to extensions (commalist):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.url_deny">
-                               <source>Enter sub-URLs in which not to decend:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.records_indexonchange">
-                               <source>Index Records immediately when saved?:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_next_indexing">
-                               <source>Next indexing is scheduled (if empty, then immediately):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_offset">
-                               <source>Timing offset from midnight:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_frequency">
-                               <source>How often would you like a re-index?:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_frequency.I.0">
-                               <source>Every hour</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_frequency.I.1">
-                               <source>Every day (24 hours)</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.timer_frequency.I.2">
-                               <source>Every week</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.recordsbatch">
-                               <source>How many records to index a minute (default is 100):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.set_id">
-                               <source>Session ID (if &gt; zero, then indexing job is running):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.indexcfgs">
-                               <source>Indexing configurations:</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.parameterCfgs">
-                               <source>Parameter combination configuration ([tablename]:&amp;[param]=###UID###):</source>
-                       </trans-unit>
-                       <trans-unit id="index_config.rootpage">
-                               <source>Root page:</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
index 91321b7..e8df685 100644 (file)
@@ -26,8 +26,8 @@ class tx_indexed_search_pi_wizicon {
        public function proc($wizardItems) {
                $wizardItems['plugins_tx_indexed_search'] = array(
                        'icon' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('indexed_search') . 'pi/ce_wiz.png',
-                       'title' => $GLOBALS['LANG']->sL('LLL:EXT:indexed_search/pi/locallang.xlf:pi_wizard_title'),
-                       'description' => $GLOBALS['LANG']->sL('LLL:EXT:indexed_search/pi/locallang.xlf:pi_wizard_description'),
+                       'title' => $GLOBALS['LANG']->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_pi.xlf:pi_wizard_title'),
+                       'description' => $GLOBALS['LANG']->sL('LLL:EXT:indexed_search/Resources/Private/Language/locallang_pi.xlf:pi_wizard_description'),
                        'params' => '&defVals[tt_content][CType]=list&defVals[tt_content][list_type]=indexed_search'
                );
                return $wizardItems;
diff --git a/typo3/sysext/indexed_search/pi/locallang.xlf b/typo3/sysext/indexed_search/pi/locallang.xlf
deleted file mode 100644 (file)
index cfbec5b..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814837" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:33Z" product-name="indexed_search">
-               <header/>
-               <body>
-                       <trans-unit id="default_search_word_entry">
-                               <source>Search for</source>
-                       </trans-unit>
-                       <trans-unit id="submit_button_label">
-                               <source>Search</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_0">
-                               <source>Distinct word</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_1">
-                               <source>Part of word</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_2">
-                               <source>First part of word</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_3">
-                               <source>Last part of word</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_10">
-                               <source>Sounds like</source>
-                       </trans-unit>
-                       <trans-unit id="opt_type_20">
-                               <source>Sentence</source>
-                       </trans-unit>
-                       <trans-unit id="opt_defOp_0">
-                               <source>All words (AND)</source>
-                       </trans-unit>
-                       <trans-unit id="opt_defOp_1">
-                               <source>Any words (OR)</source>
-                       </trans-unit>
-                       <trans-unit id="opt_sections_0">
-                               <source>Whole site</source>
-                       </trans-unit>
-                       <trans-unit id="opt_sections_-1">
-                               <source>Only this page</source>
-                       </trans-unit>
-                       <trans-unit id="opt_sections_-2">
-                               <source>Top + level 1</source>
-                       </trans-unit>
-                       <trans-unit id="opt_sections_-3">
-                               <source>Level 2 and out</source>
-                       </trans-unit>
-                       <trans-unit id="opt_freeIndexUid_-1">
-                               <source>All, mixed</source>
-                       </trans-unit>
-                       <trans-unit id="opt_freeIndexUid_-2">
-                               <source>All, categorized</source>
-                       </trans-unit>
-                       <trans-unit id="opt_freeIndexUid_0">
-                               <source>Pages</source>
-                       </trans-unit>
-                       <trans-unit id="opt_freeIndexUid_header_-1">
-                               <source>Mixed categories</source>
-                       </trans-unit>
-                       <trans-unit id="opt_freeIndexUid_header_0">
-                               <source>Website Pages</source>
-                       </trans-unit>
-                       <trans-unit id="opt_media_-1">
-                               <source>All media</source>
-                       </trans-unit>
-                       <trans-unit id="opt_media_0">
-                               <source>Internal pages</source>
-                       </trans-unit>
-                       <trans-unit id="opt_media_-2">
-                               <source>All External</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_rank_flag">
-                               <source>Weight/Frequency</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_rank_freq">
-                               <source>Frequency</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_rank_first">
-                               <source>Close to top</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_rank_count">
-                               <source>Number of words</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_mtime">
-                               <source>Date Modified</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_title">
-                               <source>Document title</source>
-                       </trans-unit>
-                       <trans-unit id="opt_order_crdate">
-                               <source>Creation date</source>
-                       </trans-unit>
-                       <trans-unit id="opt_group_sections">
-                               <source>Section hierarchy</source>
-                       </trans-unit>
-                       <trans-unit id="opt_group_flat">
-                               <source>Flat list</source>
-                       </trans-unit>
-                       <trans-unit id="opt_lang_-1">
-                               <source>All languages</source>
-                       </trans-unit>
-                       <trans-unit id="opt_lang_0">
-                               <source>Default</source>
-                       </trans-unit>
-                       <trans-unit id="opt_desc_0">
-                               <source>Highest first</source>
-                       </trans-unit>
-                       <trans-unit id="opt_desc_1">
-                               <source>Lowest first</source>
-                       </trans-unit>
-                       <trans-unit id="opt_RL1">
-                               <source>Level 1:</source>
-                       </trans-unit>
-                       <trans-unit id="opt_RL1ALL">
-                               <source>All pages on level 1</source>
-                       </trans-unit>
-                       <trans-unit id="opt_RL2">
-                               <source>- Level 2:</source>
-                       </trans-unit>
-                       <trans-unit id="opt_RL2ALL">
-                               <source>- All pages on level 2</source>
-                       </trans-unit>
-                       <trans-unit id="form_legend">
-                               <source>Search form</source>
-                       </trans-unit>
-                       <trans-unit id="form_searchFor">
-                               <source>Search for:</source>
-                       </trans-unit>
-                       <trans-unit id="form_extResume">
-                               <source>Extended resume</source>
-                       </trans-unit>
-                       <trans-unit id="form_atATime">
-                               <source>at a time</source>
-                       </trans-unit>
-                       <trans-unit id="form_orderBy">
-                               <source>Order by:</source>
-                       </trans-unit>
-                       <trans-unit id="form_fromSection">
-                               <source>From section:</source>
-                       </trans-unit>
-                       <trans-unit id="form_freeIndexUid">
-                               <source>Category:</source>
-                       </trans-unit>
-                       <trans-unit id="form_searchIn">
-                               <source>Search in:</source>
-                       </trans-unit>
-                       <trans-unit id="form_match">
-                               <source>Match:</source>
-                       </trans-unit>
-                       <trans-unit id="form_style">
-                               <source>Style:</source>
-                       </trans-unit>
-                       <trans-unit id="rules_header">
-                               <source>Rules:</source>
-                       </trans-unit>
-                       <trans-unit id="rules_text" xml:space="preserve">
-                               <source>Only words with 2 or more characters are accepted
-Max 200 chars total
-Space is used to split words, "" can be used to search for a whole string (not indexed search then)
-AND, OR and NOT are prefix words, overruling the default operator
-+/|/- equals AND, OR and NOT as operators.
-All search words are converted to lowercase.</source>
-                       </trans-unit>
-                       <trans-unit id="searchFor">
-                               <source>Search for</source>
-                       </trans-unit>
-                       <trans-unit id="searchFor_or">
-                               <source>or</source>
-                       </trans-unit>
-                       <trans-unit id="searchFor_and">
-                               <source>and</source>
-                       </trans-unit>
-                       <trans-unit id="searchFor_butNot">
-                               <source>but not</source>
-                       </trans-unit>
-                       <trans-unit id="noResults">
-                               <source>NO results found.</source>
-                       </trans-unit>
-                       <trans-unit id="inSection">
-                               <source>in the section</source>
-                       </trans-unit>
-                       <trans-unit id="inNsection">
-                               <source>in %s section:</source>
-                       </trans-unit>
-                       <trans-unit id="inNsections">
-                               <source>in %s sections:</source>
-                       </trans-unit>
-                       <trans-unit id="word_page">
-                               <source>page</source>
-                       </trans-unit>
-                       <trans-unit id="word_pages">
-                               <source>pages</source>
-                       </trans-unit>
-                       <trans-unit id="unnamedSection">
-                               <source>Other</source>
-                       </trans-unit>
-                       <trans-unit id="link_regularSearch">
-                               <source>Regular search</source>
-                       </trans-unit>
-                       <trans-unit id="link_advancedSearch">
-                               <source>Advanced search</source>
-                       </trans-unit>
-                       <trans-unit id="res_path">
-                               <source>Path:</source>
-                       </trans-unit>
-                       <trans-unit id="res_modified">
-                               <source>Modified:</source>
-                       </trans-unit>
-                       <trans-unit id="res_created">
-                               <source>Created:</source>
-                       </trans-unit>
-                       <trans-unit id="res_size">
-                               <source>Size:</source>
-                       </trans-unit>
-                       <trans-unit id="res_noResume">
-                               <source>Note: This search hit may not accurately match the content on this page. The page resume cannot be shown.</source>
-                       </trans-unit>
-                       <trans-unit id="res_otherMatching">
-                               <source>Other matching pages in the same document:</source>
-                       </trans-unit>
-                       <trans-unit id="res_otherPageAsWell">
-                               <source>INFO: There was another page indexed as well... Probably indexed with another or no usergroup.</source>
-                       </trans-unit>
-                       <trans-unit id="res_memberGroups">
-                               <source>Require membership of group numbers %s</source>
-                       </trans-unit>
-                       <trans-unit id="pi_list_browseresults_prev">
-                               <source>&lt; Previous</source>
-                       </trans-unit>
-                       <trans-unit id="pi_list_browseresults_page">
-                               <source>Page</source>
-                       </trans-unit>
-                       <trans-unit id="pi_list_browseresults_next">
-                               <source>Next &gt;</source>
-                       </trans-unit>
-                       <trans-unit id="pi_list_browseresults_display">
-                               <source>Displaying results ###TAG_BEGIN###%1$s to %2$s###TAG_END### out of ###TAG_BEGIN###%3$s###TAG_END###</source>
-                       </trans-unit>
-                       <trans-unit id="local_operator_AND">
-                               <source>AND</source>
-                       </trans-unit>
-                       <trans-unit id="local_operator_OR">
-                               <source>OR</source>
-                       </trans-unit>
-                       <trans-unit id="local_operator_NOT">
-                               <source>NOT</source>
-                       </trans-unit>
-                       <trans-unit id="makerating_addToCurrentSearch">
-                               <source>Add to current search words</source>
-                       </trans-unit>
-                       <trans-unit id="maketitle_matches">
-                               <source>matches</source>
-                       </trans-unit>
-                       <trans-unit id="pi_wizard_title">
-                               <source>Indexed Search</source>
-                       </trans-unit>
-                       <trans-unit id="pi_wizard_description">
-                               <source>Search based on a database stored index.</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>