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

version 1.18, 2003/10/04 18:13:36 version 1.26, 2003/11/07 23:22:22
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;  
   
 # ========================================================= The language handle  # ========================================================= The language handle
   
Line 180  use vars qw($lh); Line 178  use vars qw($lh);
 # ===================================================== The "MakeText" function  # ===================================================== The "MakeText" function
   
 sub mt (@) {  sub mt (@) {
     unless ($ENV{'environment.translator'}) {  #    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
  if ($lh) {  #    print $fh @_[0]."\n";
     return $lh->maketext(@_);  #    $fh->close();
  } else {      if ($lh) {
     return @_;   return $lh->maketext(@_);
  }  
     } else {      } else {
  if ($lh) {   return @_;
     my $trans=$lh->maketext(@_);  
     my $link='<a target="trans" href="/cgi-bin/translator.pl?arg1='.  
  &Apache::lonnet::escape($_[0]).'&arg2='.  
  &Apache::lonnet::escape($_[1]).'&arg3='.  
  &Apache::lonnet::escape($_[2]).'&lang='.  
  $ENV{'environment.translator'}.  
  '">[['.$trans.']]</a>';  
     if ($ENV{'transreroute'}) {  
  $reroute.=$link;  
  return $trans;  
     } else {  
  return $link;  
     }  
  } else {  
     return @_;  
  }  
     }      }
 }  }
   
 # ============================================================== 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 246  sub texthash { Line 230  sub texthash {
     }      }
     return %hash;      return %hash;
 }  }
 # ======================================================== Re-route translation  
   
 sub clearreroutetrans {  
     &reroutetrans();  
     $reroute='';  
 }  
   
 # ======================================================== Re-route translation  
   
 sub reroutetrans {  
     $ENV{'transreroute'}=1;  
 }  
   
 # ==================================================== End re-route translation  
 sub endreroutetrans {  
     $ENV{'transreroute'}=0;  
     if ($ENV{'environment.translator'}) {  
  return $reroute;  
     } else {  
  return '';  
     }  
 }  
   
 # ========= Get a handle (do not invoke in vain, leave this to access handlers)  # ========= Get a handle (do not invoke in vain, leave this to access handlers)
   
Line 303  sub locallocaltime { Line 265  sub locallocaltime {
  }   }
  $year+=1900;   $year+=1900;
  my $twelve=$twentyfour;   my $twelve=$twentyfour;
    my $ampm;
  if ($twelve>12) {   if ($twelve>12) {
     $twelve-=12;      $twelve-=12;
     $twelve.=$lh->maketext('date_pm');      $ampm=$lh->maketext('date_pm');
  } else {   } else {
     $twelve.=$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') {   'month','weekday','ampm') {
     $format=~s/\$$_/eval('$'.$_)/gse;      $format=~s/\$$_/eval('$'.$_)/gse;
  }   }
  return $format;   return $format;
Line 328  sub normalize_string { Line 291  sub normalize_string {
     my $s = shift;      my $s = shift;
     $s =~ s/\s+/ /g;      $s =~ s/\s+/ /g;
     $s =~ s/<[^>]+>//g;      $s =~ s/<[^>]+>//g;
       # Pop off beginning or ending spaces, which aren't good
       $s =~ s/^\s+//;
       $s =~ s/\s+$//;
     return $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.18  
changed lines
  Added in v.1.26


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