--- loncom/interface/lonmenu.pm	2003/09/09 18:46:28	1.87
+++ loncom/interface/lonmenu.pm	2003/09/17 01:45:14	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.87 2003/09/09 18:46:28 www Exp $
+# $Id: lonmenu.pm,v 1.88 2003/09/17 01:45:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,15 +44,29 @@ use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon;
 use Apache::File;
+use Apache::lonlocal;
+
 use vars qw(@desklines $readdesk);
+
+
 my @inlineremote;
 my $font;
 my $tabbg;
 my $pgbg;
 
+# ================================================================ Little texts
+
+sub initlittle {
+    return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
+				       'nav' => 'Navigate Contents',
+				       'main' => 'Main Menu',
+				       'launch' => 'Launch Remote Control');
+}
+
 # ============================= This gets called at the top of the body section
 
 sub menubuttons {
+    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
@@ -62,16 +76,17 @@ sub menubuttons {
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only
+	my %lt=&initlittle();
         if ($ENV{'request.course.id'}) {
 	    $navmaps=(<<ENDNAV);
-<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
          ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
 ENDRELOAD
             }
         }
@@ -79,7 +94,7 @@ ENDRELOAD
 <script>
 // BEGIN LON-CAPA Internal
 </script>
-<a href="/adm/menu" target="_top">Main Menu</a>
+<a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />
 <script>
 // END LON-CAPA Internal
@@ -90,6 +105,7 @@ ENDMAINMENU
     } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off
 # figure out colors
+	my %lt=&initlittle();
 	my $function='student';
         if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
 	    $function='coordinator';
@@ -113,7 +129,7 @@ ENDMAINMENU
         if ($ENV{'request.course.id'}) {
 	    $navmaps=(<<ENDNAVREM);
 <td bgcolor="$tabbg">
-<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAVREM
             if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
                 ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
@@ -121,7 +137,7 @@ ENDNAVREM
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
 ENDRELOAD
             }
         }
@@ -129,6 +145,7 @@ ENDRELOAD
         if ($registration) {
            $reg=&innerregister($forcereg,$target);
         }
+	    my $trans=&Apache::lonlocal::endreroutetrans();
 	return (<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
@@ -136,18 +153,19 @@ ENDRELOAD
 <table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
 <tr>
 <td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>
+<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
 </td>
 $reloadlink
 $navmaps
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&url=$escurl" target="_top">
-<font color="$font">Launch Remote Control</font></a></td>
+<font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
 <b>LON-CAPA</b></td>
 </tr>
 </table>
+$trans
 <script>
 // END LON-CAPA Internal
 </script>
@@ -610,6 +628,9 @@ sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
+    $top=&mt($top);
+    $bot=&mt($bot);
+    $desc=&mt($desc);
     unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {
 # Remote