--- loncom/localize/lonlocal.pm	2009/04/16 15:51:42	1.57
+++ loncom/localize/lonlocal.pm	2010/12/06 00:35:19	1.60.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.57 2009/04/16 15:51:42 www Exp $
+# $Id: lonlocal.pm,v 1.60.4.2 2010/12/06 00:35:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -242,6 +242,17 @@ sub current_language {
 }
 
 sub preferred_languages {
+    my $defdom = &Apache::lonnet::default_login_domain();
+    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
+        next if ($domtype eq '');
+        if ($domtype =~ /^\w+ci/) {
+            return ($domtype);
+        } elsif ($domtype =~ /^(\w+c)itest$/) {
+            return ($1.'t');
+        } else {
+            return ('gci');
+        }
+    }
     my @languages=();
     if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) {
         @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'form.languages'}));
@@ -262,8 +273,7 @@ sub preferred_languages {
         push(@languages,@browser);
     }
 
-    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},
-                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
+    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
         if ($domtype ne '') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
             if ($domdefs{'lang_def'} ne '') {
@@ -395,6 +405,7 @@ sub gettimezone {
 
 sub locallocaltime {
     my ($thistime,$timezone) = @_;
+
     if (!defined($thistime) || $thistime eq '') {
 	return &mt('Never');
     }
@@ -408,7 +419,16 @@ sub locallocaltime {
     }
 
     my $dt = DateTime->from_epoch(epoch => $thistime)
-                     ->set_time_zone(&gettimezone($timezone));
+                     ->set_time_zone(gettimezone($timezone));
+
+    # TimeZone tries to determine the 'local' timezone from $ENV{TZ} if this
+    # fails it searches through various system files. Under certain
+    # circumstances this is an extremly expensive operation.
+    # So after the first run we store the timezone in $ENV{TZ} to significantly
+    # speed up future lookups. 
+    $ENV{TZ} = $dt->time_zone()->name() 
+        if (! $ENV{TZ} && gettimezone($timezone) eq 'local');
+
     if ((&current_language=~/^en/) || (!$lh)) {
 
 	return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");