--- loncom/localize/lonlocal.pm	2003/10/11 14:06:01	1.24
+++ loncom/localize/lonlocal.pm	2006/08/28 14:26:25	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.24 2003/10/11 14:06:01 www Exp $
+# $Id: lonlocal.pm,v 1.41 2006/08/28 14:26:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,17 +162,14 @@ package Apache::lonlocal;
 
 use strict;
 use Apache::localize;
-use Apache::File;
 use locale;
-use POSIX qw(locale_h);
+use POSIX qw(locale_h strftime);
 
 require Exporter;
 
 our @ISA = qw (Exporter);
 our @EXPORT = qw(mt mtn ns);
 
-my $reroute;
-
 # ========================================================= The language handle
 
 use vars qw($lh);
@@ -180,50 +177,20 @@ 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(@_);
-	} 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];
 	}
     }
 }
 
-# ================================================================ 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 {
@@ -237,11 +204,16 @@ sub current_language {
 # ============================================================== 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;
     }
 }
 
@@ -266,47 +238,37 @@ 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()]);
     }
-    &Apache::lonxml::register('Apache::lonlocal',('mt'));
 ###    setlocale(LC_ALL,&current_locale);
 }
 
 # ========================================================== Localize localtime
+sub gettimezone {
+    my ($time) = @_;
+    return ' ('.&strftime("%Z",localtime($time)).')';
+}
 
 sub locallocaltime {
     my $thistime=shift;
+    if (!defined($thistime) || $thistime eq '') {
+	return &mt('Never');
+    }
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime);
+	return ''.localtime($thistime).&gettimezone($thistime);
     } else {
 	my $format=$lh->maketext('date_locale');
 	if ($format eq 'date_locale') {
@@ -336,7 +298,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone($thistime);
     }
 }
 
@@ -376,6 +338,28 @@ sub mtn (@) {
     }
 }
 
+# ---------------------------------------------------- Replace MT{...} in files
+
+sub transstatic {
+    my $strptr=shift;
+    $$strptr=~s/MT\{([^\}]*)\}/&mt($1)/gse;
+}
+
+=pod 
+
+=item * mt_escape
+
+mt_escape takes a string reference and escape the [] in there so mt
+will leave them as is and not try to expand them
+
+=cut
+
+sub mt_escape {
+    my ($str_ref) = @_;
+    $$str_ref =~s/~/~~/g;
+    $$str_ref =~s/([\[\]])/~$1/g;
+}
+
 1;
 
 __END__