? 86287-translate-reset-password-page-rev3.patch
? 86287-translate-reset-password-page-rev4.patch
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.38
diff -u -p -r1.38 user.pages.inc
--- modules/user/user.pages.inc	25 May 2009 18:22:31 -0000	1.38
+++ modules/user/user.pages.inc	3 Jun 2009 20:34:15 -0000
@@ -78,6 +78,12 @@ function user_pass_submit($form, &$form_
 function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action = NULL) {
   global $user;
 
+  // Fetch the user's UID from the URL, then use that to determine the user's preferred language.
+  $uid = arg(2);
+  $user_language = user_preferred_language(user_load($uid));
+  $language = $user_language->language;
+
+
   // Check if the user is already logged in. The back button is often the culprit here.
   if ($user->uid) {
     drupal_set_message(t('You have already used this one-time login link. It is not necessary to use this link to login anymore. You are already logged in.'));
@@ -108,7 +114,7 @@ function user_pass_reset(&$form_state, $
           drupal_goto('user/' . $user->uid . '/edit');
         }
         else {
-          $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to login to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
+          $form['message'] = array('#markup' => '<p>' . t('This is a one-time login for %user_name and will expire on %expiration_date.', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout)), $user_language) . '</p><p>' . t('Click on this button to login to the site and change your password.', array(),  $user_language) . '</p>');
           $form['help'] = array('#markup' => '<p>' . t('This login can be used only once.') . '</p>');
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
           $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");