loncom/localize/lonlocal.pm - diff

Return to lonlocal.pm CVS log

Up to [LON-CAPA] / loncom / localize

version 1.27, 2003/12/10 00:32:56	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;
$lh=Apache::localize->get_handle(&Apache::loncommon::preferred_languages);	if ($r) {
if (&Apache::lonnet::mod_perl_version == 1) {	my $headers=$r->headers_in;
	$ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
	}
	my @languages=&Apache::loncommon::preferred_languages;
	$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);