loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.582, 2007/09/11 20:36:30	version 1.583, 2007/09/11 20:40:23
Line 2531 sub preferred_languages {	Line 2531 sub preferred_languages {
@languages=(@languages,	@languages=(@languages,
split(/\s(\,\|\;\|\:)\s/,$env{'environment.languages'}));	split(/\s(\,\|\;\|\:)\s/,$env{'environment.languages'}));
}	}
my $browser=(split(/\;/,$ENV{'HTTP_ACCEPT_LANGUAGE'}))[0];	my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
if ($browser) {	if ($browser) {
@languages=(@languages,split(/\s(\,\|\;\|\:)\s/,$browser));	my @browser =
	map { (split(/\s;\s/,$_))[0] } (split(/\s,\s/,$browser));
	push(@languages,@browser);
}	}
if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {	if (&Apache::lonnet::domain($env{'user.domain'},'lang_def')) {
@languages=(@languages,	@languages=(@languages,
Line 2555 sub preferred_languages {	Line 2557 sub preferred_languages {
my @genlanguages;	my @genlanguages;
foreach my $lang (@languages) {	foreach my $lang (@languages) {
unless ($lang=~/\w/) { next; }	unless ($lang=~/\w/) { next; }
push (@genlanguages,$lang);	push(@genlanguages,$lang);
if ($lang=~/(\-\|\_)/) {	if ($lang=~/(\-\|\_)/) {
push(@genlanguages,(split(/(\-\|\_)/,$lang))[0]);	push(@genlanguages,(split(/(\-\|\_)/,$lang))[0]);
}	}
}	}
	#uniqueify the languages list
	my %count;
	@genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
return @genlanguages;	return @genlanguages;
}	}