From a3a6fb949f4a3df7adf6745e1be0a36e570bdd11 Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Tue, 3 May 2022 11:33:29 -0700 Subject: [PATCH 1/5] [TASK] Improve wording --- .../Configuration/FlexForm/FlexFormTools8.php | 6 ++-- .../TemplaVoilaPlus8UpdateController.php | 18 +++++------ .../Backend/Handler/DoktypeDefaultHandler.php | 6 ++-- .../Update/DataStructureUpdateHandler.php | 2 +- .../Frontend/FrontendController.php | 4 +-- .../Form/Container/FlexFormTabsContainer.php | 2 +- .../Controller/FormFlexAjaxController.php | 6 ++-- .../Controller/FormFlexAjaxController9.php | 6 ++-- .../Form/FormDataProvider/TcaFlexFetch.php | 2 +- .../BackendLayoutConfigurationHandler.php | 8 ++--- .../DataStructureConfigurationHandler.php | 6 ++-- .../MappingConfigurationHandler.php | 6 ++-- .../TemplateConfigurationHandler.php | 10 +++--- .../LoadSave/LoadSaveHandlerInterface.php | 4 +-- .../Handler/Mapping/DefaultMappingHandler.php | 12 +++---- Classes/Handler/Render/XpathRenderHandler.php | 2 +- Classes/Service/ApiService.php | 32 +++++++++---------- Classes/Service/ItemsProcFunc.php | 2 +- Classes/Service/ProcessingService.php | 2 +- Classes/Utility/FormEngineUtility.php | 2 +- Classes/Utility/TemplaVoilaUtility.php | 2 +- .../Format/StripTagsViewHelper.php | 2 +- .../ViewHelpers/SplitIntoArrayViewHelper.php | 2 +- .../Introduction/AboutThisManual/Index.rst | 2 +- .../Introduction/WhatDoesItDo/Index.rst | 2 +- .../Private/Language/Backend/PageLayout.xlf | 2 +- .../Private/Language/PluginConfiguration.xlf | 2 +- Resources/Private/Partials/DocHeader.html | 2 +- .../TemplaVoilaPlus8Update/Step1.html | 18 +++++------ .../TemplaVoilaPlus8Update/Step2.html | 8 ++--- .../Step3NewExtension.html | 10 +++--- .../TemplaVoilaPlus8Update/Step4.html | 2 +- .../TemplaVoilaPlus8Update/Step5.html | 4 +-- .../TemplaVoilaPlus8Update/StepStart.html | 14 ++++---- .../Backend/ControlCenter/Update/Info.html | 14 ++++---- 35 files changed, 112 insertions(+), 112 deletions(-) diff --git a/Classes/Configuration/FlexForm/FlexFormTools8.php b/Classes/Configuration/FlexForm/FlexFormTools8.php index c95426d96..6d8961e9f 100644 --- a/Classes/Configuration/FlexForm/FlexFormTools8.php +++ b/Classes/Configuration/FlexForm/FlexFormTools8.php @@ -320,7 +320,7 @@ protected function getDataStructureIdentifierFromRecord(array $fieldTca, string throw new InvalidParentRowException( 'The data structure for field "' . $fieldName . '" in table "' . $tableName . '" has to be looked up' . ' in field "' . $pointerFieldName . '". That field had no valid value, so a lookup in parent record' - . ' with uid "' . $row[$parentFieldName] . '" was done. This row however does not exist or was deleted.', + . ' with uid "' . $row[$parentFieldName] . '" was done. However, this row does not exist or was deleted.', 1463833794 ); } @@ -378,14 +378,14 @@ protected function getDataStructureIdentifierFromRecord(array $fieldTca, string if (!isset($fieldTca['config']['ds_tableField'])) { throw new InvalidTcaException( 'Invalid data structure pointer for field "' . $fieldName . '" in table "' . $tableName . '", the value' - . 'resolved to "' . $pointerValue . '" . which is an integer, so "ds_tableField" must be configured', + . 'resolved to "' . $pointerValue . '", . which is an integer, so "ds_tableField" must be configured', 1464115639 ); } if (substr_count($fieldTca['config']['ds_tableField'], ':') !== 1) { // ds_tableField must be of the form "table:field" throw new InvalidTcaException( - 'Invalid TCA configuration for field "' . $fieldName . '" in table "' . $tableName . '", the setting' + 'Invalid TCA configuration for field "' . $fieldName . '" in table "' . $tableName . '". The setting' . '"ds_tableField" must be of the form "tableName:fieldName"', 1464116002 ); diff --git a/Classes/Controller/Backend/ControlCenter/TemplaVoilaPlus8UpdateController.php b/Classes/Controller/Backend/ControlCenter/TemplaVoilaPlus8UpdateController.php index f72dde1bf..bb7b41586 100644 --- a/Classes/Controller/Backend/ControlCenter/TemplaVoilaPlus8UpdateController.php +++ b/Classes/Controller/Backend/ControlCenter/TemplaVoilaPlus8UpdateController.php @@ -371,14 +371,14 @@ protected function checkAllDsToValid(array $allDs, array $allTo): array $to['valid'] = true; $to['DS'] = $validatedDs[$to['datastructure']]; /** @TODO If parent then from parent! Check if parent exists */ } else { - $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '", as mapping seams not existing.'; + $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '" because mapping does not seem to exist.'; } } } else { - $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '", as template file "' . $to['fileref'] . '" could not be found.'; + $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '" because template file "' . $to['fileref'] . '" could not be found.'; } } else { - $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '", as DataStructure "' . $to['datastructure'] . '" could not be found.'; + $validationErrors[] = 'Cannot verify TO with title "' . $to['title'] . '" and uid "' . $to['uid'] . '" because DataStructure "' . $to['datastructure'] . '" could not be found.'; } $validatedToWithDs[$to['uid']] = $to; } @@ -398,7 +398,7 @@ protected function checkAllDsToValid(array $allDs, array $allTo): array foreach ($validatedDs as $key => $ds) { if ($ds['countUsage'] === 0) { $validatedDs[$key]['valid'] = false; - $validationErrors[] = 'Cannot verify DS with title "' . $ds['title'] . '" it has no Template Object data'; + $validationErrors[] = 'Cannot verify DS with title "' . $ds['title'] . '" since it has no Template Object data.'; } } @@ -441,14 +441,14 @@ protected function checkAllPageContentForTo(array $validatedToWithDs): array if (isset($validatedToWithDs[$row['tx_templavoilaplus_to']])) { $validatedToWithDs[$row['tx_templavoilaplus_to']]['countUsage'] += $row['COUNT(`uid`)']; } else { - $validationErrors[] = 'There are pages which use an non existent Template Object with uid "' . $row['tx_templavoilaplus_to'] . '" like page with page uid: "' . $row['uid'] . '"'; + $validationErrors[] = 'There is a page using a non-existent Template Object with uid "' . $row['tx_templavoilaplus_to'] . '" like page with page uid: "' . $row['uid'] . '"'; } } if ($row['tx_templavoilaplus_next_to'] != 0) { if (isset($validatedToWithDs[$row['tx_templavoilaplus_next_to']])) { $validatedToWithDs[$row['tx_templavoilaplus_next_to']]['countUsage'] += $row['COUNT(`uid`)']; } else { - $validationErrors[] = 'There are pages which use an non existent Template Object with uid "' . $row['tx_templavoilaplus_next_to'] . '" for subpages like page with page uid: "' . $row['uid'] . '"'; + $validationErrors[] = 'There is a page using a non-existent Template Object with uid "' . $row['tx_templavoilaplus_next_to'] . '" for subpages like page with page uid: "' . $row['uid'] . '"'; } } } @@ -477,7 +477,7 @@ protected function checkAllPageContentForTo(array $validatedToWithDs): array if (isset($validatedToWithDs[$row['tx_templavoilaplus_to']])) { $validatedToWithDs[$row['tx_templavoilaplus_to']]['countUsage'] += $row['COUNT(`uid`)']; } else { - $validationErrors[] = 'There are content elements which use an non existent Template Object with uid "' . $row['tx_templavoilaplus_to'] . '" like content element with uid: "' . $row['uid'] . '"'; + $validationErrors[] = 'There are content elements using a non-existent Template Object with uid "' . $row['tx_templavoilaplus_to'] . '" like content element with uid: "' . $row['uid'] . '"'; } } } @@ -664,7 +664,7 @@ protected function step3NewExtensionAction() * The key must not being with one of the following prefixes: tx,pages,tt_,sys_,ts_language_,csh_ */ if (preg_match('/^(tx|pages_|tt_|sys_|ts_language_|csh_)/', $newExtensionKey)) { - $errors[] = 'The key must not being with one of the following prefixes: tx,pages,tt_,sys_,ts_language_,csh_'; + $errors[] = 'The key must not begin with one of the following prefixes: tx,pages,tt_,sys_,ts_language_,csh_'; } if (isset($allTerExtensionKeys[$newExtensionKey])) { @@ -1077,7 +1077,7 @@ function convertDsToForOneTo(array $allDs, array $to, array &$copiedBackendLayou ]; /** - * @TODO in staticDS it was also possible that we had a filenamen with same name but with .html as ending which included the belayout + * @TODO in staticDS it was also possible that we had a filename with same name but with .html as ending which included the belayout * Add this to the getAllDsFromStatic function. * No Support for beLayout content inside DS-XML or TO-Table only filenames (as this is what only worked in TV+). */ diff --git a/Classes/Controller/Backend/Handler/DoktypeDefaultHandler.php b/Classes/Controller/Backend/Handler/DoktypeDefaultHandler.php index 1a7934231..44d9f3e99 100644 --- a/Classes/Controller/Backend/Handler/DoktypeDefaultHandler.php +++ b/Classes/Controller/Backend/Handler/DoktypeDefaultHandler.php @@ -70,8 +70,8 @@ public function handle(PageLayoutController $controller, array $pageRecord) ); if (!empty($pageRecord['tx_templavoilaplus_ds']) || !empty($pageRecord['tx_templavoilaplus_next_ds'])) { $controller->getView()->getModuleTemplate()->addFlashMessage( - 'Older configuration found, did you upgrade to "TemplaVoilà! Plus 8" but forgot to run the upgrade scripts?', - 'Did you forgot to Upgrade', + 'Older configuration found. Did you upgrade to "TemplaVoilà! Plus 8" but forgot to run the upgrade scripts?', + 'Did you forget to Upgrade', \TYPO3\CMS\Core\Messaging\AbstractMessage::WARNING, false ); @@ -96,7 +96,7 @@ public function handle(PageLayoutController $controller, array $pageRecord) $controller->addContentPartial('body', 'Backend/Handler/DoktypeDefaultHandler'); // @TODO Add them automagically in controller to harden naming? } catch (ConfigurationException $e) { $controller->getView()->getModuleTemplate()->addFlashMessage( - 'The page have a Layout defined, which seams missing on this system. The error was: ' . $e->getMessage(), + 'The page has a Layout defined, which seems to be missing on this system. The error was: ' . $e->getMessage(), 'Template Configuration not loadable', \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR, false diff --git a/Classes/Controller/Backend/Update/DataStructureUpdateHandler.php b/Classes/Controller/Backend/Update/DataStructureUpdateHandler.php index 96284aae2..c0cce6687 100644 --- a/Classes/Controller/Backend/Update/DataStructureUpdateHandler.php +++ b/Classes/Controller/Backend/Update/DataStructureUpdateHandler.php @@ -152,7 +152,7 @@ protected function fixPerElement(array &$element, array $elementCallbacks) if (is_callable($callback)) { $changed = $callback($element) || $changed; } else { - throw new \Exception('Callback function "' . $callback[1] . '" not available. Cann\'t update DataStructure.'); + throw new \Exception('Callback function "' . $callback[1] . '" not available. Can\'t update DataStructure.'); } } diff --git a/Classes/Controller/Frontend/FrontendController.php b/Classes/Controller/Frontend/FrontendController.php index 35ed72f6e..401732179 100644 --- a/Classes/Controller/Frontend/FrontendController.php +++ b/Classes/Controller/Frontend/FrontendController.php @@ -48,9 +48,9 @@ public function renderPage($content, $conf) // Current page record which we MIGHT manipulate a little: $pageRecord = $GLOBALS['TSFE']->page; - // replace record if content_from_pid is used. This might change the template/mapping, however + // Replace record if content_from_pid is used. This might change the template/mapping, however // it can't be expected that fields are the same between different templates, thus we need to use the - // other template anways + // other template anyway if ($pageRecord['content_from_pid']) { $pageRecord = BackendUtility::getRecordWSOL('pages', $pageRecord['content_from_pid']); } diff --git a/Classes/Form/Container/FlexFormTabsContainer.php b/Classes/Form/Container/FlexFormTabsContainer.php index 05cf131df..8ddd30813 100644 --- a/Classes/Form/Container/FlexFormTabsContainer.php +++ b/Classes/Form/Container/FlexFormTabsContainer.php @@ -63,7 +63,7 @@ public function render() $tabCounter++; // Assemble key for loading the correct CSH file - // @todo: what is that good for? That is for the title of single elements ... see FlexFormElementContainer! + // @todo: What is that good for? That is for the title of single elements ... see FlexFormElementContainer! $dsPointerFields = GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$table]['columns'][$fieldName]['config']['ds_pointerField'], true); $parameterArray['_cshKey'] = $table . '.' . $fieldName; foreach ($dsPointerFields as $key) { diff --git a/Classes/Form/Controller/FormFlexAjaxController.php b/Classes/Form/Controller/FormFlexAjaxController.php index cc63f7fbb..3250e9738 100644 --- a/Classes/Form/Controller/FormFlexAjaxController.php +++ b/Classes/Form/Controller/FormFlexAjaxController.php @@ -85,7 +85,7 @@ public function containerAdd(ServerRequestInterface $request, ResponseInterface ]; // A new container on a new record needs the 'NEW123' uid here, see comment // in DatabaseUniqueUidNewRow for more information on that. - // @todo: Resolve, maybe with a redifinition of vanillaUid to transport the information more clean through this var? + // @todo: Resolve, maybe with a redefinition of vanillaUid to transport the information more clean through this var? // @see issue #80100 for a series of changes in this area if ($command === 'new') { $formDataCompilerInput['databaseRow']['uid'] = $databaseRowUid; @@ -128,7 +128,7 @@ public function containerAdd(ServerRequestInterface $request, ResponseInterface $formData['parameterArray']['itemFormElName'] = 'data[' . $tableName . '][' . $formData['databaseRow']['uid'] . '][' . $fieldName . ']'; // JavaScript code for event handlers: - // @todo: see if we can get rid of this - used in group elements, and also for the "reload" on type field changes + // @todo: See if we can get rid of this - used in group elements, and also for the "reload" on type field changes $formData['parameterArray']['fieldChangeFunc'] = []; $formData['parameterArray']['fieldChangeFunc']['TBE_EDITOR_fieldChanged'] = 'TBE_EDITOR.fieldChanged(' . GeneralUtility::quoteJSvalue($tableName) @@ -136,7 +136,7 @@ public function containerAdd(ServerRequestInterface $request, ResponseInterface . ',' . GeneralUtility::quoteJSvalue($fieldName) . ',' . GeneralUtility::quoteJSvalue($formData['parameterArray']['itemFormElName']) . ');'; - // @todo: check GroupElement for usage of elementBaseName ... maybe kick that thing? + // @todo: Check GroupElement for usage of elementBaseName ... maybe kick that thing? // Feed resulting form data to container structure to render HTML and other result data $nodeFactory = GeneralUtility::makeInstance(NodeFactory::class); diff --git a/Classes/Form/Controller/FormFlexAjaxController9.php b/Classes/Form/Controller/FormFlexAjaxController9.php index 1cd97691e..8face24c1 100644 --- a/Classes/Form/Controller/FormFlexAjaxController9.php +++ b/Classes/Form/Controller/FormFlexAjaxController9.php @@ -85,7 +85,7 @@ public function containerAdd(ServerRequestInterface $request): ResponseInterface ]; // A new container on a new record needs the 'NEW123' uid here, see comment // in DatabaseUniqueUidNewRow for more information on that. - // @todo: Resolve, maybe with a redifinition of vanillaUid to transport the information more clean through this var? + // @todo: Resolve, maybe with a redefinition of vanillaUid to transport the information more clean through this var? // @see issue #80100 for a series of changes in this area if ($command === 'new') { $formDataCompilerInput['databaseRow']['uid'] = $databaseRowUid; @@ -128,7 +128,7 @@ public function containerAdd(ServerRequestInterface $request): ResponseInterface $formData['parameterArray']['itemFormElName'] = 'data[' . $tableName . '][' . $formData['databaseRow']['uid'] . '][' . $fieldName . ']'; // JavaScript code for event handlers: - // @todo: see if we can get rid of this - used in group elements, and also for the "reload" on type field changes + // @todo: See if we can get rid of this - used in group elements, and also for the "reload" on type field changes $formData['parameterArray']['fieldChangeFunc'] = []; $formData['parameterArray']['fieldChangeFunc']['TBE_EDITOR_fieldChanged'] = 'TBE_EDITOR.fieldChanged(' . GeneralUtility::quoteJSvalue($tableName) @@ -136,7 +136,7 @@ public function containerAdd(ServerRequestInterface $request): ResponseInterface . ',' . GeneralUtility::quoteJSvalue($fieldName) . ',' . GeneralUtility::quoteJSvalue($formData['parameterArray']['itemFormElName']) . ');'; - // @todo: check GroupElement for usage of elementBaseName ... maybe kick that thing? + // @todo: Check GroupElement for usage of elementBaseName ... maybe kick that thing? // Feed resulting form data to container structure to render HTML and other result data $nodeFactory = GeneralUtility::makeInstance(NodeFactory::class); diff --git a/Classes/Form/FormDataProvider/TcaFlexFetch.php b/Classes/Form/FormDataProvider/TcaFlexFetch.php index fe9ae01c0..4e04ee18b 100644 --- a/Classes/Form/FormDataProvider/TcaFlexFetch.php +++ b/Classes/Form/FormDataProvider/TcaFlexFetch.php @@ -142,7 +142,7 @@ protected function initializeDataValues(array $result, $fieldName) * @todo: Why is this not done in BackendUtility::getFlexFormDS() directly? If done there, the two methods * @todo: since this resolving is basically the only really useful thing they actually do. * - * @TODO Copied from core, can be removed, is solved with code pathes for TYPO3 8.5.0 + * @TODO Copied from core, can be removed, is solved with code paths for TYPO3 8.5.0 * * @param array $result Result array * @param string $fieldName Current handle field name diff --git a/Classes/Handler/Configuration/BackendLayoutConfigurationHandler.php b/Classes/Handler/Configuration/BackendLayoutConfigurationHandler.php index e01633eb9..a0a53723e 100644 --- a/Classes/Handler/Configuration/BackendLayoutConfigurationHandler.php +++ b/Classes/Handler/Configuration/BackendLayoutConfigurationHandler.php @@ -45,7 +45,7 @@ public function setLoadSaveHandler(LoadSaveHandlerInterface $loadSaveHandler) $this->loadSaveHandler = $loadSaveHandler; } - /** @TODO it may be possible that this could go into an abstract */ + /** @TODO It may be possible that this could go into an abstract */ public function loadConfigurations() { $configurations = []; @@ -68,7 +68,7 @@ public function loadConfigurations() 'store' => ['file' => $file], /** @TODO Better place to save this information? */ ]; } catch (\Exception $e) { - /** @TODO log error, that we can't read the configuration */ + /** @TODO Log error, that we can't read the configuration */ } } @@ -88,12 +88,12 @@ public function createConfigurationFromConfigurationArray(array $configuration, $templateConfiguration->setName($configuration['tvp-beLayout']['meta']['name']); } if (isset($configuration['tvp-beLayout']['meta']['renderer'])) { - /** @TODO check before setting */ + /** @TODO Check before setting */ $templateConfiguration->setRenderHandlerIdentifier($configuration['tvp-beLayout']['meta']['renderer']); } if (isset($configuration['tvp-beLayout']['meta']['template'])) { /** - * @TODO check before setting + * @TODO Check before setting * @TODO Relative to Place or configuration file? Support Absolute or 'EXT:' (insecure?) */ $templateConfiguration->setTemplateFileName($configuration['tvp-beLayout']['meta']['template']); diff --git a/Classes/Handler/Configuration/DataStructureConfigurationHandler.php b/Classes/Handler/Configuration/DataStructureConfigurationHandler.php index bbe0d2419..4bbd238b9 100644 --- a/Classes/Handler/Configuration/DataStructureConfigurationHandler.php +++ b/Classes/Handler/Configuration/DataStructureConfigurationHandler.php @@ -45,13 +45,13 @@ public function setLoadSaveHandler(LoadSaveHandlerInterface $loadSaveHandler) $this->loadSaveHandler = $loadSaveHandler; } - /** @TODO it may be possible that this could go into an abstract */ + /** @TODO It may be possible that this could go into an abstract */ public function loadConfigurations() { $configurations = []; $files = $this->loadSaveHandler->find(); - /** @TODO No, we don't know if this are files, this may be something totaly different! */ + /** @TODO No, we don't know if this are files, this may be something totally different! */ foreach ($files as $file) { $content = $this->loadSaveHandler->load($file); @@ -68,7 +68,7 @@ public function loadConfigurations() 'store' => ['file' => $file], /** @TODO Better place to save this information? */ ]; } catch (\Exception $e) { - /** @TODO log error, that we can't read the configuration */ + /** @TODO Log error, that we can't read the configuration */ } } diff --git a/Classes/Handler/Configuration/MappingConfigurationHandler.php b/Classes/Handler/Configuration/MappingConfigurationHandler.php index 027f3b733..6f2e73e29 100644 --- a/Classes/Handler/Configuration/MappingConfigurationHandler.php +++ b/Classes/Handler/Configuration/MappingConfigurationHandler.php @@ -45,13 +45,13 @@ public function setLoadSaveHandler(LoadSaveHandlerInterface $loadSaveHandler) $this->loadSaveHandler = $loadSaveHandler; } - /** @TODO it may be possible that this could go into an abstract */ + /** @TODO It may be possible that this could go into an abstract */ public function loadConfigurations() { $configurations = []; $files = $this->loadSaveHandler->find(); - /** @TODO No, we don't know if this are files, this may be something totaly different! */ + /** @TODO No, we don't know if this are files, this may be something totally different! */ foreach ($files as $file) { $content = $this->loadSaveHandler->load($file); @@ -68,7 +68,7 @@ public function loadConfigurations() 'store' => ['file' => $file], /** @TODO Better place to save this information? */ ]; } catch (\Exception $e) { - /** @TODO log error, that we can't read the configuration */ + /** @TODO Log error, that we can't read the configuration */ } } diff --git a/Classes/Handler/Configuration/TemplateConfigurationHandler.php b/Classes/Handler/Configuration/TemplateConfigurationHandler.php index d99d430b8..892cb4547 100644 --- a/Classes/Handler/Configuration/TemplateConfigurationHandler.php +++ b/Classes/Handler/Configuration/TemplateConfigurationHandler.php @@ -45,13 +45,13 @@ public function setLoadSaveHandler(LoadSaveHandlerInterface $loadSaveHandler) $this->loadSaveHandler = $loadSaveHandler; } - /** @TODO it may be possible that this could go into an abstract */ + /** @TODO It may be possible that this could go into an abstract */ public function loadConfigurations() { $configurations = []; $files = $this->loadSaveHandler->find(); - /** @TODO No, we don't know if this are files, this may be something totaly different! */ + /** @TODO No, we don't know if this are files, this may be something totally different! */ foreach ($files as $file) { $content = $this->loadSaveHandler->load($file); @@ -68,7 +68,7 @@ public function loadConfigurations() 'store' => ['file' => $file], /** @TODO Better place to save this information? */ ]; } catch (\Exception $e) { - /** @TODO log error, that we can't read the configuration */ + /** @TODO Log error, that we can't read the configuration */ } } @@ -88,12 +88,12 @@ public function createConfigurationFromConfigurationArray(array $configuration, $templateConfiguration->setName($configuration['tvp-template']['meta']['name']); } if (isset($configuration['tvp-template']['meta']['renderer'])) { - /** @TODO check before setting */ + /** @TODO Check before setting */ $templateConfiguration->setRenderHandlerIdentifier($configuration['tvp-template']['meta']['renderer']); } if (isset($configuration['tvp-template']['meta']['template'])) { /** - * @TODO check before setting + * @TODO Check before setting * @TODO Relative to Place or configuration file? Support Absolute or 'EXT:' (insecure?) */ $templateConfiguration->setTemplateFileName($configuration['tvp-template']['meta']['template']); diff --git a/Classes/Handler/LoadSave/LoadSaveHandlerInterface.php b/Classes/Handler/LoadSave/LoadSaveHandlerInterface.php index 9e1bd9327..0488997bc 100644 --- a/Classes/Handler/LoadSave/LoadSaveHandlerInterface.php +++ b/Classes/Handler/LoadSave/LoadSaveHandlerInterface.php @@ -28,8 +28,8 @@ public function setPlace(Place $place); public function find(); /** - * @TODO This is wrong, we only can givbe an identifier for the handler, we do not know, - * if this are files. The finder should only return an array of identifier for more + * @TODO This is wrong, we only can give an identifier for the handler, we do not know, + * if these are files. The finder should only return an array of identifier for more * operations. */ public function load(\Symfony\Component\Finder\SplFileInfo $file): array; diff --git a/Classes/Handler/Mapping/DefaultMappingHandler.php b/Classes/Handler/Mapping/DefaultMappingHandler.php index 7071aa692..cd6d0200e 100644 --- a/Classes/Handler/Mapping/DefaultMappingHandler.php +++ b/Classes/Handler/Mapping/DefaultMappingHandler.php @@ -26,7 +26,7 @@ * -Interface * -Registration * -More needed besides this Default one? - * - Its hard wired till yet + * - It's hardwired still */ class DefaultMappingHandler { @@ -42,7 +42,7 @@ public function process($flexformData, $table, $row): array $processedMapping = []; $containerInstructions = $this->mappingConfiguration->getMappingToTemplate(); - /** @TODO $table, $row are more globale vars, they are given from function to function */ + /** @TODO $table, $row are more global vars, they are given from function to function */ $processedMapping = $this->processContainer($flexformData, $table, $row, $containerInstructions); @@ -106,12 +106,12 @@ protected function processTypoScript(array $flexformData, $processedValue, strin $cObj = $this->getContentObjectRenderer($flexformData, $processedValue, $table, $row); $restoreData = []; - // add into TSFE register the parent rec data - /** @TODO On every value which gets processed? Not realy? */ + // Add parent rec data into the TSFE register + /** @TODO On every value which gets processed? Not really? */ $restoreData = $this->registerTypoScriptParentRec($row); // Copy current global TypoScript configuration except numerical objects: - /** @TODO On every value which gets processed? Not realy? */ + /** @TODO On every value which gets processed? Not really? */ if (is_array($GLOBALS['TSFE']->tmpl->setup)) { foreach ($GLOBALS['TSFE']->tmpl->setup as $tsObjectKey => $tsObjectValue) { if ($tsObjectKey !== (int)$tsObjectKey) { @@ -124,7 +124,7 @@ protected function processTypoScript(array $flexformData, $processedValue, strin $processedValue = $cObj->cObjGet($tsparserObj->setup, 'TemplaVoila_Proc.'); if (count($restoreData)) { - /** @TODO On every value which gets processed? Not realy? */ + /** @TODO On every value which gets processed? Not really? */ $this->restoreTypoScriptParentRec($restoreData); } diff --git a/Classes/Handler/Render/XpathRenderHandler.php b/Classes/Handler/Render/XpathRenderHandler.php index e752be081..e771fd061 100644 --- a/Classes/Handler/Render/XpathRenderHandler.php +++ b/Classes/Handler/Render/XpathRenderHandler.php @@ -93,7 +93,7 @@ protected function processContainer($node, $mappingConfiguration, $processedValu $outerCloneNode = $node->cloneNode(true); $plainCloneNode = $node->cloneNode(false); foreach ($processedValues as $processedContainerValues) { - // For every entrie we need a clean original node, so they can be appended (inner) or replaced (outer) afterwards + // For every entry we need a clean original node, so they can be appended (inner) or replaced (outer) afterwards $cloneNode = $outerCloneNode->cloneNode(true); $processingNodes = $this->getProcessingNodes($cloneNode, $mappingConfiguration); diff --git a/Classes/Service/ApiService.php b/Classes/Service/ApiService.php index d4f73b9aa..95909d5de 100644 --- a/Classes/Service/ApiService.php +++ b/Classes/Service/ApiService.php @@ -79,7 +79,7 @@ public function __construct($rootTable = 'pages') ******************************************************/ /** - * Creates a new content element record and sets the neccessary references to connect + * Creates a new content element record and sets the necessary references to connect * it to the parent element. * * @param array $destinationPointer Flexform pointer defining the parent location of the new element. Position refers to the element _after_ which the new element should be inserted. Position == 0 means before the first element. @@ -228,7 +228,7 @@ public function insertElement_setElementReferences($destinationPointer, $uid) * @param array $sourcePointer flexform pointer pointing to the element which shall be moved * @param array $destinationPointer flexform pointer to the new location * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function moveElement($sourcePointer, $destinationPointer) { @@ -247,7 +247,7 @@ public function moveElement($sourcePointer, $destinationPointer) * @param array $sourcePointer flexform pointer pointing to the element which shall be moved * @param array $destinationPointer flexform pointer to the new location * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function moveElement_setElementReferences($sourcePointer, $destinationPointer) { @@ -260,7 +260,7 @@ public function moveElement_setElementReferences($sourcePointer, $destinationPoi /** * Makes a true copy of an element specified by the source pointer to the location specified by - * destination pointer. By default also copies all sub elements but can be disabled so sub elements + * destination pointer. By default, it also copies all sub elements but can be disabled so sub elements * are not copied but referenced. * * @param array $sourcePointer flexform pointer pointing to the element which shall be copied @@ -331,7 +331,7 @@ public function localizeElement($sourcePointer, $languageKey) * @param array $sourcePointer flexform pointer pointing to the reference target * @param array $destinationPointer flexform pointer to the location where the reference should be stored * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function referenceElement($sourcePointer, $destinationPointer) { @@ -352,7 +352,7 @@ public function referenceElement($sourcePointer, $destinationPointer) * @param integer $uid UID of the tt_content element which shall be referenced * @param array $destinationPointer flexform pointer to the location where the reference should be stored * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function referenceElementByUid($uid, $destinationPointer) { @@ -372,7 +372,7 @@ public function referenceElementByUid($uid, $destinationPointer) * * @param array $sourcePointer flexform pointer pointing to the reference which shall be removed * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function unlinkElement($sourcePointer) { @@ -389,7 +389,7 @@ public function unlinkElement($sourcePointer) * * @param array $sourcePointer flexform pointer pointing to the element which shall be deleted * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function deleteElement($sourcePointer) { @@ -411,7 +411,7 @@ public function deleteElement($sourcePointer) * * @param string $mode Kind of processing * @param array $sourcePointer flexform pointer pointing to the element which will be processed. If "sheet", "sLang" etc. are set, it describes the position by specifying the (future) parent. If not, it describes the element directly with "table" and "uid". - * @param mixed $destinationPointer flexform pointer to the destination location (if neccessary) + * @param mixed $destinationPointer flexform pointer to the destination location (if necessary) * @param boolean $onlyHandleReferences If set, the record itself won't be moved, deleted etc. but only the references are set correctly. Use this feature if you are sure that the record has been handled before (eg. by TCEmain) * * @return mixed TRUE or something else (depends on operation) if operation was successful, otherwise FALSE @@ -510,7 +510,7 @@ public function process($mode, $sourcePointer, $destinationPointer = null, bool * @param array $elementRecord The database record of the element to be moved * @param boolean $onlyHandleReferences If TRUE, only the references will be set, the record itself will not be moved (because that happens elsewhere) * - * @return boolean TRUE if operation was successfuly, otherwise false + * @return boolean TRUE if operation was successfully, otherwise false */ public function process_move( array $sourcePointer, @@ -848,7 +848,7 @@ public function flexform_getValidPointer($flexformPointer) if ($flexformPointer['position'] < 0) { if ($this->debug) { - GeneralUtility::devLog('flexform_getValidPointer: The position must be possitive!', 'TemplaVoila API', 2, $flexformPointer); + GeneralUtility::devLog('flexform_getValidPointer: The position must be positive!', 'TemplaVoila API', 2, $flexformPointer); } return false; @@ -923,7 +923,7 @@ public function flexform_getPointerFromString($flexformPointerString) * * @param array $flexformPointer A valid flexform pointer array * - * @return boolean|string A string of the format "table:uid:sheet:sLang:field:vLang:position". The string might additionally contain "/table:uid" which is used to check the target record of the pointer. If an error occurs: FALSE + * @return boolean|string A string of the format "table:uid:sheet:sLang:field:vLang:position". The string might additionally contain "/table:uid", which is used to check the target record of the pointer. If an error occurs: FALSE */ public function flexform_getStringFromPointer($flexformPointer) { @@ -957,7 +957,7 @@ public function flexform_getStringFromPointer($flexformPointer) * specifies the record directly, but if sheet, sLang etc. are set, it specifies the location * from the perspective of the parent element. * - * @param mixed $flexformPointer A flexform pointer referring to the content element. Although an array is preferred, you may also pass a string which will be converted automatically by flexform_getPointerFromString() + * @param mixed $flexformPointer A flexform pointer referring to the content element. Although an array is preferred, you may also pass a string, which will be converted automatically by flexform_getPointerFromString() * * @return mixed The record row or FALSE if not successful */ @@ -1058,7 +1058,7 @@ public function flexform_getElementReferencesFromXML($flexformXML, $flexformPoin * @param string $table Name of the table of the parent element ('pages' or 'tt_content') * @param integer $uid UID of the parent element * @param array $recordUids Array of record UIDs - used internally, don't touch (but pass an empty array) - * @param integer $recursionDepth Tracks the current level of recursion - used internall, don't touch. + * @param integer $recursionDepth Tracks the current level of recursion - used internally, don't touch. * * @return array Array of record UIDs */ @@ -1116,7 +1116,7 @@ public function flexform_getListOfSubElementUidsRecursively($table, $uid, &$reco * @param string $table Name of the table of the parent element ('pages' or 'tt_content') * @param integer $uid UID of the parent element * @param array $flexformPointers Array of flexform pointers - used internally, don't touch - * @param integer $recursionDepth Tracks the current level of recursion - used internall, don't touch. + * @param integer $recursionDepth Tracks the current level of recursion - used internally, don't touch. * * @return array Array of flexform pointers */ @@ -1383,7 +1383,7 @@ public function ds_getColumnPositionByFieldName($contextPageUid, $fieldName) * be expanded, ie. you can be sure that it is structured by sheets even if only one sheet exists. * * @param string $table The table name, usually "pages" or "tt_content" - * @param array $row The data row (used to get DS if DS is dependant on the data in the record) + * @param array $row The data row (used to get DS if DS is dependent on the data in the record) * * @return array The data structure, expanded for all sheets inside. */ diff --git a/Classes/Service/ItemsProcFunc.php b/Classes/Service/ItemsProcFunc.php index 4e8e612c8..2a7e200db 100644 --- a/Classes/Service/ItemsProcFunc.php +++ b/Classes/Service/ItemsProcFunc.php @@ -40,7 +40,7 @@ public function mapItems(array $params, \TYPO3\CMS\Backend\Form\FormDataProvider ); $placesService->loadConfigurationsByPlaces($mappingPlaces); - // @TODO Do we have a better way for the emptyness? In tt_content this should be hindered? + // @TODO Do we have a better way for the emptiness? In tt_content this should be hindered? $params['items'] = [ ['', ''], ]; diff --git a/Classes/Service/ProcessingService.php b/Classes/Service/ProcessingService.php index b914e5f27..d5739a5e1 100644 --- a/Classes/Service/ProcessingService.php +++ b/Classes/Service/ProcessingService.php @@ -34,7 +34,7 @@ class ProcessingService /** @var FlexFormTools */ protected $flexFormTools = null; - /** @TODO This makes the Service statefull!! */ + /** @TODO This makes the Service stateful!! */ /** @var int */ protected $basePid = null; diff --git a/Classes/Utility/FormEngineUtility.php b/Classes/Utility/FormEngineUtility.php index 471ec555c..f7bf02129 100644 --- a/Classes/Utility/FormEngineUtility.php +++ b/Classes/Utility/FormEngineUtility.php @@ -52,7 +52,7 @@ function (&$item, $key, $replacements) { /** * In TYPO3 8 LTS TcaFlexFetch was merged into TcaFlexPrepare, so we need to add our TcaFlexFetch back, - * as we support also TYPO3 7 LTS. We can merge oure side if we start TV+ 8 + * as we support also TYPO3 7 LTS. We can merge our side if we start TV+ 8 * Call after replaceInFormDataGroups! * * @TODO remove with TV+ 8 diff --git a/Classes/Utility/TemplaVoilaUtility.php b/Classes/Utility/TemplaVoilaUtility.php index 9e9b58b74..1e443e52e 100644 --- a/Classes/Utility/TemplaVoilaUtility.php +++ b/Classes/Utility/TemplaVoilaUtility.php @@ -152,7 +152,7 @@ public static function getAvailableLanguages($id = 0, $setDefault = true, $setMu $languages[$languageRecord['uid']] = $languageRecord; $languages[$languageRecord['uid']]['ISOcode'] = strtoupper($languageRecord['language_isocode']); - // @todo: this should probably resolve language_isocode too and throw a deprecation if not filled + // @todo: This should probably resolve language_isocode too and throw a deprecation if not filled if ($languageRecord['static_lang_isocode'] && $useStaticInfoTables) { $staticLangRow = BackendUtility::getRecord('static_languages', $languageRecord['static_lang_isocode'], 'lg_iso_2'); if ($staticLangRow['lg_iso_2']) { diff --git a/Classes/ViewHelpers/Format/StripTagsViewHelper.php b/Classes/ViewHelpers/Format/StripTagsViewHelper.php index 3b8276c1d..58d79a6c3 100644 --- a/Classes/ViewHelpers/Format/StripTagsViewHelper.php +++ b/Classes/ViewHelpers/Format/StripTagsViewHelper.php @@ -95,7 +95,7 @@ class StripTagsViewHelper extends AbstractViewHelper public function initializeArguments() { $this->registerArgument('value', 'string', 'string to format'); - $this->registerArgument('whitespace', 'bool', 'Avoid that the output is concatinated without spaces', false, false); + $this->registerArgument('whitespace', 'bool', 'Avoid concatenated output without spaces', false, false); $this->registerArgument('allowedTags', 'string', 'Optional string of allowed tags as required by PHPs strip_tags() function'); } diff --git a/Classes/ViewHelpers/SplitIntoArrayViewHelper.php b/Classes/ViewHelpers/SplitIntoArrayViewHelper.php index a8d1abd5e..970cbb852 100644 --- a/Classes/ViewHelpers/SplitIntoArrayViewHelper.php +++ b/Classes/ViewHelpers/SplitIntoArrayViewHelper.php @@ -21,7 +21,7 @@ class SplitIntoArrayViewHelper extends AbstractViewHelper public function initializeArguments() { $this->registerArgument('value', 'mixed', 'Value to assign. If not in arguments then taken from tag content'); - $this->registerArgument('pattern', 'string', 'The delimiter/seperator for the string as regex (mostly \R) without delimiter'); + $this->registerArgument('pattern', 'string', 'The delimiter/separator for the string as regex (mostly \R) without delimiter'); $this->registerArgument('delimiterDecimal', 'int', 'A delimiter char as decimal number (like table_delimiter)'); $this->registerArgument('limit', 'string', 'It will be split in limit elements as maximum'); } diff --git a/Documentation/Introduction/AboutThisManual/Index.rst b/Documentation/Introduction/AboutThisManual/Index.rst index d6bf60c8b..ab82275d2 100644 --- a/Documentation/Introduction/AboutThisManual/Index.rst +++ b/Documentation/Introduction/AboutThisManual/Index.rst @@ -7,6 +7,6 @@ This manual for TemplaVoilà! Plus v8 isn't complete like it was never for Templ At the moment it is the old one only imported and some small points are already updated but it isn't complete yet. Some points in this documentation are outdated and written for TYPO3 4.5 or older. -So this document maybe non helpfull for newbies. But we will update this documentation +So this document maybe unhelpful for newbies. But we will update this documentation from time to time. If you find something, which isn't clear please fill in an issue report on the `Project page `_. diff --git a/Documentation/Introduction/WhatDoesItDo/Index.rst b/Documentation/Introduction/WhatDoesItDo/Index.rst index ebfa18e7d..bf21c865b 100644 --- a/Documentation/Introduction/WhatDoesItDo/Index.rst +++ b/Documentation/Introduction/WhatDoesItDo/Index.rst @@ -3,7 +3,7 @@ What does it do? ^^^^^^^^^^^^^^^^ -In short, TemplaVoilà! Plus is an alternate templating enginge offering a +In short, TemplaVoilà! Plus is an alternate templating engine offering a new way of creating and working with design elements. On top of that it provides a new user interface in the backend (aka the “Page Module”). diff --git a/Resources/Private/Language/Backend/PageLayout.xlf b/Resources/Private/Language/Backend/PageLayout.xlf index cc1203bff..08494d91e 100644 --- a/Resources/Private/Language/Backend/PageLayout.xlf +++ b/Resources/Private/Language/Backend/PageLayout.xlf @@ -100,7 +100,7 @@ Your user settings don't allow creating, moving or removing elements from this page. - Your settings indicate that you're either don't have the general right to edit page content, or you're not allowed to modify required tables or you're not allowed to edit the content fields. We suggest you recheck the settings or get in touch with your technical support. + Your settings indicate that you either don't have the general right to edit page content, or you're not allowed to modify required tables or you're not allowed to edit the content fields. We suggest you recheck the settings or get in touch with your technical support. This is a reference to an element on page %2$d. diff --git a/Resources/Private/Language/PluginConfiguration.xlf b/Resources/Private/Language/PluginConfiguration.xlf index adde541a6..1290e9e08 100644 --- a/Resources/Private/Language/PluginConfiguration.xlf +++ b/Resources/Private/Language/PluginConfiguration.xlf @@ -7,7 +7,7 @@ Enable Header for FCE's:If this checkbox is checked the header of Content Element type FCE will be rendered like headers of other Content Elements. - Defines the XML indentation in the Data Structures.:This is usefull for static Data Structures. Number smaller then zero means no indentation, zero means using tabs and number larger then zero means number of space chars. + Defines the XML indentation in the Data Structures.:This is useful for static Data Structures. Number smaller than zero means no indentation, zero means using tabs and number larger than zero means number of space chars. Enable static files for data structures:Experimental! Use Static DS Conversion Wizard below! diff --git a/Resources/Private/Partials/DocHeader.html b/Resources/Private/Partials/DocHeader.html index c7a98421b..69b74579e 100644 --- a/Resources/Private/Partials/DocHeader.html +++ b/Resources/Private/Partials/DocHeader.html @@ -12,7 +12,7 @@
- + : {docHeader.metaInformation.path} {docHeader.metaInformation.recordInformation}
diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step1.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step1.html index 78226c830..ab15356cf 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step1.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step1.html @@ -4,24 +4,24 @@

Update configuration to TemplaVoilà! Plus 8

Step 1 - Check your System

-

TV+ checks your database and existing configuration for issues, which may hinder TV+ to update your configuration. Also check the output of DataStructures and Temnplate Objects if they are all, does it sound reasonable how often they are used, if not, check your database consistency. Only the green entries, which are listed below, will be migrated, DataStructures and Template Objects wich are marked as deleted inside the TYPO3 database won't be migrated.

+

TV+ checks your database and existing configuration for issues that may hinder TV+ from updating your configuration. Also check the output of DataStructures and Template Objects, does it seem reasonable how often they are used, if not, check your database consistency. Only the green entries, which are listed below, will be migrated, DataStructures and Template Objects, which are marked as deleted inside the TYPO3 database won't be migrated.

-

It seams you have deleted database tables and/or fields which are necessary for the Update Script.
Process stopped.

+

It seems you have deleted database tables and/or fields that are necessary for the Update Script.
Process stopped.

 -

The new fields on table pages and tt_content do not exists, please run the "Analyze Database Structure" tool and add that fields (but do not remove any tables or fields) and come back afterwards.
Process stopped.

+

The new fields on table pages and tt_content do not exist, please run the "Analyze Database Structure" tool and add that fields (but do not remove any tables or fields) and then try again.
Process stopped.

 -

You have some Template Objects inside Workspaces, as this is unusal and hard to determine what you have done, you need to check for yourself what needs to be done, to get this cleaned up. (This may be old data, left behind by an older and broken TemplaVoilà! or TYPO3 version and can be removed from database.)
Process stopped.

+

You have some Template Objects inside Workspaces. Since this is unusual and hard to determine what you have done, you need to check for yourself what needs to be done and clean things up. (This may be old data, left behind by an older and broken TemplaVoilà! or TYPO3 version so can be potentially removed from database.)
Process stopped.

 @@ -43,7 +43,7 @@

Step 1 - Check your System

-

You have DataStructures and/or Template Objects which have errors while checking.
Process stopped.

+

You have DataStructures and/or Template Objects that have errors.
Process stopped.

  • {validationError}
    • @@ -54,7 +54,7 @@

    Step 1 - Check your System

    -

    You have Pages or content elements which have errors while checking.
    Process stopped.

    +

    You have Pages or content elements which have errors.
    Process stopped.

    • {validationError}
      • @@ -66,7 +66,7 @@

      Step 1 - Check your System

      -

      The indentation in XML files will be one tabular. You can change this also to a number of chars in the extension configuration.

      +

      The indentation in XML files will be single tab. You can change this also to a number of chars in the extension configuration.

             @@ -115,11 +115,11 @@

      Step 1 - Check your System

      -

      Please fix the errors before you can continue in this Update Script. After fixing all issues you can rerun this step. It may be possible, that other errors arrise after your changes.

      +

      Please fix the errors before you can continue this Update Script. After fixing all issues you can rerun this step. Please note that it may be also be possible for other errors to crop up after you make your changes.

       -

      It seams all your data is fine, so you can go to the next step. Or rerun this step, if you changed some data (maybe deleted a DS or TO as it was unused).

      +

      It seems all your data is fine. You can go to the next step or rerun this step if you changed some data (i.e. you deleted an unused DS or TO, etc.).
      diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step2.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step2.html index d45774621..36c08f5cb 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step2.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step2.html @@ -13,10 +13,10 @@

      Step 2 - Select target

      What does the colors mean: - This extension is seams to be your already existing configuration/themes extension which you like to use to write TV+ configuration into. - This extension is possible for usage to write your TV+ configuration. - This extension can not be used, see hint. (not visible by default) - This extension can not be used, see hint. (not visible by default) + This extension seems to be the configuration/themes extension you use to write TV+ configuration into. + This extension can be used to write your TV+ configuration into. + This extension cannot be used, see hint. (not visible by default) + This extension cannot be used, see hint. (not visible by default)

      Select an option

      diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step3NewExtension.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step3NewExtension.html index 0c33c8c09..a788c214b 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step3NewExtension.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step3NewExtension.html @@ -6,7 +6,7 @@

      Step 3 - Create new Extension

      -

      The extension list from the TYPO3 Extension Repository (TER) wasn't downloaded, so we cann't determine between own extensions and released extensions in which you normaly won't write your configuration data.

      +

      The extension list from the TYPO3 Extension Repository (TER) wasn't downloaded, so we can't differentiate between your own extensions and released extensions where you shouldn't normally won't write your configuration data to.
      @@ -50,7 +50,7 @@

      Rerun key validation?

      - +
      @@ -61,7 +61,7 @@

      Rerun key validation?

      - +
      @@ -72,7 +72,7 @@

      Rerun key validation?

      - +
      @@ -83,7 +83,7 @@

      Rerun key validation?

      - +
      diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step4.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step4.html index 6bc27b60f..320cb7d39 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step4.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step4.html @@ -29,7 +29,7 @@

      Step 4 - Extension created/updated

       -

      We converted Template Objects with their responding Data Structures. Created the default places configurations and copied/created all files where they belong to live long and prosper. On the next step we will register your extension and update the pages and tt_content table to point to the newly created MappingConfiguration.

      +

      We converted Template Objects with their corresponding Data Structures. We also created the default places for configurations and copied/created all files to where they belong, so they can live long and prosper. On the next step we will register your extension and update the pages and tt_content table to point to the newly created MappingConfiguration.
      diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step5.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step5.html index 95129c27a..208561f32 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step5.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/Step5.html @@ -23,8 +23,8 @@

      Step 5 - Update database

      -

      All done, hopefully TV+ converted your complete dream of a website to the new configuration and you are amazed how this worked out so good.

      -

      If you like, TV+ can now eliminate all old data, so you get a clean setup, you made a backup, did you? Otherwise return to the Update Script selection.

      +

      All done, TV+ has converted your stunningly beautiful website to the new configuration. Hopefully you're amazed how easy everything was to migrate!

      +

      If you like, TV+ can now eliminate all old data, so you get a clean setup. Make sure you've made a backup first though. If you don't have a backup, please return to the Update Script selection.
      diff --git a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/StepStart.html b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/StepStart.html index a0667b2c1..66ead74f1 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/StepStart.html +++ b/Resources/Private/Templates/Backend/ControlCenter/TemplaVoilaPlus8Update/StepStart.html @@ -4,7 +4,7 @@

      Update configuration to TemplaVoilà! Plus 8

      Needs to be removed before final release. -

      You are using software which is in alpha state, the process of migration isn't complete and ready! Maybe TV+ change the style of configuration lately, implement a complete differently solution. So please do this only inside testing environments. This migration may need to run after every git checkout or point release update from the same TV+ 7 configuration base and this can lead to the possibility that it overwrites changed data.

      +

      You are using software which is in alpha state, the process of migration isn't complete and ready! Maybe TV+ changed the style of configuration lately, implement a complete differently solution. So please do this only inside testing environments. This migration may need to run after every git checkout or point release update from the same TV+ 7 configuration base and this can lead to the possibility that it overwrites changed data.

      • Only use on testing environments.
        • @@ -13,11 +13,11 @@

        Update configuration to TemplaVoilà! Plus 8

       -

      TV+ 8 changes the configuration massively, as all configurations happen now in files and do not reside inside the database anymore. Till yet this was only possible with the experimental Static DataStructures. This change makes it easier for deployment strategies and creating theme extensions and you get the ability to manage your design better inside version control systems (VCS). Handling design updates on your website should work better. And as we only have one map field in the pages/tt_content tables editors cann't breake the ds/to fields anymore.

      -

      To get all this happen, TV+ 8 introduce a concept of "configuration places". Every place contain one aspect of configuration, we removed the mixing of different aspects so parts of the configuration can better reused. Breaking the hard binding between DataStructure and Template allows us also to use different Template Engines, till yet the old XPath is reimplemented but others can be provided by extensions or write your own one. Also different loaders allows us to use modern configuration languages, together at same time. Implemented are the good old XML and the newer Yaml.

      -

      Every place define a LoadSaveHandler, a Handler for the configuration type and an entry point to find the configuration files. We use three different configuration types. The one is already known as DataStructures, which now only contain the structuring of data, no processing instructions or anything else. The second one is the TemplateConfiguration, it defines which template file to use, which RenderHandler should be called and mostly configures the RenderHandler with information about how to render (for example the XPath RenderHandler needs to know which variable have which XPath) and what else is needed for a good rendering. The newly third configuration type is the MappingConfiguration (may change the name to ProcessingConfiguration) it defines what to do with the values of the DataStructure fields, of row fields or of TypoScript pathes and into which names of the template they should be transfered. This mapping information is also the part which your editor will select later on page or content level.

      -

      This update script helps you to move your configuration out of your database (or the static DataStructures) and your templates from fileadmin into an extension, which you can check into your VCS to manage changes with history and backup.

      -

      Enough told for the moment, start your update right now, TV+ will guide you with multiple steps to a hopefully functional system. At first we need to check, what your current system includes and how this update script can help you.

      +

      TV+ 8 significantly changes the configuration. All configurations now happen in files instead of a database. Until now, configuration coming from files was only possible with the experimental Static DataStructures. This change makes it easier for deployment strategies and creating theme extensions (i.e. you get the ability to manage your design better inside version control systems (VCS)), so handling design updates on your website should work better. As another added bonus, we now only have one map field in the pages/tt_content tables editor, so you can't break the ds/to fields anymore.

      +

      To get all this to happen, TV+ 8 introduce a concept of "configuration places". Every place contains one aspect of configuration, we removed the mixing of different aspects so parts of the configuration can be reused more easily. Breaking the hard binding between DataStructure and Template allows us also to use different Template Engines, because until now the old XPath was use but others can be provided by extensions, or you can write your own one. Also, different loaders allows us to use modern configuration languages together at same time like the good old XML and the newer Yaml.

      +

      Every place defines a LoadSaveHandler, a Handler for the configuration type and an entry point to find the configuration files. We use three different configuration types. The first one is already known as DataStructures, which now only contain the structuring of data, no processing instructions or anything else. The second one is the TemplateConfiguration, which defines what template file to use, what RenderHandler should be called and mostly configures the RenderHandler with information about how to render (for example the XPath RenderHandler needs to know which variable has which XPath) and anything else that is needed for a good rendering. The new third configuration type is the MappingConfiguration (may change the name to ProcessingConfiguration) that defines what to do with the values of the DataStructure fields, of row fields or of TypoScript paths as well as differentiating which names of the template they should be transferred. This mapping information is also the part which your editor will select later on the page or content level.

      +

      This update script helps you to move your configuration out of your database (or the static DataStructures) and your templates from fileadmin into an extension. The benefit of this is that you can check these files into your VCS to manage changes with history and backup.

      +

      That's probably enough details for the moment, go ahead and start your update right now, TV+ will guide you through the process with multiple steps to a hopefully functional system. At first, we need to check what your current system includes and how this update script can help you.

      This box should be removed and changed to a Step which asks if you did a backup Please backup your database/files before running any of the update scripts! @@ -38,7 +38,7 @@

      Update configuration to TemplaVoilà! Plus 8

      - What TODO with the storage_pid check? We may need a check if there is more then one storage_pid to get different theme extensions. + What TODO with the storage_pid check? We may need a check if there is more than one storage_pid to get different theme extensions. diff --git a/Resources/Private/Templates/Backend/ControlCenter/Update/Info.html b/Resources/Private/Templates/Backend/ControlCenter/Update/Info.html index a1aed9038..a8cc1d376 100644 --- a/Resources/Private/Templates/Backend/ControlCenter/Update/Info.html +++ b/Resources/Private/Templates/Backend/ControlCenter/Update/Info.html @@ -5,13 +5,13 @@

      TemplaVoilà! Plus (TV+)

      Welcome to the Update Script collection to get your DataStructures, Mapping- and TemplateConfigurations updated to the latest state for your running TYPO3 and TV+ version.

      Your system runs TYPO3 {typo3Version} and TV+ {tvpVersion}. - Your TYPO3 Version is more then new, it may be, you may find some gremlins as we do not support this version yet. + Your TYPO3 Version is beyond a currently released version, so you may run into some issue since we do not support this version yet. - Your TYPO3 Version is very old, TV+ 8 do not support this version anymore. Please stay at latest TV+ 7 version. Hopefully you are running an ELTS Version of TYPO3. + Your TYPO3 Version is very old, TV+ 8 does not support this version anymore. Please use the latest TV+ 7 version instead. Hopefully you are running an ELTS Version of TYPO3. - Your TYPO3 Version is supported by TV+ 8, but see message box below. + Your TYPO3 Version is supported by TV+ 8, but please see the message box below. Your TYPO3 Version is supported by TV+ 8. @@ -21,8 +21,8 @@

      TemplaVoilà! Plus (TV+)

        -
      • On the one side this release is out of normal maintenance support since 31. March 2020. You should upgrade to a newer version of TYPO3 or pay to get extended maintenance support time (ELTS Support). For more information follow this link. If you need more information on the support times of the TYPO3 versions, take a look here.
        • -
      • On the other side "TYPO3 v8" do not have the "Site Management" (it was introduced in "TYPO3 v9") so this feature isn't useable together with TemplaVoilà! Plus 8
        • +
      • Your version of TYPO3 is out of normal maintenance support as of March 31, 2020. You should upgrade to a newer version of TYPO3 or pay to get extended maintenance support time (ELTS Support). For more information follow this link. If you need more information on the support times of the TYPO3 versions, take a look here.
        • +
      • However, even if you upgrade to TYPO3 v8, it still doesn't have the "Site Management" feature since it was introduced in "TYPO3 v9". So, unfortunately this feature isn't usable together with TemplaVoilà! Plus 8.
             @@ -33,14 +33,14 @@

      Information

      • Please backup your data before running any of the update scripts!
        • -
      • Do not run any database deletion tasks before all possible update scripts are done!
        • +
      • Do not run any database deletion tasks until all possible update scripts have been completed!

      Please select an update script

      Add check if it needs to be run - + Update configuration to TemplaVoilà! Plus 8 (Version: 0.0.2) Disable it, while TV+ 8 update didn't run yet? From f6cf575c592dcb29dec1bb356679a9f26344f53a Mon Sep 17 00:00:00 2001 From: Charles Coleman Date: Tue, 3 May 2022 12:14:22 -0700 Subject: [PATCH 2/5] [TASK] Replace "todo:" with "TODO" --- Classes/Form/Container/FlexFormElementContainer.php | 2 +- Classes/Form/Container/FlexFormNoTabsContainer.php | 2 +- Classes/Form/Container/FlexFormSectionContainer.php | 2 +- Classes/Form/Container/FlexFormTabsContainer.php | 2 +- Classes/Form/Controller/FormFlexAjaxController.php | 6 +++--- Classes/Form/Controller/FormFlexAjaxController9.php | 6 +++--- Classes/Form/FormDataProvider/TcaFlexFetch.php | 4 ++-- Classes/Form/FormDataProvider/TcaFlexProcess.php | 12 ++++++------ Classes/Service/ApiService.php | 2 +- Classes/Utility/TemplaVoilaUtility.php | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Classes/Form/Container/FlexFormElementContainer.php b/Classes/Form/Container/FlexFormElementContainer.php index 40b7d8f95..9fc588427 100644 --- a/Classes/Form/Container/FlexFormElementContainer.php +++ b/Classes/Form/Container/FlexFormElementContainer.php @@ -179,7 +179,7 @@ public function render() // Possible line breaks in the label through xml: \n =>
      , usage of nl2br() not possible, so it's done through str_replace (?!) $processedTitle = str_replace('\\n', '
      ', $theTitle); - // @todo: Similar to the processing within SingleElementContainer ... use it from there?! + // @TODO Similar to the processing within SingleElementContainer ... use it from there?! $html[] = '
      '; $html[] = '