--- loncom/interface/resetpw.pm	2007/03/07 15:59:31	1.5
+++ loncom/interface/resetpw.pm	2008/01/25 16:46:50	1.8
@@ -58,12 +58,12 @@ sub handler {
     my $uname = &unescape($env{'form.uname'});
     my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};
-    $r->print(&mt('<h3>Reset forgotten LON-CAPA password</h3>'));
+    $r->print(&mt('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>'));
     my $output;
     if ($token) {
         $output = &reset_passwd($r,$token,$contact_name,$contact_email);
     } elsif ($uname && $udom) {
-        my $domdesc = $Apache::lonnet::domaindescription{$udom};
+        my $domdesc = &Apache::lonnet::domain($udom,'description');
         my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom);
         if ($authtype =~ /^internal/) {
             my $useremail = $env{'form.useremail'};
@@ -122,7 +122,11 @@ sub get_uname {
                                          proc => 'Proceed');
 
     my $msg = &mt('If you use the same account for other campus services besides LON-CAPA, (e.g., e-mail, course registration, etc.), a separate centrally managed mechanism likely exists to reset a password.  However, if your account is used for just LON-CAPA access you will probably be able to reset a password from this page.');
-    $msg .= '<br /><br />'.&mt('Three conditions must be met:<ul><li>An e-mail address must have previously been associated with your LON-CAPA username.</li><li>You must be able to access e-mail sent to that address.</li><li>Your account must be of a type for which LON-CAPA can reset a password.</ul>');
+    $msg .= '<br /><br />'.&mt('Three conditions must be met:')
+           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
+           .'<li>'.&mt('You must be able to access e-mail sent to that address.').'</li>'
+           .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')
+           .'</ul>';
     $msg .= qq|
 <form name="forgotpw" method="post">
 <table>
@@ -170,7 +174,7 @@ sub send_token {
         if ($result eq 'ok') {
             $msg .= &mt("An e-mail message 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.");
         } else {
-            $msg .= ("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
+            $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
         }
     } else {
         $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
@@ -201,7 +205,8 @@ sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email) = @_;
     my $msg;
     if ($error eq 'invalid') {
-        $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc).&mt(' Please <a href="javascript:history.go(-1)"><u>go back</u></a> and try again.');
+        $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
+              .' '.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');
     } else {
         if ($error eq 'baduseremail') {
             $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
@@ -214,9 +219,10 @@ sub invalid_state {
         }
         if ($contact_email ne '') {
             my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
-            $msg .= '<br />'.&mt(' You may wish to contact the <a href="/adm/helpdesk?origurl=[_1]">LON-CAPA helpdesk</a> for the [_2] domain.',$escuri,$domdesc);
+            $msg .= '<br /> '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.'
+                                 ,'<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);
         } else {
-            $msg .= '<br />'.&mt(' You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
+            $msg .= '<br /> '.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
         }
     }
     return $msg;
@@ -245,7 +251,7 @@ sub reset_passwd {
                     my $delete = &Apache::lonnet::tmpdel($token);
                     my $now = localtime(time);
                     my $domdesc = 
-                        $Apache::lonnet::domaindescription{$data{'domain'}};
+			&Apache::lonnet::domain($data{'domain'},'description');
                     my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);