--- loncom/localize/lonlocal.pm 2009/10/02 16:59:29 1.60.2.1 +++ loncom/localize/lonlocal.pm 2022/09/08 01:41:14 1.69 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.60.2.1 2009/10/02 16:59:29 raeburn Exp $ +# $Id: lonlocal.pm,v 1.69 2022/09/08 01:41:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,7 @@ Apache::lonlocal - provides localization lonlocal provides localization services for LON-CAPA programmers based on Locale::Maketext. See -C +C for more information on Maketext. =head1 OVERVIEWX @@ -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' @@ -153,7 +153,7 @@ ignore the rest of the line. This is a relatively easy task, and any help is appreciated. Maketext can do a whole lot more, see -C +C but for most purposes, we do not have to mess with that. =cut @@ -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=(); @@ -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 eq 'gci') { - return ('gci'); - } elsif ($domtype eq 'gcitest') { - return ('gct'); - } 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); @@ -336,7 +325,7 @@ sub current_locale { sub texthash { my %hash=@_; - foreach (keys %hash) { + foreach (keys(%hash)) { $hash{$_}=&mt($hash{$_}); } return %hash; @@ -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(); @@ -369,7 +363,25 @@ sub gettimezone { } return $timezone; } - my $cid = $Apache::lonnet::env{'request.course.id'}; + my $cid = $Apache::lonnet::env{'request.course.id'}; + if (&Apache::lonnet::usertools_access($Apache::lonnet::env{'user.name'}, + $Apache::lonnet::env{'user.domain'}, + 'timezone')) { + if ($Apache::lonnet::env{'environment.timezone'} ne '') { + $timezone = $Apache::lonnet::env{'environment.timezone'}; + if ($cid ne '') { + if (($Apache::lonnet::env{'course.'.$cid.'.tzover'}) && + ($Apache::lonnet::env{'course.'.$cid.'.timezone'} ne '')) { + $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'}; + } + } + if ($timezone ne '') { + if (DateTime::TimeZone->is_valid_name($timezone)) { + return $timezone; + } + } + } + } if ($cid ne '') { if ($Apache::lonnet::env{'course.'.$cid.'.timezone'}) { $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'}; @@ -388,7 +400,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 '') { @@ -501,9 +514,11 @@ sub getdatelocale { return $locale_obj; } -=pod +=pod + +=over -=item * normalize_string +=item * normalize_string() Normalize string (reduce fragility in the lexicon files) @@ -526,7 +541,7 @@ sub normalize_string { =pod -=item * ns +=item * ns() alias for normalize_string; recommend using it only in the lexicon @@ -538,7 +553,7 @@ sub ns { =pod -=item * mtn +=item * mtn() mtn: call the mt function and the normalization function easily. Returns original non-normalized string if there was no translation @@ -567,7 +582,7 @@ sub transstatic { =pod -=item * mt_escape +=item * mt_escape() mt_escape takes a string reference and escape the [] in there so mt will leave them as is and not try to expand them @@ -580,6 +595,119 @@ 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