--- loncom/localize/lonlocal.pm	2003/09/29 13:24:49	1.16
+++ 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.16 2003/09/29 13:24:49 www Exp $
+# $Id: lonlocal.pm,v 1.26 2003/11/07 23:22:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,9 +169,7 @@ use POSIX qw(locale_h);
 require Exporter;
 
 our @ISA = qw (Exporter);
-our @EXPORT = qw(mt);
-
-my $reroute;
+our @EXPORT = qw(mt mtn ns);
 
 # ========================================================= The language handle
 
@@ -180,38 +178,24 @@ use vars qw($lh);
 # ===================================================== The "MakeText" function
 
 sub mt (@) {
-    unless ($ENV{'environment.translator'}) {
-	if ($lh) {
-	    return $lh->maketext(@_);
-	} else {
-	    return @_;
-	}
+#    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
+#    print $fh @_[0]."\n";
+#    $fh->close();
+    if ($lh) {
+	return $lh->maketext(@_);
     } else {
-	if ($lh) {
-	    my $trans=$lh->maketext(@_);
-	    my $link='<a target="trans" href="/cgi-bin/translator.pl?arg1='.
-		&Apache::lonnet::escape($_[0]).'&arg2='.
-		&Apache::lonnet::escape($_[1]).'&arg3='.
-		&Apache::lonnet::escape($_[2]).'&lang='.
-		$ENV{'environment.translator'}.
-		'">[['.$trans.']]</a>';
-	    if ($ENV{'transreroute'}) {
-		$reroute.=$link;
-		return $trans;
-	    } else {
-		return $link;
-	    }
-	} else {
-	    return @_;
-	}
+	return @_;
     }
 }
 
 # ============================================================== What language?
 
 sub current_language {
-    my $lang=$lh->maketext('language_code');
-    return ($lang eq 'language_code'?'en':$lang);
+    if ($lh) {
+	my $lang=$lh->maketext('language_code');
+	return ($lang eq 'language_code'?'en':$lang);
+    }
+    return 'en';
 }
 
 # ============================================================== What encoding?
@@ -246,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)
 
@@ -280,6 +242,81 @@ sub get_language_handle {
 ###    setlocale(LC_ALL,&current_locale);
 }
 
+# ========================================================== Localize localtime
+
+sub locallocaltime {
+    my $thistime=shift;
+    if ((&current_language=~/^en/) || (!$lh)) {
+	return ''.localtime($thistime);
+    } else {
+	my $format=$lh->maketext('date_locale');
+	if ($format eq 'date_locale') {
+	    return ''.localtime($thistime);
+	}
+	my ($seconds,$minutes,$twentyfour,$day,$mon,$year,$wday,$yday,$isdst)=
+	    localtime($thistime);
+	my $month=(split(/\,/,$lh->maketext('date_months')))[$mon];
+	my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];
+	if ($seconds<10) {
+	    $seconds='0'.$seconds;
+	}
+	if ($minutes<10) {
+	    $minutes='0'.$minutes;
+	}
+	$year+=1900;
+	my $twelve=$twentyfour;
+	my $ampm;
+	if ($twelve>12) {
+	    $twelve-=12;
+	    $ampm=$lh->maketext('date_pm');
+	} else {
+	    $ampm=$lh->maketext('date_am');
+	}
+	foreach 
+	('seconds','minutes','twentyfour','twelve','day','year',
+	 'month','weekday','ampm') {
+	    $format=~s/\$$_/eval('$'.$_)/gse;
+	}
+	return $format;
+    }
+}
+
+# ==================== Normalize string (reduce fragility in the lexicon files)
+
+# This normalizes a string to reduce fragility in the lexicon files of
+# huge messages (such as are used by the helper), and allow useful
+# formatting: reduce all consecutive whitespace to a single space,
+# and remove all HTML
+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__