loncom/localize/lonlocal.pm - diff

Return to lonlocal.pm CVS log

Up to [LON-CAPA] / loncom / localize

version 1.60, 2009/10/01 20:22:33	version 1.60.4.1, 2009/12/07 04:05:18
Line 242 sub current_language {	Line 242 sub current_language {
}	}

sub preferred_languages {	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 eq 'gci') {
	return ('gci');
	} elsif ($domtype eq 'gcitest') {
	return ('gct');
	} else {
	return ('gci');
	}
	}
my @languages=();	my @languages=();
if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) {	if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) {
@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$Apache::lonnet::env{'form.languages'}));	@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$Apache::lonnet::env{'form.languages'}));
Line 262 sub preferred_languages {	Line 273 sub preferred_languages {
push(@languages,@browser);	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) {	foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
if ($domtype ne '') {	if ($domtype ne '') {
my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);	my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);