--- loncom/localize/lonlocal.pm 2008/05/31 23:37:49 1.45 +++ loncom/localize/lonlocal.pm 2009/01/05 16:55:04 1.50.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Localization routines # -# $Id: lonlocal.pm,v 1.45 2008/05/31 23:37:49 raeburn Exp $ +# $Id: lonlocal.pm,v 1.50.2.2 2009/01/05 16:55:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -165,11 +165,13 @@ use Apache::localize; use locale; use POSIX qw(locale_h strftime); use DateTime(); +use DateTime::TimeZone; +use DateTime::Locale; require Exporter; our @ISA = qw (Exporter); -our @EXPORT = qw(mt mtn ns); +our @EXPORT = qw(mt mtn ns mt_user); # ========================================================= The language handle @@ -200,6 +202,27 @@ sub mt (@) { } } +sub mt_user { + my ($user_lh,@what) = @_; + if ($user_lh) { + if ($what[0] eq '') { + if (wantarray) { + return @what; + } else { + return $what[0]; + } + } else { + return $user_lh->maketext(@what); + } + } else { + if (wantarray) { + return @what; + } else { + return $what[0]; + } + } +} + # ============================================================== What language? sub current_language { @@ -210,6 +233,56 @@ sub current_language { return 'en'; } +sub preferred_languages { + my @languages=(); + if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) { + @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'form.languages'})); + } + if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.languages'}) { + @languages=(@languages,split(/\s*(\,|\;|\:)\s*/, + $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.languages'})); + } + + if ($Apache::lonnet::env{'environment.languages'}) { + @languages=(@languages, + split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'environment.languages'})); + } + my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'}; + if ($browser) { + my @browser = + map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser)); + 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 %domdefs = &Apache::lonnet::get_domain_defaults($domtype); + if ($domdefs{'lang_def'} ne '') { + push(@languages,$domdefs{'lang_def'}); + } + } + } + return &get_genlanguages(@languages); +} + +sub get_genlanguages { + my (@languages) = @_; +# turn "en-ca" into "en-ca,en" + my @genlanguages; + foreach my $lang (@languages) { + unless ($lang=~/\w/) { next; } + push(@genlanguages,$lang); + if ($lang=~/(\-|\_)/) { + push(@genlanguages,(split(/(\-|\_)/,$lang))[0]); + } + } + #uniqueify the languages list + my %count; + @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages; + return @genlanguages; +} + # ============================================================== What encoding? sub current_encoding { @@ -256,7 +329,7 @@ sub get_language_handle { my $headers=$r->headers_in; $ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'}; } - my @languages=&Apache::loncommon::preferred_languages; + my @languages=&preferred_languages(); $ENV{'HTTP_ACCEPT_LANGUAGE'}=''; $lh=Apache::localize->get_handle(@languages); if ($r) { @@ -267,28 +340,63 @@ sub get_language_handle { # ========================================================== Localize localtime sub gettimezone { - if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) { - return $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}; - } elsif ($Apache::lonnet::env{'request.course.id'} ne '') { - my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'}; - if ($cdom ne '') { - my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); - if ($domdefaults{'timezone_def'} ne '') { - return $domdefaults{'timezone_def'}; + my ($timezone) = @_; + if ($timezone ne '') { + if (!DateTime::TimeZone->is_valid_name($timezone)) { + $timezone = 'local'; + } + return $timezone; + } + 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'}; + } else { + my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'}; + if ($cdom ne '') { + my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); + if ($domdefaults{'timezone_def'} ne '') { + $timezone = $domdefaults{'timezone_def'}; + } } } + } elsif ($Apache::lonnet::env{'request.role.domain'} ne '') { + my %uroledomdefs = + &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'request.role.domain'}); + if ($uroledomdefs{'timezone_def'} ne '') { + $timezone = $uroledomdefs{'timezone_def'}; + } + } elsif ($Apache::lonnet::env{'user.domain'} ne '') { + my %udomdefaults = + &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'}); + if ($udomdefaults{'timezone_def'} ne '') { + $timezone = $udomdefaults{'timezone_def'}; + } + } + if ($timezone ne '') { + if (DateTime::TimeZone->is_valid_name($timezone)) { + return $timezone; + } } return 'local'; } sub locallocaltime { - my $thistime=shift; + my ($thistime,$timezone) = @_; if (!defined($thistime) || $thistime eq '') { return &mt('Never'); } + if (($thistime < 0) || ($thistime eq 'NaN')) { + &Apache::lonnet::logthis("Unexpected time (negative or NaN) '$thistime' passed to lonlocal::locallocaltime"); + return &mt('Never'); + } + if ($thistime !~ /^\d+$/) { + &Apache::lonnet::logthis("Unexpected non-numeric time '$thistime' passed to lonlocal::locallocaltime"); + return &mt('Never'); + } my $dt = DateTime->from_epoch(epoch => $thistime) - ->set_time_zone(&gettimezone()); + ->set_time_zone(&gettimezone($timezone)); if ((¤t_language=~/^en/) || (!$lh)) { return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)"); @@ -330,6 +438,38 @@ sub locallocaltime { } } +sub getdatelocale { + my ($datelocale,$locale_obj); + if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.datelocale'}) { + $datelocale = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.datelocale'}; + } elsif ($Apache::lonnet::env{'request.course.id'} ne '') { + my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'}; + if ($cdom ne '') { + my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); + if ($domdefaults{'datelocale_def'} ne '') { + $datelocale = $domdefaults{'datelocale_def'}; + } + } + } elsif ($Apache::lonnet::env{'user.domain'} ne '') { + my %udomdefaults = &Apache::lonnet::get_domain_defaults($Apache::lonnet::env{'user.domain'}); + if ($udomdefaults{'datelocale_def'} ne '') { + $datelocale = $udomdefaults{'datelocale_def'}; + } + } + if ($datelocale ne '') { + eval { + $locale_obj = DateTime::Locale->load($datelocale); + }; + if (!$@) { + if ($locale_obj->id() eq $datelocale) { + return $locale_obj; + } + } + } + return $locale_obj; +} + + # ==================== Normalize string (reduce fragility in the lexicon files) # This normalizes a string to reduce fragility in the lexicon files of