[BACK]Return to lonlocal.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / localize

Diff for /loncom/localize/lonlocal.pm between versions 1.57 and 1.61

version 1.57, 2009/04/16 15:51:42 version 1.61, 2010/07/07 16:30:48
Line 262  sub preferred_languages { Line 262  sub preferred_languages {
         push(@languages,@browser);          push(@languages,@browser);
     }      }
   
     foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},      my $defdom = &Apache::lonnet::default_login_domain();
                          $Apache::lonnet::perlvar{'lonDefDomain'}) {      foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
         if ($domtype ne '') {          if ($domtype ne '') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);              my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
             if ($domdefs{'lang_def'} ne '') {              if ($domdefs{'lang_def'} ne '') {
Line 295  sub get_genlanguages { Line 295  sub get_genlanguages {
   
 sub current_encoding {  sub current_encoding {
     my $default='UTF-8';      my $default='UTF-8';
 # UTF-8 character encoding needed for the whole LON-CAPA system      unless ($Apache::lonnet::env{'browser.unicode'}) {
 # (interface language and homework problem content)          if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
 # See Bugzilla 5702 vs. 2189 and 4067      $Apache::lonnet::env{'browser.type'} eq 'explorer') {
 #    if ($Apache::lonnet::env{'browser.os'} eq 'win' &&               $default='ISO-8859-1';
 # $Apache::lonnet::env{'browser.type'} eq 'explorer') {          }
 #        $default='ISO-8859-1';      }
 #    }  
     if ($lh) {      if ($lh) {
  my $enc=$lh->maketext('char_encoding');   my $enc=$lh->maketext('char_encoding');
  return ($enc eq 'char_encoding'?$default:$enc);   return ($enc eq 'char_encoding'?$default:$enc);
Line 395  sub gettimezone { Line 394  sub gettimezone {
   
 sub locallocaltime {  sub locallocaltime {
     my ($thistime,$timezone) = @_;      my ($thistime,$timezone) = @_;
   
     if (!defined($thistime) || $thistime eq '') {      if (!defined($thistime) || $thistime eq '') {
  return &mt('Never');   return &mt('Never');
     }      }
Line 408  sub locallocaltime { Line 408  sub locallocaltime {
     }      }
   
     my $dt = DateTime->from_epoch(epoch => $thistime)      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)) {      if ((&current_language=~/^en/) || (!$lh)) {
   
  return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");   return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
Removed from v.1.57  
changed lines
  Added in v.1.61

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>