Changeset 27416

Timestamp:

03/05/2014 07:19:52 PM (11 years ago)

Author:

helen

Message:

Indicate that the user deletion process affects all content attributed to a given user, not just posts. props seanchayes. fixes #26709.

Location:

trunk/src/wp-admin

Files:

• network/users.php (modified) (3 diffs)
• users.php (modified) (2 diffs)

trunk/src/wp-admin/network/users.php

@@ -23 +23 @@
     ?>
     <h2><?php esc_html_e( 'Users' ); ?></h2>
-    <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
+    <p><?php _e( 'Transfer or delete content before deleting users.' ); ?></p>
     <form action="users.php?action=dodelete" method="post">
     <input type="hidden" name="dodelete" />
@@ -46 +46 @@
             if ( !empty( $blogs ) ) {
                 ?>
-                <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
+                <br /><fieldset><p><legend><?php printf( __( "What should be done with content owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
                 <?php
                 foreach ( (array) $blogs as $key => $details ) {
@@ -66 +66 @@
                             <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
                             <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-                            <?php _e( 'Delete all posts.' ); ?></label></li>
+                            <?php _e( 'Delete all content.' ); ?></label></li>
                             <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-                            <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
+                            <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
                         </ul>
                         <?php

trunk/src/wp-admin/users.php

@@ -44 +44 @@
 
 if ( is_multisite() )
-    $help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their posts. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
+    $help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
 else
-    $help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
+    $help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
 
 $help .= '</ul>';
@@ -241 +241 @@
     </ul>
 <?php if ( $go_delete ) : ?>
-    <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
+    <fieldset><p><legend><?php echo _n( 'What should be done with content owned by this user?', 'What should be done with content owned by these users?', $go_delete ); ?></legend></p>
     <ul style="list-style:none;">
         <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-        <?php _e('Delete all posts.'); ?></label></li>
+        <?php _e('Delete all content.'); ?></label></li>
         <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-        <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
+        <?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
         wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
     </ul></fieldset>