--- loncom/localize/lonlocal.pm	2005/11/14 19:53:03	1.36
+++ 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.36 2005/11/14 19:53:03 albertel Exp $
+# $Id: lonlocal.pm,v 1.44 2008/05/16 16:11:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,10 +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 locale;
-use POSIX qw(locale_h);
+use POSIX qw(locale_h strftime);
+use DateTime();
 
 require Exporter;
 
@@ -182,7 +182,15 @@ sub mt (@) {
 #    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 {
 	if (wantarray) {
 	    return @_;
@@ -251,7 +259,7 @@ sub get_language_handle {
     my @languages=&Apache::loncommon::preferred_languages;
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     $lh=Apache::localize->get_handle(@languages);
-    if ($r && &Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
 	$r->content_languages([&current_language()]);
     }
 ###    setlocale(LC_ALL,&current_locale);
@@ -259,21 +267,39 @@ sub get_language_handle {
 
 # ========================================================== Localize localtime
 sub gettimezone {
-    return ' ('.$Apache::lonnet::env{'server.timezone'}.')';
+    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).&gettimezone();
+
+	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;
@@ -281,7 +307,6 @@ sub locallocaltime {
 	if ($minutes<10) {
 	    $minutes='0'.$minutes;
 	}
-	$year+=1900;
 	my $twelve=$twentyfour;
 	my $ampm;
 	if ($twelve>12) {
@@ -290,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.&gettimezone();
+	return $format." ($time_zone)";
     }
 }
 
@@ -342,22 +366,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;