--- loncom/localize/lonlocal.pm	2003/12/22 23:42:18	1.30
+++ loncom/localize/lonlocal.pm	2008/05/31 23:37:49	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.30 2003/12/22 23:42:18 www Exp $
+# $Id: lonlocal.pm,v 1.45 2008/05/31 23:37:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,11 +161,10 @@ but for most purposes, we do not have to
 package Apache::lonlocal;
 
 use strict;
-use Apache::Constants qw(:common);
 use Apache::localize;
-use Apache::File;
 use locale;
-use POSIX qw(locale_h);
+use POSIX qw(locale_h strftime);
+use DateTime();
 
 require Exporter;
 
@@ -179,13 +178,25 @@ use vars qw($lh);
 # ===================================================== The "MakeText" function
 
 sub mt (@) {
-#    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
-#    print $fh @_[0]."\n";
-#    $fh->close();
+#    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
+#    print LOG (@_[0]."\n");
+#    close(LOG);
     if ($lh) {
-	return $lh->maketext(@_);
+        if ($_[0] eq '') {
+            if (wantarray) {
+                return @_;
+            } else {
+                return $_[0];
+            }
+        } else {
+            return $lh->maketext(@_);
+        }
     } else {
-	return @_;
+	if (wantarray) {
+	    return @_;
+	} else {
+	    return $_[0];
+	}
     }
 }
 
@@ -202,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;
     }
 }
 
@@ -236,31 +252,61 @@ sub texthash {
 
 sub get_language_handle {
     my $r=shift;
-    my $headers=$r->headers_in;
-    $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
+    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 (&Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
 	$r->content_languages([&current_language()]);
     }
 ###    setlocale(LC_ALL,&current_locale);
 }
 
 # ========================================================== Localize localtime
+sub gettimezone {
+    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
+	return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'};
+    } elsif ($Apache::lonnet::env{'request.course.id'} ne '') {
+        my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'};
+        if ($cdom ne '') {
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+            if ($domdefaults{'timezone_def'} ne '') {
+                return $domdefaults{'timezone_def'};
+            }
+        }
+    }
+    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;
@@ -268,7 +314,6 @@ sub locallocaltime {
 	if ($minutes<10) {
 	    $minutes='0'.$minutes;
 	}
-	$year+=1900;
 	my $twelve=$twentyfour;
 	my $ampm;
 	if ($twelve>12) {
@@ -277,12 +322,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)";
     }
 }
 
@@ -329,22 +373,19 @@ sub transstatic {
     $$strptr=~s/MT\{([^\}]*)\}/&mt($1)/gse;
 }
 
-# ----------------------------------------------- Handler Routine /adm/localize
-sub handler {
-    my $r=shift;
-    &Apache::lonlocal::get_language_handle($r);
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
-
-    my $uri=$r->uri;
-    $uri=~s/^\/adm\/localize//;
-    my $fn=$Apache::lonnet::perlvar{'lonDocRoot'}.$uri;
-
-    my $file=&Apache::lonnet::getfile($fn);
-    &transstatic(\$file);
-    $r->print($file);
-    return OK;
+=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;