--- loncom/interface/lonnavmaps.pm	2003/09/17 18:15:54	1.229
+++ loncom/interface/lonnavmaps.pm	2003/09/22 00:48:32	1.232
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.229 2003/09/17 18:15:54 www Exp $
+# $Id: lonnavmaps.pm,v 1.232 2003/09/22 00:48:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,9 +107,9 @@ sub real_handler {
     # Handle header-only request
     if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {
-            $r->content_type('text/xml');
+            &Apache::loncommon::content_type($r,'text/xml');
         } else {
-            $r->content_type('text/html');
+            &Apache::loncommon::content_type($r,'text/html');
         }
         $r->send_http_header;
         return OK;
@@ -117,9 +117,9 @@ sub real_handler {
 
     # Send header, don't cache this page
     if ($ENV{'browser.mathml'}) {
-        $r->content_type('text/xml');
+        &Apache::loncommon::content_type($r,'text/xml');
     } else {
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
     }
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
@@ -432,7 +432,7 @@ sub timeToHumanString {
     if (!$time) {
         return &mt('never');
     }
-    unless (&Apache::loncommon::current_language()=~/^en/) {
+    unless (&Apache::lonlocal::current_language()=~/^en/) {
 	return localtime($time);
     } 
     my $now = time();
@@ -1331,15 +1331,15 @@ sub render {
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> New discussion since '.
+                '<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/feedback.gif"> New message (click to open)<p>'.
+                '<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> Discussions</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> New message (click to open)'.
+                '<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
@@ -1350,11 +1350,11 @@ sub render {
         if ($condition) {
             $result.="<a href=\"navmaps?condition=0&filter=&$queryString" .
                 "&here=" . Apache::lonnet::escape($here) .
-                "\">Close All Folders</a>";
+                "\">".&mt('Close All Folders')."</a>";
         } else {
             $result.="<a href=\"navmaps?condition=1&filter=&$queryString" .
                 "&here=" . Apache::lonnet::escape($here) . 
-                "\">Open All Folders</a>";
+                "\">".&mt('Open All Folders')."</a>";
         }
         $result .= "<br /><br />\n";
     }