Diff for /loncom/localize/lonlocal.pm between versions 1.16 and 1.23

version 1.16, 2003/09/29 13:24:49 version 1.23, 2003/10/10 16:56:16
Line 169  use POSIX qw(locale_h); Line 169  use POSIX qw(locale_h);
 require Exporter;  require Exporter;
   
 our @ISA = qw (Exporter);  our @ISA = qw (Exporter);
 our @EXPORT = qw(mt);  our @EXPORT = qw(mt mtn ns);
   
 my $reroute;  my $reroute;
   
Line 180  use vars qw($lh); Line 180  use vars qw($lh);
 # ===================================================== The "MakeText" function  # ===================================================== The "MakeText" function
   
 sub mt (@) {  sub mt (@) {
   #    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
   #    print $fh join('',@_)."\n";
   #    $fh->close();
     unless ($ENV{'environment.translator'}) {      unless ($ENV{'environment.translator'}) {
  if ($lh) {   if ($lh) {
     return $lh->maketext(@_);      return $lh->maketext(@_);
Line 210  sub mt (@) { Line 213  sub mt (@) {
 # ============================================================== What language?  # ============================================================== What language?
   
 sub current_language {  sub current_language {
     my $lang=$lh->maketext('language_code');      if ($lh) {
     return ($lang eq 'language_code'?'en':$lang);   my $lang=$lh->maketext('language_code');
    return ($lang eq 'language_code'?'en':$lang);
       }
       return 'en';
 }  }
   
 # ============================================================== What encoding?  # ============================================================== What encoding?
Line 280  sub get_language_handle { Line 286  sub get_language_handle {
 ###    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;
    my $ampm;
    if ($twelve>12) {
       $twelve-=12;
       $ampm=$lh->maketext('date_pm');
    } else {
       $ampm=$lh->maketext('date_am');
    }
    foreach 
    ('seconds','minutes','twentyfour','twelve','day','year',
    'month','weekday','ampm') {
       $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;
       # Pop off beginning or ending spaces, which aren't good
       $s =~ s/^\s+//;
       $s =~ s/\s+$//;
       return $s;
   }
   
   # alias for normalize_string; recommend using it only in the lexicon
   sub ns {
       return normalize_string(@_);
   }
   
   # mtn: call the mt function and the normalization function easily.
   # Returns original non-normalized string if there was no translation
   sub mtn (@) {
       my @args = @_; # don't want to modify caller's string; if we
      # didn't care about that we could set $_[0]
      # directly
       $args[0] = normalize_string($args[0]);
       my $translation = &mt(@args);
       if ($translation ne $args[0]) {
    return $translation;
       } else {
    return $_[0];
       }
   }
   
 1;  1;
   
 __END__  __END__

Removed from v.1.16  
changed lines
  Added in v.1.23


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