--- loncom/interface/resetpw.pm	2009/02/13 17:20:29	1.14
+++ loncom/interface/resetpw.pm	2009/04/04 21:47:41	1.16
@@ -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.14 2009/02/13 17:20:29 bisitz Exp $
+# $Id: resetpw.pm,v 1.16 2009/04/04 21:47:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -134,15 +134,15 @@ sub get_uname {
 <table>
 <tr><td>
 <tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
-    <td><input type="text" name="uname" size="15"  /> </td></tr>
+    <td><input type="text" name="uname" size="15" /></td></tr>
 <tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
     <td>|;
     $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
     $msg .= qq|</td></tr>
 <tr><td align="left">$lt{'uemail'}:                             </td>
-    <td><input type="text" name="useremail" size="30"  /></td></tr>
+    <td><input type="text" name="useremail" size="30" /></td></tr>
 <tr><td colspan="2" align="left"><br />
-    <input type="button" value="$lt{'proc'}" onClick="document.forgotpw.submit()"></td></tr>
+    <input type="submit" value="$lt{'proc'}" /></td></tr>
 </table>
 </form>
 |;
@@ -166,10 +166,9 @@ sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server,'resetpw');
     if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);
-        my $mailmsg = "A request was submitted on ".&Apache::lonlocal::locallocaltime(time)." for a reset of the ".
-             "password for your LON-CAPA account.".
-             "To complete this process please open a web browser and enter the following ".
-             "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_token";
+        my $showtime = &Apache::lonlocal::locallocaltime(time);
+        my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
+        my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime).' '.&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',$reseturl);
         my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
                                 $contact_email);
         if ($result eq 'ok') {