Diff for /loncom/localize/lonlocal.pm between versions 1.15 and 1.18

version 1.15, 2003/09/28 03:02:36 version 1.18, 2003/10/04 18:13:36
Line 277  sub get_language_handle { Line 277  sub get_language_handle {
     if (&Apache::lonnet::mod_perl_version == 1) {      if (&Apache::lonnet::mod_perl_version == 1) {
  $r->content_languages([&current_language()]);   $r->content_languages([&current_language()]);
     }      }
     setlocale(LC_ALL,&current_locale);  ###    setlocale(LC_ALL,&current_locale);
 }  }
   
   # ========================================================== Localize localtime
   
   sub locallocaltime {
       my $thistime=shift;
       if ((&current_language=~/^en/) || (!$lh)) {
    return ''.localtime($thistime);
       } else {
    my $format=$lh->maketext('date_locale');
    if ($format eq 'date_locale') {
       return ''.localtime($thistime);
    }
    my ($seconds,$minutes,$twentyfour,$day,$mon,$year,$wday,$yday,$isdst)=
       localtime($thistime);
    my $month=(split(/\,/,$lh->maketext('date_months')))[$mon];
    my $weekday=(split(/\,/,$lh->maketext('date_days')))[$wday];
    if ($seconds<10) {
       $seconds='0'.$seconds;
    }
    if ($minutes<10) {
       $minutes='0'.$minutes;
    }
    $year+=1900;
    my $twelve=$twentyfour;
    if ($twelve>12) {
       $twelve-=12;
       $twelve.=$lh->maketext('date_pm');
    } else {
       $twelve.=$lh->maketext('date_am');
    }
    foreach 
    ('seconds','minutes','twentyfour','twelve','day','year',
    'month','weekday') {
       $format=~s/\$$_/eval('$'.$_)/gse;
    }
    return $format;
       }
   }
   
   # ==================== 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
   sub normalize_string {
       my $s = shift;
       $s =~ s/\s+/ /g;
       $s =~ s/<[^>]+>//g;
       return $s;
   }
 1;  1;
   
 __END__  __END__

Removed from v.1.15  
changed lines
  Added in v.1.18


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