--- loncom/localize/lonlocal.pm	2003/10/11 14:06:01	1.24
+++ loncom/localize/lonlocal.pm	2008/05/16 16:11:56	1.44
@@ -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.44 2008/05/16 16:11:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -162,17 +162,15 @@ package Apache::lonlocal;
 
 use strict;
 use Apache::localize;
-use Apache::File;
 use locale;
-use POSIX qw(locale_h);
+use POSIX qw(locale_h strftime);
+use DateTime();
 
 require Exporter;
 
 our @ISA = qw (Exporter);
 our @EXPORT = qw(mt mtn ns);
 
-my $reroute;
-
 # ========================================================= The language handle
 
 use vars qw($lh);
@@ -180,50 +178,28 @@ 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) {
+        if ($_[0] eq '') {
+            if (wantarray) {
+                return @_;
+            } else {
+                return $_[0];
+            }
+        } else {
+            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 +213,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,55 +247,59 @@ 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) = @_;
+    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
+	return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'};
+    }
+    return 'local';
+}
 
 sub locallocaltime {
     my $thistime=shift;
+    if (!defined($thistime) || $thistime eq '') {
+	return &mt('Never');
+    }
+
+    my $dt = DateTime->from_epoch(epoch => $thistime)
+                     ->set_time_zone(&gettimezone());
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime);
+
+	return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
     } else {
 	my $format=$lh->maketext('date_locale');
 	if ($format eq 'date_locale') {
-	    return ''.localtime($thistime);
+	    return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
 	}
-	my ($seconds,$minutes,$twentyfour,$day,$mon,$year,$wday,$yday,$isdst)=
-	    localtime($thistime);
-	my $month=(split(/\,/,$lh->maketext('date_months')))[$mon];
+	my $time_zone  = $dt->time_zone_short_name();
+	my $seconds    = $dt->second();
+	my $minutes    = $dt->minute();
+	my $twentyfour = $dt->hour();
+	my $day        = $dt->day_of_month();
+	my $mon        = $dt->month()-1;
+	my $year       = $dt->year();
+	my $wday       = $dt->wday();
+        if ($wday==7) { $wday=0; }
+	my $month  =(split(/\,/,$lh->maketext('date_months')))[$mon];
 	my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];
 	if ($seconds<10) {
 	    $seconds='0'.$seconds;
@@ -322,7 +307,6 @@ sub locallocaltime {
 	if ($minutes<10) {
 	    $minutes='0'.$minutes;
 	}
-	$year+=1900;
 	my $twelve=$twentyfour;
 	my $ampm;
 	if ($twelve>12) {
@@ -331,12 +315,11 @@ sub locallocaltime {
 	} else {
 	    $ampm=$lh->maketext('date_am');
 	}
-	foreach 
-	('seconds','minutes','twentyfour','twelve','day','year',
-	 'month','weekday','ampm') {
+	foreach ('seconds','minutes','twentyfour','twelve','day','year',
+		 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format." ($time_zone)";
     }
 }
 
@@ -376,6 +359,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__