version 1.59, 2009/05/06 19:25:49
|
version 1.61, 2010/07/07 16:30:48
|
Line 262 sub preferred_languages {
|
Line 262 sub preferred_languages {
|
push(@languages,@browser); |
push(@languages,@browser); |
} |
} |
|
|
foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'}, |
my $defdom = &Apache::lonnet::default_login_domain(); |
$Apache::lonnet::perlvar{'lonDefDomain'}) { |
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); |
if ($domdefs{'lang_def'} ne '') { |
if ($domdefs{'lang_def'} ne '') { |
Line 295 sub get_genlanguages {
|
Line 295 sub get_genlanguages {
|
|
|
sub current_encoding { |
sub current_encoding { |
my $default='UTF-8'; |
my $default='UTF-8'; |
# UTF-8 character encoding needed for the whole LON-CAPA system |
unless ($Apache::lonnet::env{'browser.unicode'}) { |
# (interface language and homework problem content) |
if ($Apache::lonnet::env{'browser.os'} eq 'win' && |
# See Bugzilla 5702 vs. 2189 and 4067 |
$Apache::lonnet::env{'browser.type'} eq 'explorer') { |
# if ($Apache::lonnet::env{'browser.os'} eq 'win' && |
$default='ISO-8859-1'; |
# $Apache::lonnet::env{'browser.type'} eq 'explorer') { |
} |
# $default='ISO-8859-1'; |
} |
# } |
|
if ($lh) { |
if ($lh) { |
my $enc=$lh->maketext('char_encoding'); |
my $enc=$lh->maketext('char_encoding'); |
return ($enc eq 'char_encoding'?$default:$enc); |
return ($enc eq 'char_encoding'?$default:$enc); |