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

Diff for /loncom/localize/lonlocal.pm between versions 1.50.2.2 and 1.52

version 1.50.2.2, 2009/01/05 16:55:04 version 1.52, 2008/11/28 14:36:55
Line 340  sub get_language_handle { Line 340  sub get_language_handle {
   
 # ========================================================== Localize localtime  # ========================================================== Localize localtime
 sub gettimezone {  sub gettimezone {
     my ($timezone) = @_;      my $timezone; 
     if ($timezone ne '') {      if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
         if (!DateTime::TimeZone->is_valid_name($timezone)) {          $timezone = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'};    
             $timezone = 'local';      } elsif ($Apache::lonnet::env{'request.course.id'} ne '') {
         }          my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'};
         return $timezone;          if ($cdom ne '') {
     }              my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
     my $cid = $Apache::lonnet::env{'request.course.id'};              if ($domdefaults{'timezone_def'} ne '') {
     if ($cid ne '') {                  $timezone = $domdefaults{'timezone_def'};
         if ($Apache::lonnet::env{'course.'.$cid.'.timezone'}) {  
             $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'};  
         } else {  
             my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'};  
             if ($cdom ne '') {  
                 my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);  
                 if ($domdefaults{'timezone_def'} ne '') {  
                     $timezone = $domdefaults{'timezone_def'};  
                 }  
             }              }
         }          }
     } elsif ($Apache::lonnet::env{'request.role.domain'} ne '') {      } elsif ($Apache::lonnet::env{'request.role.domain'} ne '') {
Line 382  sub gettimezone { Line 373  sub gettimezone {
 }  }
   
 sub locallocaltime {  sub locallocaltime {
     my ($thistime,$timezone) = @_;      my $thistime=shift;
     if (!defined($thistime) || $thistime eq '') {      if (!defined($thistime) || $thistime eq '') {
  return &mt('Never');   return &mt('Never');
     }      }
Line 396  sub locallocaltime { Line 387  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());
     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)");
Line 469  sub getdatelocale { Line 460  sub getdatelocale {
     return $locale_obj;      return $locale_obj;
 }  }
   
   =pod 
   
   =item * normalize_string
   
   Normalize string (reduce fragility in the lexicon files)
   
 # ==================== Normalize string (reduce fragility in the lexicon files)  This normalizes a string to reduce fragility in the lexicon files of
   huge messages (such as are used by the helper), and allow useful
   formatting: reduce all consecutive whitespace to a single space,
   and remove all HTML
   
   =cut
   
 # This normalizes a string to reduce fragility in the lexicon files of  
 # huge messages (such as are used by the helper), and allow useful  
 # formatting: reduce all consecutive whitespace to a single space,  
 # and remove all HTML  
 sub normalize_string {  sub normalize_string {
     my $s = shift;      my $s = shift;
     $s =~ s/\s+/ /g;      $s =~ s/\s+/ /g;
Line 486  sub normalize_string { Line 483  sub normalize_string {
     return $s;      return $s;
 }  }
   
 # alias for normalize_string; recommend using it only in the lexicon  =pod 
   
   =item * ns
   
   alias for normalize_string; recommend using it only in the lexicon
   
   =cut
   
 sub ns {  sub ns {
     return normalize_string(@_);      return normalize_string(@_);
 }  }
   
 # mtn: call the mt function and the normalization function easily.  =pod
 # Returns original non-normalized string if there was no translation  
   =item * mtn
   
   mtn: call the mt function and the normalization function easily.
   Returns original non-normalized string if there was no translation
   
   =cut
   
 sub mtn (@) {  sub mtn (@) {
     my @args = @_; # don't want to modify caller's string; if we      my @args = @_; # don't want to modify caller's string; if we
    # didn't care about that we could set $_[0]     # didn't care about that we could set $_[0]
Removed from v.1.50.2.2  
changed lines
  Added in v.1.52

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