--- loncom/localize/lonlocal.pm	2003/10/08 18:08:16	1.21
+++ loncom/localize/lonlocal.pm	2003/10/11 14:06:01	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.21 2003/10/08 18:08:16 www Exp $
+# $Id: lonlocal.pm,v 1.24 2003/10/11 14:06:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,7 +169,7 @@ use POSIX qw(locale_h);
 require Exporter;
 
 our @ISA = qw (Exporter);
-our @EXPORT = qw(mt);
+our @EXPORT = qw(mt mtn ns);
 
 my $reroute;
 
@@ -180,6 +180,9 @@ use vars qw($lh);
 # ===================================================== The "MakeText" function
 
 sub mt (@) {
+#    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
+#    print $fh join('',@_)."\n";
+#    $fh->close();
     unless ($ENV{'environment.translator'}) {
 	if ($lh) {
 	    return $lh->maketext(@_);
@@ -207,6 +210,20 @@ sub mt (@) {
     }
 }
 
+# ================================================================ The <mt> tag
+
+BEGIN {
+}
+
+sub start_mt {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    return &mt(&Apache::lonxml::get_all_text("/mt",$parser));
+}
+
+sub end_mt {
+    return '';
+}
+
 # ============================================================== What language?
 
 sub current_language {
@@ -280,6 +297,7 @@ sub get_language_handle {
     if (&Apache::lonnet::mod_perl_version == 1) {
 	$r->content_languages([&current_language()]);
     }
+    &Apache::lonxml::register('Apache::lonlocal',('mt'));
 ###    setlocale(LC_ALL,&current_locale);
 }
 
@@ -332,8 +350,32 @@ sub normalize_string {
     my $s = shift;
     $s =~ s/\s+/ /g;
     $s =~ s/<[^>]+>//g;
+    # Pop off beginning or ending spaces, which aren't good
+    $s =~ s/^\s+//;
+    $s =~ s/\s+$//;
     return $s;
 }
+
+# alias for normalize_string; recommend using it only in the lexicon
+sub ns {
+    return normalize_string(@_);
+}
+
+# mtn: call the mt function and the normalization function easily.
+# Returns original non-normalized string if there was no translation
+sub mtn (@) {
+    my @args = @_; # don't want to modify caller's string; if we
+		   # didn't care about that we could set $_[0]
+		   # directly
+    $args[0] = normalize_string($args[0]);
+    my $translation = &mt(@args);
+    if ($translation ne $args[0]) {
+	return $translation;
+    } else {
+	return $_[0];
+    }
+}
+
 1;
 
 __END__