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

Diff for /loncom/localize/lonlocal.pm between versions 1.29 and 1.32

version 1.29, 2003/12/22 23:34:49 version 1.32, 2005/02/17 08:51:08
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 204  sub current_language { Line 208  sub current_language {
 sub current_encoding {  sub current_encoding {
     if ($lh) {      if ($lh) {
  my $enc=$lh->maketext('char_encoding');   my $enc=$lh->maketext('char_encoding');
  return ($enc eq 'char_encoding'?'':$enc);   return ($enc eq 'char_encoding'?'UTF-8':$enc);
     } else {      } else {
  return undef;   return 'UTF-8';
     }      }
 }  }
   
Line 236  sub texthash { Line 240  sub texthash {
   
 sub get_language_handle {  sub get_language_handle {
     my $r=shift;      my $r=shift;
     my $headers=$r->headers_in;      if ($r) {
     $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};   my $headers=$r->headers_in;
    $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
       }
     my @languages=&Apache::loncommon::preferred_languages;      my @languages=&Apache::loncommon::preferred_languages;
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';      $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     &Apache::lonnet::logthis($r->uri.' '.join(' ',@languages));  
     $lh=Apache::localize->get_handle(@languages);      $lh=Apache::localize->get_handle(@languages);
     if (&Apache::lonnet::mod_perl_version == 1) {      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.29  
changed lines
  Added in v.1.32

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