- Patch #538526 by catch, Gábor Hojtsy, yoroy, et al: rename 'User management' to 'People' in the header -- not anywhere else.

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index ae21574ce..39ea46abe 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1314,19 +1314,19 @@ function user_menu() {
   );
 
   // User administration pages.
-  $items['admin/user'] = array(
-    'title' => 'Users',
+  $items['admin/people'] = array(
+    'title' => 'People',
     'page callback' => 'user_admin',
     'page arguments' => array('list'),
     'access arguments' => array('administer users'),
     'weight' => -4,
   );
-  $items['admin/user/list'] = array(
+  $items['admin/people/list'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/user/create'] = array(
+  $items['admin/people/create'] = array(
     'title' => 'Add user',
     'page arguments' => array('create'),
     'access arguments' => array('administer users'),
@@ -2376,7 +2376,7 @@ function user_multiple_cancel_confirm(&$form_state) {
 
   return confirm_form($form,
                       t('Are you sure you want to cancel these user accounts?'),
-                      'admin/user', t('This action cannot be undone.'),
+                      'admin/people', t('This action cannot be undone.'),
                       t('Cancel accounts'), t('Cancel'));
 }
 
@@ -2403,7 +2403,7 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) {
       }
     }
   }
-  $form_state['redirect'] = 'admin/user';
+  $form_state['redirect'] = 'admin/people';
   return;
 }
 
@@ -2420,7 +2420,7 @@ function user_help($path, $arg) {
       $output .= '<p>' . t('A visitor accessing your website is assigned a unique ID, or session ID, which is stored in a cookie. The cookie does not contain personal information, but acts as a key to retrieve information from your site. Users should have cookies enabled in their web browser when using your site.') . '</p>';
       $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@user">User module</a>.', array('@user' => 'http://drupal.org/handbook/modules/user/')) . '</p>';
       return $output;
-    case 'admin/user/create':
+    case 'admin/people/create':
       return '<p>' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '</p>';
     case 'admin/settings/permissions':
       return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site.  You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/settings/roles'), '@settings' => url('admin/settings/user'))) . '</p>';
@@ -2430,7 +2430,7 @@ function user_help($path, $arg) {
       <li>Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.</li>
       <li>Authenticated user: this role is automatically granted to all logged in users.</li>
       </ul>', array('@permissions' => url('admin/settings/permissions')));
-    case 'admin/user/search':
+    case 'admin/people/search':
       return '<p>' . t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username or e-mail address. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda@example.com".') . '</p>';
   }
 }
@@ -2929,7 +2929,7 @@ function user_register() {
      '#title' => t('Notify user of new account')
     );
     // Redirect back to page which initiated the create request;
-    // usually admin/user/create.
+    // usually admin/people/create.
     $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
   }