--- loncom/localize/lonlocal.pm 2010/12/06 00:35:19 1.60.4.2 +++ loncom/localize/lonlocal.pm 2011/08/03 18:25:16 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.60.4.2 2010/12/06 00:35:19 raeburn Exp $ +# $Id: lonlocal.pm,v 1.63 2011/08/03 18:25:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -242,17 +242,6 @@ 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+ci/) { - return ($domtype); - } elsif ($domtype =~ /^(\w+c)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'})); @@ -273,8 +262,9 @@ 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 '') { + if (($domtype ne '') && ($domtype ne 'public')) { my %domdefs = &Apache::lonnet::get_domain_defaults($domtype); if ($domdefs{'lang_def'} ne '') { push(@languages,$domdefs{'lang_def'}); @@ -305,13 +295,12 @@ sub get_genlanguages { sub current_encoding { my $default='UTF-8'; -# UTF-8 character encoding needed for the whole LON-CAPA system -# (interface language and homework problem content) -# See Bugzilla 5702 vs. 2189 and 4067 -# if ($Apache::lonnet::env{'browser.os'} eq 'win' && -# $Apache::lonnet::env{'browser.type'} eq 'explorer') { -# $default='ISO-8859-1'; -# } + unless ($Apache::lonnet::env{'browser.unicode'}) { + if ($Apache::lonnet::env{'browser.os'} eq 'win' && + $Apache::lonnet::env{'browser.type'} eq 'explorer') { + $default='ISO-8859-1'; + } + } if ($lh) { my $enc=$lh->maketext('char_encoding'); return ($enc eq 'char_encoding'?$default:$enc); @@ -345,12 +334,17 @@ sub texthash { # ========= Get a handle (do not invoke in vain, leave this to access handlers) sub get_language_handle { - my $r=shift; + my ($r,$chosen) = @_; if ($r) { my $headers=$r->headers_in; $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'}; } - my @languages=&preferred_languages(); + my @languages; + if ($chosen ne '') { + @languages=($chosen); + } else { + @languages=&preferred_languages(); + } $ENV{'HTTP_ACCEPT_LANGUAGE'}=''; $lh=Apache::localize->get_handle(@languages); $current_language=¤t_language(); @@ -388,7 +382,8 @@ sub gettimezone { if ($uroledomdefs{'timezone_def'} ne '') { $timezone = $uroledomdefs{'timezone_def'}; } - } elsif ($Apache::lonnet::env{'user.domain'} ne '') { + } elsif (($Apache::lonnet::env{'user.domain'} ne '') && + ($Apache::lonnet::env{'user.domain'} ne 'public')) { my %udomdefaults = &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'}); if ($udomdefaults{'timezone_def'} ne '') { @@ -580,6 +575,44 @@ sub mt_escape { $$str_ref =~s/([\[\]])/~$1/g; } +=pod + +=item * choose_language + +choose_language prompts a user to enter a two letter language code via +keyboard when running a script from the command line. Default is en. + +=cut + +sub choose_language { + my %languages = ( + ar => 'Arabic', + de => 'German', + en => 'English', + es => 'Spanish', + fa => 'Persian', + fr => 'French', + he => 'Hebrew', + ja => 'Japanese', + pt => 'Portuguese', + ru => 'Russian', + tr => 'Turkish', + zh => 'Chinese (Simplified)' + ); + my @posslangs = sort(keys(%languages)); + my $langlist = join('|',@posslangs); + my $lang = 'en'; + print 'Language: English (en). Change? ['.$langlist.']? '; + my $langchoice = ; + chomp($langchoice); + $langchoice =~ s/(^\s+|\s+$)//g; + $langchoice = lc($langchoice); + if (defined($languages{$langchoice})) { + $lang = $langchoice; + } + return $lang; +} + 1; __END__