--- loncom/localize/lonlocal.pm	2003/10/04 20:49:40	1.19
+++ loncom/localize/lonlocal.pm	2006/04/07 22:03:55	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.19 2003/10/04 20:49:40 www Exp $
+# $Id: lonlocal.pm,v 1.38 2006/04/07 22:03:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,16 +162,13 @@ package Apache::lonlocal;
 
 use strict;
 use Apache::localize;
-use Apache::File;
 use locale;
 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,29 +177,16 @@ use vars qw($lh);
 # ===================================================== The "MakeText" function
 
 sub mt (@) {
-    unless ($ENV{'environment.translator'}) {
-	if ($lh) {
-	    return $lh->maketext(@_);
-	} else {
-	    return @_;
-	}
+#    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
+#    print LOG (@_[0]."\n");
+#    close(LOG);
+    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 {
+	if (wantarray) {
 	    return @_;
+	} else {
+	    return $_[0];
 	}
     }
 }
@@ -210,18 +194,26 @@ sub mt (@) {
 # ============================================================== 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?
 
 sub current_encoding {
+    my $default='UTF-8';
+    if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
+	$Apache::lonnet::env{'browser.type'} eq 'explorer') {
+        $default='ISO-8859-1';
+    }
     if ($lh) {
 	my $enc=$lh->maketext('char_encoding');
-	return ($enc eq 'char_encoding'?'':$enc);
+	return ($enc eq 'char_encoding'?$default:$enc);
     } else {
-	return undef;
+	return $default;
     }
 }
 
@@ -246,46 +238,33 @@ 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)
 
 sub get_language_handle {
     my $r=shift;
-    $lh=Apache::localize->get_handle(&Apache::loncommon::preferred_languages);
-    if (&Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
+	my $headers=$r->headers_in;
+	$ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
+    }
+    my @languages=&Apache::loncommon::preferred_languages;
+    $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
+    $lh=Apache::localize->get_handle(@languages);
+    if ($r) {
 	$r->content_languages([&current_language()]);
     }
 ###    setlocale(LC_ALL,&current_locale);
 }
 
 # ========================================================== Localize localtime
+sub gettimezone {
+    return ' ('.$Apache::lonnet::env{'server.timezone'}.')';
+}
 
 sub locallocaltime {
     my $thistime=shift;
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime);
+	return ''.localtime($thistime).&gettimezone();
     } else {
 	my $format=$lh->maketext('date_locale');
 	if ($format eq 'date_locale') {
@@ -315,7 +294,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone();
     }
 }
 
@@ -329,8 +308,39 @@ 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];
+    }
+}
+
+# ---------------------------------------------------- Replace MT{...} in files
+
+sub transstatic {
+    my $strptr=shift;
+    $$strptr=~s/MT\{([^\}]*)\}/&mt($1)/gse;
+}
+
 1;
 
 __END__