[LON-CAPA-cvs] cvs: loncom /localize lonlocal.pm

[bowersj2]

bowersj2		Wed Oct  8 14:21:38 2003 EDT

  Modified files:              
    /loncom/localize	lonlocal.pm 
  Log:
  Commit &mtn since lonhelper is blowing up left and right.
  
  
Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.21 loncom/localize/lonlocal.pm:1.22
--- loncom/localize/lonlocal.pm:1.21	Wed Oct  8 14:08:16 2003
+++ loncom/localize/lonlocal.pm	Wed Oct  8 14:21:38 2003
@@ -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.22 2003/10/08 18:21:38 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,7 +169,7 @@
 require Exporter;
 
 our @ISA = qw (Exporter);
-our @EXPORT = qw(mt);
+our @EXPORT = qw(mt mtn ns);
 
 my $reroute;
 
@@ -332,8 +332,32 @@
     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__