--- loncom/localize/lonlocal.pm 2009/10/01 20:22:33 1.60 +++ loncom/localize/lonlocal.pm 2010/12/06 17:52:20 1.60.4.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.60 2009/10/01 20:22:33 raeburn Exp $ +# $Id: lonlocal.pm,v 1.60.4.3 2010/12/06 17:52:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -242,6 +242,17 @@ sub current_language { } sub preferred_languages { + my $defdom = &Apache::lonnet::default_login_domain(); + foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) { + next if ($domtype eq ''); + if ($domtype =~ /^(\w{2})\w?i$/) { + return ($1.'i'); + } elsif ($domtype =~ /^(\w{2})\w?itest$/) { + return ($1.'t'); + } else { + return ('gci'); + } + } my @languages=(); if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) { @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'form.languages'})); @@ -262,7 +273,6 @@ sub preferred_languages { push(@languages,@browser); } - my $defdom = &Apache::lonnet::default_login_domain(); foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) { if ($domtype ne '') { my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);