--- loncom/localize/lonlocal.pm 2003/12/22 22:39:07 1.28 +++ loncom/localize/lonlocal.pm 2003/12/22 23:42:18 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.28 2003/12/22 22:39:07 www Exp $ +# $Id: lonlocal.pm,v 1.30 2003/12/22 23:42:18 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -236,14 +236,11 @@ sub texthash { sub get_language_handle { my $r=shift; - my $languages=&Apache::loncommon::preferred_languages; - unless ($languages) { - my $headers=$r->headers_in; - $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'}; - } else { - $ENV{'HTTP_ACCEPT_LANGUAGE'}=''; - } - $lh=Apache::localize->get_handle($languages); + 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 (&Apache::lonnet::mod_perl_version == 1) { $r->content_languages([¤t_language()]); }