--- loncom/localize/lonlocal.pm 2003/10/11 21:06:11 1.25 +++ loncom/localize/lonlocal.pm 2003/11/07 23:22:22 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.25 2003/10/11 21:06:11 www Exp $ +# $Id: lonlocal.pm,v 1.26 2003/11/07 23:22:22 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -171,8 +171,6 @@ require Exporter; our @ISA = qw (Exporter); our @EXPORT = qw(mt mtn ns); -my $reroute; - # ========================================================= The language handle use vars qw($lh); @@ -181,32 +179,12 @@ use vars qw($lh); sub mt (@) { # my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt'); -# print $fh join('',@_)."\n"; +# print $fh @_[0]."\n"; # $fh->close(); - unless ($ENV{'environment.translator'}) { - if ($lh) { - return $lh->maketext(@_); - } else { - return @_; - } + if ($lh) { + return $lh->maketext(@_); } else { - if ($lh) { - my $trans=$lh->maketext(@_); - my $link='[['.$trans.']]'; - if ($ENV{'transreroute'}) { - $reroute.=$link; - return $trans; - } else { - return $link; - } - } else { - return @_; - } + return @_; } } @@ -252,28 +230,6 @@ sub texthash { } return %hash; } -# ======================================================== Re-route translation - -sub clearreroutetrans { - &reroutetrans(); - $reroute=''; -} - -# ======================================================== Re-route translation - -sub reroutetrans { - $ENV{'transreroute'}=1; -} - -# ==================================================== End re-route translation -sub endreroutetrans { - $ENV{'transreroute'}=0; - if ($ENV{'environment.translator'}) { - return $reroute; - } else { - return ''; - } -} # ========= Get a handle (do not invoke in vain, leave this to access handlers)