--- loncom/localize/lonlocal.pm	2003/12/10 00:32:56	1.27
+++ loncom/localize/lonlocal.pm	2005/02/17 08:51:08	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.27 2003/12/10 00:32:56 www Exp $
+# $Id: lonlocal.pm,v 1.32 2005/02/17 08:51:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,11 @@ sub mt (@) {
     if ($lh) {
 	return $lh->maketext(@_);
     } else {
-	return @_;
+	if (wantarray) {
+	    return @_;
+	} else {
+	    return $_[0];
+	}
     }
 }
 
@@ -204,9 +208,9 @@ sub current_language {
 sub current_encoding {
     if ($lh) {
 	my $enc=$lh->maketext('char_encoding');
-	return ($enc eq 'char_encoding'?'':$enc);
+	return ($enc eq 'char_encoding'?'UTF-8':$enc);
     } else {
-	return undef;
+	return 'UTF-8';
     }
 }
 
@@ -236,8 +240,14 @@ sub texthash {
 
 sub get_language_handle {
     my $r=shift;
-    $lh=Apache::localize->get_handle(&Apache::loncommon::preferred_languages);
-    if (&Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
+	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()]);
     }
 ###    setlocale(LC_ALL,&current_locale);