Commit a9902b5c authored by Sebastian Michaelsen's avatar Sebastian Michaelsen Committed by Nicole Cordes
Browse files

[TASK] Use "an" instead of "a" where appropriate

In english you have to use "an" before any spoken vowel.

Resolves: #68326
Releases: master
Change-Id: I2f8996d14eb532bd297b7035a6daaee4fea3f140
Reviewed-on: http://review.typo3.org/41651


Reviewed-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
parent 793191c7
...@@ -21,7 +21,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Menus; ...@@ -21,7 +21,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Menus;
* The TYPO3 project - inspiring people to share! * * The TYPO3 project - inspiring people to share! *
* */ * */
/** /**
* View helper which returns a option tag. * View helper which returns an option tag.
* This view helper only works in conjunction with \TYPO3\CMS\Fluid\ViewHelpers\Be\Menus\ActionMenuViewHelper * This view helper only works in conjunction with \TYPO3\CMS\Fluid\ViewHelpers\Be\Menus\ActionMenuViewHelper
* Note: This view helper is experimental! * Note: This view helper is experimental!
* *
......
...@@ -40,7 +40,7 @@ class TextfieldViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractForm ...@@ -40,7 +40,7 @@ class TextfieldViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractForm
*/ */
public function initializeArguments() { public function initializeArguments() {
parent::initializeArguments(); parent::initializeArguments();
$this->registerTagAttribute('autofocus', 'string', 'Specifies that a input should automatically get focus when the page loads'); $this->registerTagAttribute('autofocus', 'string', 'Specifies that an input should automatically get focus when the page loads');
$this->registerTagAttribute('disabled', 'string', 'Specifies that the input element should be disabled when the page loads'); $this->registerTagAttribute('disabled', 'string', 'Specifies that the input element should be disabled when the page loads');
$this->registerTagAttribute('maxlength', 'int', 'The maxlength attribute of the input field (will not be validated)'); $this->registerTagAttribute('maxlength', 'int', 'The maxlength attribute of the input field (will not be validated)');
$this->registerTagAttribute('readonly', 'string', 'The readonly attribute of the input field'); $this->registerTagAttribute('readonly', 'string', 'The readonly attribute of the input field');
......
...@@ -350,7 +350,7 @@ abstract class AbstractElementView { ...@@ -350,7 +350,7 @@ abstract class AbstractElementView {
/** /**
* Read the noWrap value of an element * Read the noWrap value of an element
* if TRUE the element does not need a element wrap * if TRUE the element does not need an element wrap
* like <li>element</li> * like <li>element</li>
* *
* @return bool * @return bool
......
...@@ -406,7 +406,7 @@ abstract class AbstractElementView { ...@@ -406,7 +406,7 @@ abstract class AbstractElementView {
/** /**
* Read the noWrap value of an element * Read the noWrap value of an element
* if TRUE the element does not need a element wrap * if TRUE the element does not need an element wrap
* like <li>element</li> * like <li>element</li>
* *
* @return bool * @return bool
......
...@@ -351,7 +351,7 @@ abstract class AbstractElementView { ...@@ -351,7 +351,7 @@ abstract class AbstractElementView {
/** /**
* Read the noWrap value of an element * Read the noWrap value of an element
* if TRUE the element does not need a element wrap * if TRUE the element does not need an element wrap
* like <li>element</li> * like <li>element</li>
* *
* @return bool * @return bool
......
...@@ -2819,23 +2819,23 @@ message ...@@ -2819,23 +2819,23 @@ message
message = TEXT message = TEXT
message { message {
value = Use a integer value = Use an integer
} }
**Example:** **Example:**
:: ::
message = Use a integer message = Use an integer
**Example:** **Example:**
:: ::
message.value = Use a integer message.value = Use an integer
Default Default
local language: Use a integer local language: Use an integer
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<source>The value does not appear to be valid</source> <source>The value does not appear to be valid</source>
</trans-unit> </trans-unit>
<trans-unit id="tx_form_system_validate_integer.message"> <trans-unit id="tx_form_system_validate_integer.message">
<source>Use a integer</source> <source>Use an integer</source>
</trans-unit> </trans-unit>
<trans-unit id="tx_form_system_validate_integer.error"> <trans-unit id="tx_form_system_validate_integer.error">
<source>The value does not appear to be an integer</source> <source>The value does not appear to be an integer</source>
......
...@@ -2487,7 +2487,7 @@ class ContentObjectRenderer { ...@@ -2487,7 +2487,7 @@ class ContentObjectRenderer {
/** /**
* cObject * cObject
* Will replace the content with the value of a any official TypoScript cObject * Will replace the content with the value of an official TypoScript cObject
* like TEXT, COA, HMENU * like TEXT, COA, HMENU
* *
* @param string $content Input value undergoing processing in this function. * @param string $content Input value undergoing processing in this function.
...@@ -6252,7 +6252,7 @@ class ContentObjectRenderer { ...@@ -6252,7 +6252,7 @@ class ContentObjectRenderer {
if ($conf['no_cache.']) { if ($conf['no_cache.']) {
$conf['no_cache'] = $this->stdWrap($conf['no_cache'], $conf['no_cache.']); $conf['no_cache'] = $this->stdWrap($conf['no_cache'], $conf['no_cache.']);
} }
// Splitting the parameter by ',' and if the array counts more than 1 element it's a id/type/parameters triplet // Splitting the parameter by ',' and if the array counts more than 1 element it's an id/type/parameters triplet
$pairParts = GeneralUtility::trimExplode(',', $linkParameter, TRUE); $pairParts = GeneralUtility::trimExplode(',', $linkParameter, TRUE);
$linkParameter = $pairParts[0]; $linkParameter = $pairParts[0];
$link_params_parts = explode('#', $linkParameter); $link_params_parts = explode('#', $linkParameter);
...@@ -6439,7 +6439,7 @@ class ContentObjectRenderer { ...@@ -6439,7 +6439,7 @@ class ContentObjectRenderer {
} }
} }
} }
// If link is to a access restricted page which should be redirected, then find new URL: // If link is to an access restricted page which should be redirected, then find new URL:
if (empty($conf['linkAccessRestrictedPages']) && $GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages'] && $GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages'] !== 'NONE' && !$GLOBALS['TSFE']->checkPageGroupAccess($page)) { if (empty($conf['linkAccessRestrictedPages']) && $GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages'] && $GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages'] !== 'NONE' && !$GLOBALS['TSFE']->checkPageGroupAccess($page)) {
$thePage = $GLOBALS['TSFE']->sys_page->getPage($GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages']); $thePage = $GLOBALS['TSFE']->sys_page->getPage($GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages']);
$addParams = str_replace( $addParams = str_replace(
......
...@@ -604,7 +604,7 @@ class PageGenerator { ...@@ -604,7 +604,7 @@ class PageGenerator {
if (!is_array($tsfe->pSetup['includeJSlibs.'])) { if (!is_array($tsfe->pSetup['includeJSlibs.'])) {
$tsfe->pSetup['includeJSlibs.'] = array(); $tsfe->pSetup['includeJSlibs.'] = array();
} else { } else {
GeneralUtility::deprecationLog('The property page.includeJSlibs is marked for deprecation and will be removed in TYPO3 CMS 8. Please use page.includeJSLibs (with a uppercase L) instead.'); GeneralUtility::deprecationLog('The property page.includeJSlibs is marked for deprecation and will be removed in TYPO3 CMS 8. Please use page.includeJSLibs (with an uppercase L) instead.');
} }
if (!is_array($tsfe->pSetup['includeJSLibs.'])) { if (!is_array($tsfe->pSetup['includeJSLibs.'])) {
$tsfe->pSetup['includeJSLibs.'] = array(); $tsfe->pSetup['includeJSLibs.'] = array();
......
...@@ -1043,7 +1043,7 @@ class AbstractPlugin { ...@@ -1043,7 +1043,7 @@ class AbstractPlugin {
if (!$query) { if (!$query) {
// Fetches the list of PIDs to select from. // Fetches the list of PIDs to select from.
// TypoScript property .pidList is a comma list of pids. If blank, current page id is used. // TypoScript property .pidList is a comma list of pids. If blank, current page id is used.
// TypoScript property .recursive is a int+ which determines how many levels down from the pids in the pid-list subpages should be included in the select. // TypoScript property .recursive is an int+ which determines how many levels down from the pids in the pid-list subpages should be included in the select.
$pidList = $this->pi_getPidList($this->conf['pidList'], $this->conf['recursive']); $pidList = $this->pi_getPidList($this->conf['pidList'], $this->conf['recursive']);
if (is_array($mm_cat)) { if (is_array($mm_cat)) {
// This adds WHERE-clauses that ensures deleted, hidden, starttime/endtime/access records are NOT // This adds WHERE-clauses that ensures deleted, hidden, starttime/endtime/access records are NOT
......
...@@ -106,7 +106,7 @@ class AdminPanelView { ...@@ -106,7 +106,7 @@ class AdminPanelView {
} }
/** /**
* Checks if a Admin Panel section ("module") is available for the user. If so, TRUE is returned. * Checks if an Admin Panel section ("module") is available for the user. If so, TRUE is returned.
* *
* @param string $key The module key, eg. "edit", "preview", "info" etc. * @param string $key The module key, eg. "edit", "preview", "info" etc.
* @return bool * @return bool
......
...@@ -1179,7 +1179,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass { ...@@ -1179,7 +1179,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$msg = ''; $msg = '';
// Save preset // Save preset
$beUser = $this->getBackendUser(); $beUser = $this->getBackendUser();
// cast public checkbox to int, since this is a int field and NULL is not allowed // cast public checkbox to int, since this is an int field and NULL is not allowed
$inData['preset']['public'] = (int)$inData['preset']['public']; $inData['preset']['public'] = (int)$inData['preset']['public'];
if (isset($presetData['save'])) { if (isset($presetData['save'])) {
$preset = $this->getPreset($presetData['select']); $preset = $this->getPreset($presetData['select']);
......
...@@ -1573,7 +1573,7 @@ class ImportExport { ...@@ -1573,7 +1573,7 @@ class ImportExport {
foreach ($this->storageObjects as $localStorage) { foreach ($this->storageObjects as $localStorage) {
// check the available storage for Local, writable and online ones // check the available storage for Local, writable and online ones
if ($localStorage->getDriverType() === 'Local' && $localStorage->isWritable() && $localStorage->isOnline()) { if ($localStorage->getDriverType() === 'Local' && $localStorage->isWritable() && $localStorage->isOnline()) {
// check if there is already a identical storage present (same pathType and basePath) // check if there is already an identical storage present (same pathType and basePath)
$storageRecordConfiguration = ResourceFactory::getInstance()->convertFlexFormDataToConfigurationArray($storageRecord['configuration']); $storageRecordConfiguration = ResourceFactory::getInstance()->convertFlexFormDataToConfigurationArray($storageRecord['configuration']);
$localStorageRecordConfiguration = $localStorage->getConfiguration(); $localStorageRecordConfiguration = $localStorage->getConfiguration();
if ( if (
...@@ -1623,7 +1623,7 @@ class ImportExport { ...@@ -1623,7 +1623,7 @@ class ImportExport {
$this->import_mapId['sys_file_storage'][$sysFileStorageUidToBeResetToDefaultStorage] = $defaultStorageUid; $this->import_mapId['sys_file_storage'][$sysFileStorageUidToBeResetToDefaultStorage] = $defaultStorageUid;
} }
// unset the sys_file_storage records to prevent a import in writeRecords_records // unset the sys_file_storage records to prevent an import in writeRecords_records
unset($this->dat['header']['records']['sys_file_storage']); unset($this->dat['header']['records']['sys_file_storage']);
} }
...@@ -1669,7 +1669,7 @@ class ImportExport { ...@@ -1669,7 +1669,7 @@ class ImportExport {
$originalStorageUid = $fileRecord['storage']; $originalStorageUid = $fileRecord['storage'];
$useStorageFromStorageRecords = FALSE; $useStorageFromStorageRecords = FALSE;
// replace storage id, if a alternative one was registered // replace storage id, if an alternative one was registered
if (isset($this->import_mapId['sys_file_storage'][$fileRecord['storage']])) { if (isset($this->import_mapId['sys_file_storage'][$fileRecord['storage']])) {
$fileRecord['storage'] = $this->import_mapId['sys_file_storage'][$fileRecord['storage']]; $fileRecord['storage'] = $this->import_mapId['sys_file_storage'][$fileRecord['storage']];
$useStorageFromStorageRecords = TRUE; $useStorageFromStorageRecords = TRUE;
...@@ -1697,7 +1697,7 @@ class ImportExport { ...@@ -1697,7 +1697,7 @@ class ImportExport {
$newFile = NULL; $newFile = NULL;
// check, if there is a identical file // check, if there is an identical file
try { try {
if ($storage->hasFile($fileRecord['identifier'])) { if ($storage->hasFile($fileRecord['identifier'])) {
$file = $storage->getFile($fileRecord['identifier']); $file = $storage->getFile($fileRecord['identifier']);
...@@ -1746,7 +1746,7 @@ class ImportExport { ...@@ -1746,7 +1746,7 @@ class ImportExport {
} }
// unset the sys_file records to prevent a import in writeRecords_records // unset the sys_file records to prevent an import in writeRecords_records
unset($this->dat['header']['records']['sys_file']); unset($this->dat['header']['records']['sys_file']);
} }
...@@ -3893,7 +3893,7 @@ class ImportExport { ...@@ -3893,7 +3893,7 @@ class ImportExport {
public function checkDokType($checkTable, $doktype) { public function checkDokType($checkTable, $doktype) {
$allowedTableList = isset($GLOBALS['PAGES_TYPES'][$doktype]['allowedTables']) ? $GLOBALS['PAGES_TYPES'][$doktype]['allowedTables'] : $GLOBALS['PAGES_TYPES']['default']['allowedTables']; $allowedTableList = isset($GLOBALS['PAGES_TYPES'][$doktype]['allowedTables']) ? $GLOBALS['PAGES_TYPES'][$doktype]['allowedTables'] : $GLOBALS['PAGES_TYPES']['default']['allowedTables'];
$allowedArray = GeneralUtility::trimExplode(',', $allowedTableList, TRUE); $allowedArray = GeneralUtility::trimExplode(',', $allowedTableList, TRUE);
// If all tables or the table is listed as a allowed type, return TRUE // If all tables or the table is listed as an allowed type, return TRUE
if (strstr($allowedTableList, '*') || in_array($checkTable, $allowedArray)) { if (strstr($allowedTableList, '*') || in_array($checkTable, $allowedArray)) {
return TRUE; return TRUE;
} }
......
...@@ -34,7 +34,7 @@ class StepController extends AbstractController { ...@@ -34,7 +34,7 @@ class StepController extends AbstractController {
); );
/** /**
* Index action acts a a dispatcher to different steps * Index action acts as a dispatcher to different steps
* *
* Warning: Order of these methods is security relevant and interferes with different access * Warning: Order of these methods is security relevant and interferes with different access
* conditions (new/existing installation). See the single method comments for details. * conditions (new/existing installation). See the single method comments for details.
......
...@@ -33,7 +33,7 @@ class Application implements ApplicationInterface { ...@@ -33,7 +33,7 @@ class Application implements ApplicationInterface {
protected $entryPointPath = 'typo3/sysext/install/Start/'; protected $entryPointPath = 'typo3/sysext/install/Start/';
/** /**
* All available request handlers that can handle a install tool request * All available request handlers that can handle an install tool request
* @var array * @var array
*/ */
protected $availableRequestHandlers = array( protected $availableRequestHandlers = array(
......
...@@ -535,7 +535,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList { ...@@ -535,7 +535,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
// single table view // single table view
$rowOutput = ''; $rowOutput = '';
if (!$listOnlyInSingleTableMode && (!$tableCollapsed || $this->table)) { if (!$listOnlyInSingleTableMode && (!$tableCollapsed || $this->table)) {
// Fixing a order table for sortby tables // Fixing an order table for sortby tables
$this->currentTable = array(); $this->currentTable = array();
$currentIdList = array(); $currentIdList = array();
$doSort = $GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$this->sortField; $doSort = $GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$this->sortField;
...@@ -1920,4 +1920,4 @@ class DatabaseRecordList extends AbstractDatabaseRecordList { ...@@ -1920,4 +1920,4 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
return $GLOBALS['TBE_TEMPLATE']; return $GLOBALS['TBE_TEMPLATE'];
} }
} }
\ No newline at end of file
...@@ -60,7 +60,7 @@ class SecurityStatus implements \TYPO3\CMS\Reports\StatusProviderInterface { ...@@ -60,7 +60,7 @@ class SecurityStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
} }
/** /**
* Checks whether a an BE user account named admin with default password exists. * Checks whether a BE user account named admin with default password exists.
* *
* @return \TYPO3\CMS\Reports\Status An object representing whether a default admin account exists * @return \TYPO3\CMS\Reports\Status An object representing whether a default admin account exists
*/ */
......
...@@ -56,7 +56,7 @@ abstract class AbstractBackend { ...@@ -56,7 +56,7 @@ abstract class AbstractBackend {
* *
* @param string $privateKey The private key (obtained from a call to createNewKeyPair()) * @param string $privateKey The private key (obtained from a call to createNewKeyPair())
* @param string $data Data to decrypt (base64-encoded) * @param string $data Data to decrypt (base64-encoded)
* @return string Decrypted data or NULL in case of a error * @return string Decrypted data or NULL in case of an error
*/ */
abstract public function decrypt($privateKey, $data); abstract public function decrypt($privateKey, $data);
...@@ -68,9 +68,9 @@ abstract class AbstractBackend { ...@@ -68,9 +68,9 @@ abstract class AbstractBackend {
abstract public function isAvailable(); abstract public function isAvailable();
/** /**
* Retrieves a error message. * Retrieves an error message.
* *
* @return string A error message or empty string if there were no error * @return string An error message or empty string if there were no error
*/ */
public function getLastError() { public function getLastError() {
return $this->error; return $this->error;
......
...@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; ...@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\CommandUtility; use TYPO3\CMS\Core\Utility\CommandUtility;
/** /**
* This class contains a OpenSSL backend for the TYPO3 RSA authentication * This class contains an OpenSSL backend for the TYPO3 RSA authentication
* service. It uses shell version of OpenSSL to perform tasks. See class * service. It uses shell version of OpenSSL to perform tasks. See class
* \TYPO3\CMS\Rsaauth\Backend\AbstractBackend for the information on using backends. * \TYPO3\CMS\Rsaauth\Backend\AbstractBackend for the information on using backends.
*/ */
...@@ -122,7 +122,7 @@ class CommandLineBackend extends AbstractBackend { ...@@ -122,7 +122,7 @@ class CommandLineBackend extends AbstractBackend {
/** /**
* @param string $privateKey The private key (obtained from a call to createNewKeyPair()) * @param string $privateKey The private key (obtained from a call to createNewKeyPair())
* @param string $data Data to decrypt (base64-encoded) * @param string $data Data to decrypt (base64-encoded)
* @return string Decrypted data or NULL in case of a error * @return string Decrypted data or NULL in case of an error
* @see \TYPO3\CMS\Rsaauth\Backend\AbstractBackend::decrypt() * @see \TYPO3\CMS\Rsaauth\Backend\AbstractBackend::decrypt()
*/ */
public function decrypt($privateKey, $data) { public function decrypt($privateKey, $data) {
......
...@@ -69,7 +69,7 @@ class PhpBackend extends AbstractBackend { ...@@ -69,7 +69,7 @@ class PhpBackend extends AbstractBackend {
* *
* @param string $privateKey The private key (obtained from a call to createNewKeyPair()) * @param string $privateKey The private key (obtained from a call to createNewKeyPair())
* @param string $data Data to decrypt (base64-encoded) * @param string $data Data to decrypt (base64-encoded)
* @return string|NULL Decrypted data or NULL in case of a error * @return string|NULL Decrypted data or NULL in case of an error
* @see \TYPO3\CMS\Rsaauth\Backend\AbstractBackend::decrypt() * @see \TYPO3\CMS\Rsaauth\Backend\AbstractBackend::decrypt()
*/ */
public function decrypt($privateKey, $data) { public function decrypt($privateKey, $data) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment