Make WordPress Core


Ignore:
Timestamp:
06/27/2025 03:07:29 PM (4 months ago)
Author:
johnbillion
Message:

Networks and Sites: Correct and improve terminology relating to deactivated, deleted, and archived sites on a Multisite installation.

  • Deleting a site is permanent action, so the terminology around site deletion has been updated to reflect that.
  • Site deactivation has been renamed to "Flag for Deletion", and a site with this status is no longer incorrectly shown as "Deleted".
  • Extra helper text has been added to the screen shown when changing a site's status to make the effects clearer to Super Admins.

Props kawauso, ryan_b, wonderboymusic, nacin, DrewAPicture, martythornley, SergeyBiryukov, jeremyfelt, ideag, jorbin, sukhendu2002, johnbillion, realloc.

Fixes #15801

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

    r60069 r60358  
    3838            'archived' => array( 'site-archived', __( 'Archived' ) ),
    3939            'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
    40             'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
     40            'deleted'  => array( 'site-deleted', __( 'Flagged for Deletion' ) ),
    4141            'mature'   => array( 'site-mature', __( 'Mature' ) ),
    4242        );
     
    257257            /* translators: %s: Number of sites. */
    258258            'deleted'  => _n_noop(
    259                 'Deleted <span class="count">(%s)</span>',
    260                 'Deleted <span class="count">(%s)</span>'
     259                'Flagged for Deletion <span class="count">(%s)</span>',
     260                'Flagged for Deletion <span class="count">(%s)</span>'
    261261            ),
    262262        );
     
    668668         *
    669669         * @param string[] $site_states An array of site states. Default 'Main',
    670          *                              'Archived', 'Mature', 'Spam', 'Deleted'.
     670         *                              'Archived', 'Mature', 'Spam', 'Flagged for Deletion'.
    671671         * @param WP_Site  $site        The current site object.
    672672         */
     
    759759                        )
    760760                    ),
    761                     _x( 'Activate', 'site' )
     761                    _x( 'Remove Deletion Flag', 'site' )
    762762                );
    763763            } else {
     
    770770                        )
    771771                    ),
    772                     __( 'Deactivate' )
     772                    __( 'Flag for Deletion' )
    773773                );
    774774            }
     
    831831                        )
    832832                    ),
    833                     __( 'Delete' )
     833                    __( 'Delete Permanently' )
    834834                );
    835835            }
     
    845845         * Filters the action links displayed for each site in the Sites list table.
    846846         *
    847          * The 'Edit', 'Dashboard', 'Delete', and 'Visit' links are displayed by
     847         * The 'Edit', 'Dashboard', 'Delete Permanently', and 'Visit' links are displayed by
    848848         * default for each site. The site's status determines whether to show the
    849          * 'Activate' or 'Deactivate' link, 'Unarchive' or 'Archive' links, and
     849         * 'Remove Deletion Flag' or 'Flag for Deletion' link, 'Unarchive' or 'Archive' links, and
    850850         * 'Not Spam' or 'Spam' link for each site.
    851851         *
Note: See TracChangeset for help on using the changeset viewer.