Skip to content

Commit 912c352

Browse files
authored
[4.4] Inclusive Naming abort (comments) (#41025)
We should be using inclusive naming throughout the cms not just in the language strings. Changes "abort" to "stop" or "cancel" as appropriate, ### Rationale https://inclusivenaming.org/word-lists/tier-1/abort/ ### Test Code review Only ### Documentation New page will be added to manual.joomla.org shortly ### Note This is part of a series of pull requests that are submitted separately to make reviewing easier
1 parent e0f8e29 commit 912c352

File tree

14 files changed

+16
-16
lines changed

14 files changed

+16
-16
lines changed

administrator/components/com_joomlaupdate/src/Controller/UpdateController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function download()
6060
$message = null;
6161
$messageType = null;
6262

63-
// The validation was not successful so abort.
63+
// The validation was not successful so stop.
6464
if ($result['check'] === false) {
6565
$message = Text::_('COM_JOOMLAUPDATE_VIEW_UPDATE_CHECKSUM_WRONG');
6666
$messageType = 'error';

administrator/components/com_users/src/Model/MethodsModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function deleteAll(?User $user = null): void
9595
$user = Factory::getApplication()->getIdentity() ?: $this->getCurrentUser();
9696
}
9797

98-
// If the user object is a guest (who can't have MFA) we abort with an error
98+
// If the user object is a guest (who can't have MFA) we stop with an error
9999
if ($user->guest) {
100100
throw new RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
101101
}

build/media_source/plg_installer_webinstaller/js/client.es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ customElements.whenDefined('joomla-tab').then(() => {
404404
const installerTabs = document.getElementById('myTab');
405405
const link = installerTabs.querySelector('button[aria-controls=web]');
406406

407-
// Abort if the IFW tab cannot be found
407+
// Stop if the IFW tab cannot be found
408408
if (!link) {
409409
return;
410410
}

build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
event.preventDefault();
515515
}
516516

517-
// Escape is the abort keystroke (for any target element)
517+
// Escape is the cancel keystroke (for any target element)
518518
if (event.keyCode === KEYCODE.ESC && item) {
519519
item.setAttribute('draggable', 'false');
520520
item.setAttribute('aria-grabbed', 'false');
@@ -573,7 +573,7 @@
573573
switchRowPositions(item, row);
574574
});
575575

576-
// dragend event to clean-up after drop or abort
576+
// dragend event to clean-up after drop or cancelation
577577
// which fires whether or not the drop target was valid
578578
this.addEventListener('dragend', () => {
579579
if (item) {

libraries/src/Application/CMSApplication.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ function ($systemVariable) use ($input) {
269269
$input->set($systemVariable, null);
270270
}
271271

272-
// Abort when there are invalid variables
272+
// Stop when there are invalid variables
273273
if ($invalidInputVariables) {
274274
throw new \RuntimeException('Invalid input, aborting application.');
275275
}

libraries/src/Console/FinderIndexCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private function purge()
317317
// Attempt to purge the index.
318318
$return = $model->purge();
319319

320-
// If unsuccessful then abort.
320+
// If unsuccessful then stop.
321321
if (!$return) {
322322
$message = Text::_('FINDER_CLI_INDEX_PURGE_FAILED', $model->getError());
323323
$this->ioStyle->error($message);

libraries/src/Dispatcher/AbstractModuleDispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function dispatch()
6262

6363
$displayData = $this->getLayoutData();
6464

65-
// Abort when display data is false
65+
// Stop when display data is false
6666
if ($displayData === false) {
6767
return;
6868
}
@@ -94,7 +94,7 @@ public function dispatch()
9494
* Returns the layout data. This function can be overridden by subclasses to add more
9595
* attributes for the layout.
9696
*
97-
* If false is returned, then it means that the dispatch process should be aborted.
97+
* If false is returned, then it means that the dispatch process should be stopped.
9898
*
9999
* @return array|false
100100
*

libraries/src/Installer/Adapter/LibraryAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function checkExtensionInFilesystem()
5959
// From this point we'll consider this an update
6060
$this->setRoute('update');
6161
} else {
62-
// Abort the install, no upgrade possible
62+
// Stop the install, no upgrade possible
6363
throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED'));
6464
}
6565
}

libraries/src/Schema/ChangeSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public function getSchema()
232232
{
233233
$updateFiles = $this->getUpdateFiles();
234234

235-
// No schema files found - abort and return empty string
235+
// No schema files found - stop and return empty string
236236
if (empty($updateFiles)) {
237237
return '';
238238
}

libraries/src/Table/ContentType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function getContentTable()
145145
$class = $tableInfo->special->class ?? 'Joomla\\CMS\\Table\\Table';
146146

147147
if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
148-
// This isn't an instance of TableInterface. Abort.
148+
// This isn't an instance of TableInterface. Stop.
149149
throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
150150
}
151151

0 commit comments

Comments
 (0)