--- loncom/localize/lonlocal.pm	2006/08/28 14:26:25	1.41
+++ loncom/localize/lonlocal.pm	2008/09/19 03:27:04	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.41 2006/08/28 14:26:25 albertel Exp $
+# $Id: lonlocal.pm,v 1.49 2008/09/19 03:27:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,11 +164,14 @@ use strict;
 use Apache::localize;
 use locale;
 use POSIX qw(locale_h strftime);
+use DateTime();
+use DateTime::TimeZone;
+use DateTime::Locale;
 
 require Exporter;
 
 our @ISA = qw (Exporter);
-our @EXPORT = qw(mt mtn ns);
+our @EXPORT = qw(mt mtn ns mt_user);
 
 # ========================================================= The language handle
 
@@ -181,7 +184,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 @_;
@@ -191,6 +202,27 @@ sub mt (@) {
     }
 }
 
+sub mt_user {
+    my ($user_lh,@what) = @_;
+    if ($user_lh) {
+        if ($what[0] eq '') {
+            if (wantarray) {
+                return @what;
+            } else {
+                return $what[0];
+            }
+        } else {
+            return $user_lh->maketext(@what);
+        }
+    } else {
+        if (wantarray) {
+            return @what;
+        } else {
+            return $what[0];
+        }
+    }
+}
+
 # ============================================================== What language?
 
 sub current_language {
@@ -258,8 +290,24 @@ sub get_language_handle {
 
 # ========================================================== Localize localtime
 sub gettimezone {
-    my ($time) = @_;
-    return ' ('.&strftime("%Z",localtime($time)).')';
+    my $timezone; 
+    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
+        $timezone = $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 '') {
+                $timezone = $domdefaults{'timezone_def'};
+            }
+        }
+    }
+    if ($timezone ne '') {
+        if (DateTime::TimeZone->is_valid_name($timezone)) {
+            return $timezone;
+        }
+    }
+    return 'local';
 }
 
 sub locallocaltime {
@@ -267,16 +315,35 @@ sub locallocaltime {
     if (!defined($thistime) || $thistime eq '') {
 	return &mt('Never');
     }
+    if (($thistime < 0) || ($thistime eq 'NaN')) {
+        &Apache::lonnet::logthis("Unexpected time (negative or NaN) '$thistime' passed to lonlocal::locallocaltime");  
+        return &mt('Never');
+    }
+    if ($thistime !~ /^\d+$/) {
+        &Apache::lonnet::logthis("Unexpected non-numeric time '$thistime' passed to lonlocal::locallocaltime");
+        return &mt('Never');
+    }
+
+    my $dt = DateTime->from_epoch(epoch => $thistime)
+                     ->set_time_zone(&gettimezone());
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime).&gettimezone($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;
@@ -284,7 +351,6 @@ sub locallocaltime {
 	if ($minutes<10) {
 	    $minutes='0'.$minutes;
 	}
-	$year+=1900;
 	my $twelve=$twentyfour;
 	my $ampm;
 	if ($twelve>12) {
@@ -293,15 +359,46 @@ 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($thistime);
+	return $format." ($time_zone)";
     }
 }
 
+sub getdatelocale {
+    my ($datelocale,$locale_obj);
+    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.datelocale'}) {
+        $datelocale = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.datelocale'};
+    } 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{'datelocale_def'} ne '') {
+                $datelocale = $domdefaults{'datelocale_def'};
+            }
+        }
+    } elsif ($Apache::lonnet::env{'user.domain'} ne '') {
+        my %udomdefaults = &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'});
+        if ($udomdefaults{'datelocale_def'} ne '') {
+            $datelocale = $udomdefaults{'datelocale_def'};
+        }
+    }
+    if ($datelocale ne '') {
+        eval {
+            $locale_obj = DateTime::Locale->load($datelocale);
+        };
+        if (!$@) {
+            if ($locale_obj->id() eq $datelocale) {
+                return $locale_obj;
+            }
+        }
+    }
+    return $locale_obj;
+}
+
+
 # ==================== Normalize string (reduce fragility in the lexicon files)
 
 # This normalizes a string to reduce fragility in the lexicon files of