Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.209
diff -u -p -r1.209 locale.module
--- modules/locale/locale.module	4 Jan 2008 17:10:36 -0000	1.209
+++ modules/locale/locale.module	4 Jan 2008 21:44:45 -0000
@@ -209,7 +209,7 @@ function locale_user($type, $edit, &$use
   // admin interface or edit the user, show the language selector.
   if (variable_get('language_count', 1) > 1 && ($type == 'register' && user_access('administer users') || $type == 'form' && $category == 'account' )) {
     $languages = language_list('enabled');
-    $languages = $languages['1'];
+    $languages = $languages[1];
 
     // If the user is being created, we set the user language to the page language.
     $user_preferred_language = $user ? user_preferred_language($user) : $language;
@@ -225,12 +225,14 @@ function locale_user($type, $edit, &$use
       '#weight' => 1,
     );
 
+    // Get language negotiation settings.  
+    $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
     $form['locale']['language'] = array(
       '#type' => (count($names) <= 5 ? 'radios' : 'select'),
       '#title' => t('Language'),
       '#default_value' => $user_preferred_language->language,
       '#options' => $names,
-      '#description' => t('Sets the default site interface and e-mail language for this account.'),
+      '#description' => ($mode == LANGUAGE_NEGOTIATION_PATH) ? t('Sets the default e-mail language for this account and the preferred site interface language.') : t('Sets the default e-mail language for this account.'),
     );
     return $form;
   }