Diff for /loncom/localize/lonlocal.pm between versions 1.28 and 1.31

version 1.28, 2003/12/22 22:39:07 version 1.31, 2004/02/18 23:33:17
Line 185  sub mt (@) { Line 185  sub mt (@) {
     if ($lh) {      if ($lh) {
  return $lh->maketext(@_);   return $lh->maketext(@_);
     } else {      } else {
  return @_;   if (wantarray) {
       return @_;
    } else {
       return $_[0];
    }
     }      }
 }  }
   
Line 236  sub texthash { Line 240  sub texthash {
   
 sub get_language_handle {  sub get_language_handle {
     my $r=shift;      my $r=shift;
     my $languages=&Apache::loncommon::preferred_languages;      if ($r) {
     unless ($languages) {  
  my $headers=$r->headers_in;   my $headers=$r->headers_in;
  $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};   $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
     } else {  
  $ENV{'HTTP_ACCEPT_LANGUAGE'}='';  
     }      }
     $lh=Apache::localize->get_handle($languages);      my @languages=&Apache::loncommon::preferred_languages;
     if (&Apache::lonnet::mod_perl_version == 1) {      $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
       $lh=Apache::localize->get_handle(@languages);
       if ($r && &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);

Removed from v.1.28  
changed lines
  Added in v.1.31


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