Skip to content

Commit

Permalink
[4.3] Inclusive Naming master (various)
Browse files Browse the repository at this point in the history
We should be using inclusive naming throughout the cms not just in the language strings.

Changes "master" to "main" or "source" as appropriate,

### Rationale
https://inclusivenaming.org/word-lists/tier-1/_master/

### 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
  • Loading branch information
brianteeman committed Jun 23, 2023
1 parent 6bcc444 commit 5e60d92
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public function getItems()
return false;
}

// Second pass: collect the group counts into the master items array.
// Second pass: collect the group counts into the main items array.
foreach ($items as &$item) {
if (isset($userGroups[$item->id])) {
$item->group_count = $userGroups[$item->id]->group_count;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ $form-select-multiple-padding-y: .3rem !default;

$form-range-thumb-active-bg: tint-color($standard-color-primary, 70%) !default;

// Z-index master list
// Z-index source list
$zindex-negative: -1 !default;
$zindex-actions: auto !default;
$zindex-toolbar: 1000 !default;
Expand Down
2 changes: 1 addition & 1 deletion components/com_content/src/Model/ArchiveModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function populateState($ordering = null, $direction = null)
}

/**
* Get the master query for retrieving a list of articles subject to the model state.
* Get the main query for retrieving a list of articles subject to the model state.
*
* @return \Joomla\Database\DatabaseQuery
*
Expand Down
2 changes: 1 addition & 1 deletion plugins/extension/joomla/src/Extension/Joomla.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// phpcs:enable PSR1.Files.SideEffects

/**
* Joomla! master extension plugin.
* Joomla! main extension plugin.
*
* @since 1.6
*/
Expand Down

0 comments on commit 5e60d92

Please sign in to comment.