Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

56076 Fix UI inconsistency to always refer to the site as Deactivated #4476

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

56076 Fix UI inconsistency to always refer to the site as Deactivated #4476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1fe55
56076 Fix UI inconsitency to always refer to the site as Deactivated
ideag May 19, 2023
63be468
Merge branch 'WordPress:trunk' into 56076-Incorrect-Status-when-deact…
ideag Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/wp-admin/includes/class-wp-ms-sites-list-table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct( $args = array() ) {
$this->status_list = array(
'archived' => array( 'site-archived', __( 'Archived' ) ),
'spam' => array( 'site-spammed', _x( 'Spam', 'site' ) ),
'deleted' => array( 'site-deleted', __( 'Deleted' ) ),
'deleted' => array( 'site-deleted', __( 'Deactivated' ) ),
'mature' => array( 'site-mature', __( 'Mature' ) ),
);

Expand Down Expand Up @@ -256,8 +256,8 @@ protected function get_views() {

/* translators: %s: Number of sites. */
'deleted' => _n_noop(
'Deleted <span class="count">(%s)</span>',
'Deleted <span class="count">(%s)</span>'
'Deactivated <span class="count">(%s)</span>',
'Deactivated <span class="count">(%s)</span>'
),
);

Expand Down Expand Up @@ -665,7 +665,7 @@ protected function site_states( $site ) {
* @since 5.3.0
*
* @param string[] $site_states An array of site states. Default 'Main',
* 'Archived', 'Mature', 'Spam', 'Deleted'.
* 'Archived', 'Mature', 'Spam', 'Deactivated'.
* @param WP_Site $site The current site object.
*/
$site_states = apply_filters( 'display_site_states', $site_states, $_site );
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/network/site-info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
if ( ! $is_main_site ) {
$attribute_fields['archived'] = __( 'Archived' );
$attribute_fields['spam'] = _x( 'Spam', 'site' );
$attribute_fields['deleted'] = __( 'Deleted' );
$attribute_fields['deleted'] = __( 'Deactivated' );
}
$attribute_fields['mature'] = __( 'Mature' );
?>
Expand Down
Loading