--- loncom/interface/lonmenu.pm	2003/09/17 01:45:14	1.88
+++ loncom/interface/lonmenu.pm	2003/09/17 16:50:58	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.88 2003/09/17 01:45:14 www Exp $
+# $Id: lonmenu.pm,v 1.89 2003/09/17 16:50:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,7 +145,6 @@ ENDRELOAD
         if ($registration) {
            $reg=&innerregister($forcereg,$target);
         }
-	    my $trans=&Apache::lonlocal::endreroutetrans();
 	return (<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
@@ -165,7 +164,6 @@ $navmaps
 <b>LON-CAPA</b></td>
 </tr>
 </table>
-$trans
 <script>
 // END LON-CAPA Internal
 </script>
@@ -179,6 +177,7 @@ ENDINLINEMENU
 # ====================================== This gets called in the header section
 
 sub registerurl {
+    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
@@ -212,6 +211,7 @@ sub registerurl {
 # =========== and in the body of the document
 
 sub innerregister {
+    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
@@ -879,6 +879,8 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
+    &Apache::lonlocal::clearreroutetrans();
+
     my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
     my $function='student';
@@ -911,6 +913,7 @@ $utility
 $bodytag
 ENDHEADER
     $r->print('<table>'.&inlinemenu().'</table>'.$form);
+    $r->print(&Apache::lonlocal::endreroutetrans());
     $r->print('</body></html>');
     return OK;
 }