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

Diff for /loncom/localize/lonlocal.pm between versions 1.41 and 1.42

version 1.41, 2006/08/28 14:26:25 version 1.42, 2007/10/18 21:08:31
Line 164  use strict; Line 164  use strict;
 use Apache::localize;  use Apache::localize;
 use locale;  use locale;
 use POSIX qw(locale_h strftime);  use POSIX qw(locale_h strftime);
   use DateTime();
   
 require Exporter;  require Exporter;
   
Line 259  sub get_language_handle { Line 260  sub get_language_handle {
 # ========================================================== Localize localtime  # ========================================================== Localize localtime
 sub gettimezone {  sub gettimezone {
     my ($time) = @_;      my ($time) = @_;
     return ' ('.&strftime("%Z",localtime($time)).')';      if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
    return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'};
       }
       return 'local';
 }  }
   
 sub locallocaltime {  sub locallocaltime {
Line 267  sub locallocaltime { Line 271  sub locallocaltime {
     if (!defined($thistime) || $thistime eq '') {      if (!defined($thistime) || $thistime eq '') {
  return &mt('Never');   return &mt('Never');
     }      }
   
       my $dt = DateTime->from_epoch(epoch => $thistime)
                        ->set_time_zone(&gettimezone());
     if ((&current_language=~/^en/) || (!$lh)) {      if ((&current_language=~/^en/) || (!$lh)) {
  return ''.localtime($thistime).&gettimezone($thistime);  
    return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
     } else {      } else {
  my $format=$lh->maketext('date_locale');   my $format=$lh->maketext('date_locale');
  if ($format eq 'date_locale') {   if ($format eq 'date_locale') {
     return ''.localtime($thistime);      return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
  }   }
  my ($seconds,$minutes,$twentyfour,$day,$mon,$year,$wday,$yday,$isdst)=   my $time_zone  = $dt->time_zone_short_name();
     localtime($thistime);   my $seconds    = $dt->second();
  my $month=(split(/\,/,$lh->maketext('date_months')))[$mon];   my $minutes    = $dt->minute();
    my $twentyfour = $dt->hour();
    my $day        = $dt->day_of_month();
    my $mon        = $dt->month()-1;
    my $year       = $dt->year();
    my $wday       = $dt->wday()-1;
    my $month  =(split(/\,/,$lh->maketext('date_months')))[$mon];
  my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];   my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];
  if ($seconds<10) {   if ($seconds<10) {
     $seconds='0'.$seconds;      $seconds='0'.$seconds;
Line 284  sub locallocaltime { Line 298  sub locallocaltime {
  if ($minutes<10) {   if ($minutes<10) {
     $minutes='0'.$minutes;      $minutes='0'.$minutes;
  }   }
  $year+=1900;  
  my $twelve=$twentyfour;   my $twelve=$twentyfour;
  my $ampm;   my $ampm;
  if ($twelve>12) {   if ($twelve>12) {
Line 293  sub locallocaltime { Line 306  sub locallocaltime {
  } else {   } else {
     $ampm=$lh->maketext('date_am');      $ampm=$lh->maketext('date_am');
  }   }
  foreach    foreach ('seconds','minutes','twentyfour','twelve','day','year',
  ('seconds','minutes','twentyfour','twelve','day','year',   'month','weekday','ampm') {
  'month','weekday','ampm') {  
     $format=~s/\$$_/eval('$'.$_)/gse;      $format=~s/\$$_/eval('$'.$_)/gse;
  }   }
  return $format.&gettimezone($thistime);   return $format." ($time_zone)";
     }      }
 }  }
   
Removed from v.1.41  
changed lines
  Added in v.1.42

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