--- loncom/localize/lonlocal.pm 2009/09/14 22:32:09 1.50.4.1 +++ loncom/localize/lonlocal.pm 2011/03/28 21:10:41 1.62 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.50.4.1 2009/09/14 22:32:09 raeburn Exp $ +# $Id: lonlocal.pm,v 1.62 2011/03/28 21:10:41 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -173,9 +173,11 @@ require Exporter; our @ISA = qw (Exporter); our @EXPORT = qw(mt mtn ns mt_user); +my %mtcache=(); + # ========================================================= The language handle -use vars qw($lh); +use vars qw($lh $current_language); # ===================================================== The "MakeText" function @@ -191,7 +193,13 @@ sub mt (@) { return $_[0]; } } else { - return $lh->maketext(@_); + if ($#_>0) { return $lh->maketext(@_); } + if ($mtcache{$current_language.':'.$_[0]}) { + return $mtcache{$current_language.':'.$_[0]}; + } + my $translation=$lh->maketext(@_); + $mtcache{$current_language.':'.$_[0]}=$translation; + return $translation; } } else { if (wantarray) { @@ -254,8 +262,8 @@ sub preferred_languages { push(@languages,@browser); } - foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'}, - $Apache::lonnet::perlvar{'lonDefDomain'}) { + 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); if ($domdefs{'lang_def'} ne '') { @@ -287,9 +295,11 @@ sub get_genlanguages { sub current_encoding { my $default='UTF-8'; - 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'); @@ -324,14 +334,20 @@ 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(); if ($r) { $r->content_languages([¤t_language()]); } @@ -347,10 +363,10 @@ sub gettimezone { } return $timezone; } - my $cid = $Apache::lonnet::env{'request.course.id'}; + my $cid = $Apache::lonnet::env{'request.course.id'}; if ($cid ne '') { if ($Apache::lonnet::env{'course.'.$cid.'.timezone'}) { - $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'}; + $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'}; } else { my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'}; if ($cdom ne '') { @@ -383,6 +399,7 @@ sub gettimezone { sub locallocaltime { my ($thistime,$timezone) = @_; + if (!defined($thistime) || $thistime eq '') { return &mt('Never'); } @@ -396,7 +413,16 @@ sub locallocaltime { } my $dt = DateTime->from_epoch(epoch => $thistime) - ->set_time_zone(&gettimezone($timezone)); + ->set_time_zone(gettimezone($timezone)); + + # TimeZone tries to determine the 'local' timezone from $ENV{TZ} if this + # fails it searches through various system files. Under certain + # circumstances this is an extremly expensive operation. + # So after the first run we store the timezone in $ENV{TZ} to significantly + # speed up future lookups. + $ENV{TZ} = $dt->time_zone()->name() + if (! $ENV{TZ} && gettimezone($timezone) eq 'local'); + if ((¤t_language=~/^en/) || (!$lh)) { return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)"); @@ -469,13 +495,19 @@ sub getdatelocale { return $locale_obj; } +=pod -# ==================== Normalize string (reduce fragility in the lexicon files) +=item * normalize_string + +Normalize string (reduce fragility in the lexicon files) + +This normalizes a string to reduce fragility in the lexicon files of +huge messages (such as are used by the helper), and allow useful +formatting: reduce all consecutive whitespace to a single space, +and remove all HTML + +=cut -# This normalizes a string to reduce fragility in the lexicon files of -# huge messages (such as are used by the helper), and allow useful -# formatting: reduce all consecutive whitespace to a single space, -# and remove all HTML sub normalize_string { my $s = shift; $s =~ s/\s+/ /g; @@ -486,13 +518,27 @@ sub normalize_string { return $s; } -# alias for normalize_string; recommend using it only in the lexicon +=pod + +=item * ns + +alias for normalize_string; recommend using it only in the lexicon + +=cut + sub ns { return normalize_string(@_); } -# mtn: call the mt function and the normalization function easily. -# Returns original non-normalized string if there was no translation +=pod + +=item * mtn + +mtn: call the mt function and the normalization function easily. +Returns original non-normalized string if there was no translation + +=cut + sub mtn (@) { my @args = @_; # don't want to modify caller's string; if we # didn't care about that we could set $_[0] @@ -528,6 +574,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__