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

Diff for /loncom/localize/lonlocal.pm between versions 1.53 and 1.58

version 1.53, 2009/01/02 23:07:52 version 1.58, 2009/05/04 21:44:00
Line 173  require Exporter; Line 173  require Exporter;
 our @ISA = qw (Exporter);  our @ISA = qw (Exporter);
 our @EXPORT = qw(mt mtn ns mt_user);  our @EXPORT = qw(mt mtn ns mt_user);
   
   my %mtcache=();
   
 # ========================================================= The language handle  # ========================================================= The language handle
   
 use vars qw($lh);  use vars qw($lh $current_language);
   
 # ===================================================== The "MakeText" function  # ===================================================== The "MakeText" function
   
Line 191  sub mt (@) { Line 193  sub mt (@) {
                 return $_[0];                  return $_[0];
             }              }
         } else {          } else {
             return $lh->maketext(@_);              if ($#_>0) { return $lh->maketext(@_); }
               if ($mtcache{$current_language.':'.$_[0]}) {
                  return $mtcache{$current_language.':'.$_[0]};
               }
               my $translation=$lh->maketext(@_);
               $mtcache{$current_language.':'.$_[0]}=$translation;
               return $translation; 
         }          }
     } else {      } else {
  if (wantarray) {   if (wantarray) {
Line 287  sub get_genlanguages { Line 295  sub get_genlanguages {
   
 sub current_encoding {  sub current_encoding {
     my $default='UTF-8';      my $default='UTF-8';
     if ($Apache::lonnet::env{'browser.os'} eq 'win' &&   # UTF-8 character encoding needed for the whole LON-CAPA system
  $Apache::lonnet::env{'browser.type'} eq 'explorer') {  # (interface language and homework problem content)
         $default='ISO-8859-1';  # See Bugzilla 5702 vs. 2189 and 4067
     }  #    if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
   # $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 332  sub get_language_handle { Line 343  sub get_language_handle {
     my @languages=&preferred_languages();      my @languages=&preferred_languages();
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';      $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     $lh=Apache::localize->get_handle(@languages);      $lh=Apache::localize->get_handle(@languages);
       $current_language=&current_language();
     if ($r) {      if ($r) {
  $r->content_languages([&current_language()]);   $r->content_languages([&current_language()]);
     }      }
Line 381  sub gettimezone { Line 393  sub gettimezone {
     return 'local';      return 'local';
 }  }
   
   our $timezone_local;
   
 sub locallocaltime {  sub locallocaltime {
     my ($thistime,$timezone) = @_;      my ($thistime,$timezone,$datetime) = @_;
   
     if (!defined($thistime) || $thistime eq '') {      if (!defined($thistime) || $thistime eq '') {
  return &mt('Never');   return &mt('Never');
     }      }
Line 395  sub locallocaltime { Line 410  sub locallocaltime {
         return &mt('Never');          return &mt('Never');
     }      }
   
     my $dt = DateTime->from_epoch(epoch => $thistime)     my $dt;
                      ->set_time_zone(&gettimezone($timezone));     my $convert_time;
   
      #### START # Speed up if this function is called often #### 
      
      # Is a $datetime parameter set?
      if(defined($datetime)) {
    # Check for an instance of a DateTime object
       if(!(defined $$datetime)) {
    # No object, create one
    $$datetime = DateTime->from_epoch(epoch => $thistime)
                            ->set_time_zone(&gettimezone($timezone));
    $dt = $$datetime;
      } else {
    # If the return-value is "local", we have to convert it for DateTime
   
    # Converts the "local"-String only once
    if(!defined($timezone_local))
    {
    $timezone_local = DateTime::TimeZone->new( name => gettimezone('local'))->name();
    }
   
    my $timezone_now;
   
    if(gettimezone($timezone) == 'local')
    {
    $timezone_now = $timezone_local;
    } else {
    $timezone_now = gettimezone($timezone);
    }
   
    # Has the timezone changed?
    if($timezone_now eq $$datetime->time_zone_short_name() ||
      $timezone_now eq $$datetime->time_zone_long_name())
    {
    # There is already an object (dereference)
    $dt = $$datetime;
   
    # We need this as temporary value
    $convert_time = DateTime->from_epoch( epoch => $thistime );
                                          #->set_time_zone('floating');
    
    # Preventing a set_time_zone call (time consuming)
    # Using old instance of DateTime with timezone
    $dt->set( year => $convert_time->year(),
     month => $convert_time->month(),
     day => $convert_time->day(),
     hour => $convert_time->hour(),
     minute => $convert_time->minute(),
     second => $convert_time->second() );
       } else {
    # The timezone has changed since last time
    $$datetime = DateTime->from_epoch(epoch => $thistime)
                             ->set_time_zone(&gettimezone($timezone));
    $dt = $$datetime;
    } 
    }
      } else {
    # There is no $datetime parameter
    $dt = DateTime->from_epoch(epoch => $thistime)
                         ->set_time_zone(&gettimezone($timezone));
      }
      #### END # Speed up if this function is called often ####
   
     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.53  
changed lines
  Added in v.1.58

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