--- loncom/interface/resetpw.pm 2013/07/19 16:17:07 1.33 +++ loncom/interface/resetpw.pm 2013/08/17 00:34:29 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network # Allow access to password changing via a token sent to user's e-mail. # -# $Id: resetpw.pm,v 1.33 2013/07/19 16:17:07 bisitz Exp $ +# $Id: resetpw.pm,v 1.36 2013/08/17 00:34:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -225,7 +225,10 @@ sub send_token { my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name, $contact_email); if ($result eq 'ok') { - $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours."); + $msg .= + &mt('An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.') + .'<br /><br />' + .&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>'); } else { $msg .= '<p class="LC_error">' @@ -233,7 +236,6 @@ sub send_token { .' associated with your LON-CAPA account.') .'</p>' .&display_actions($contact_email,$domdesc); - } } else { $msg .= @@ -395,7 +397,7 @@ sub generic_failure_msg { '<p class="LC_error">' .&mt('A problem occurred when attempting to reset the password for your account.') .'<br />' - .&mt('Please contact the [_1] - ([_2]) for assistance.', + .&mt('Please contact the [_1] ([_2]) for assistance.', $contact_name,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>') .'</p>'; }