--- loncom/localize/lonlocal.pm 2010/02/12 14:20:41 1.50.2.3 +++ loncom/localize/lonlocal.pm 2009/09/14 22:34:41 1.50.4.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.50.2.3 2010/02/12 14:20:41 raeburn Exp $ +# $Id: lonlocal.pm,v 1.50.4.2 2009/09/14 22:34:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -234,6 +234,7 @@ sub current_language { } sub preferred_languages { + 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'})); @@ -397,15 +398,6 @@ sub locallocaltime { my $dt = DateTime->from_epoch(epoch => $thistime) ->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 ((¤t_language=~/^en/) || (!$lh)) { return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");