--- loncom/localize/lonlocal.pm 2009/04/16 15:51:42 1.57 +++ loncom/localize/lonlocal.pm 2015/06/09 21:23:15 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.57 2009/04/16 15:51:42 www Exp $ +# $Id: lonlocal.pm,v 1.66 2015/06/09 21:23:15 damieng Exp $ # # Copyright Michigan State University Board of Trustees # @@ -81,7 +81,7 @@ Inside might be something like this if ($status eq 'WON') { $message='You have won.'; } elsif ($status eq 'LOST') { - $message='You are a total looser.'; + $message='You are a total loser.'; } return $message; } @@ -103,7 +103,7 @@ The first two examples are easy: if ($status eq 'WON') { $message='You have won.'; } elsif ($status eq 'LOST') { - $message='You are a total looser.'; + $message='You are a total loser.'; } return &mt($message); } @@ -135,7 +135,7 @@ like this: 'You have won.' => 'Sie haben gewonnen.', - 'You are a total looser.' + 'You are a total loser.' => 'Sie sind der totale Verlierer.', 'Rules' @@ -171,7 +171,7 @@ use DateTime::Locale; require Exporter; our @ISA = qw (Exporter); -our @EXPORT = qw(mt mtn ns mt_user); +our @EXPORT = qw(mt mtn ns mt_user js_escape html_escape); my %mtcache=(); @@ -262,9 +262,9 @@ sub preferred_languages { push(@languages,@browser); } - foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'}, - $Apache::lonnet::perlvar{'lonDefDomain'}) { - if ($domtype ne '') { + 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 '') && ($domtype ne 'public')) { my %domdefs = &Apache::lonnet::get_domain_defaults($domtype); if ($domdefs{'lang_def'} ne '') { push(@languages,$domdefs{'lang_def'}); @@ -295,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); @@ -326,7 +325,7 @@ sub current_locale { sub texthash { my %hash=@_; - foreach (keys %hash) { + foreach (keys(%hash)) { $hash{$_}=&mt($hash{$_}); } return %hash; @@ -335,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(); @@ -378,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 '') { @@ -395,6 +400,7 @@ sub gettimezone { sub locallocaltime { my ($thistime,$timezone) = @_; + if (!defined($thistime) || $thistime eq '') { return &mt('Never'); } @@ -408,7 +414,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)"); @@ -560,6 +575,117 @@ sub mt_escape { $$str_ref =~s/([\[\]])/~$1/g; } +=pod + +=item * js_escape + +js_escape takes a string, string reference or hash reference, +and escapes the values so that they can be used within a