[BACK]Return to lonlocal.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / localize

Diff for /loncom/localize/lonlocal.pm between versions 1.50.2.2 and 1.57

version 1.50.2.2, 2009/01/05 16:55:04 version 1.57, 2009/04/16 15:51:42
Line 173  require Exporter; Line 173  require Exporter;
 our @ISA = qw (Exporter);  our @ISA = qw (Exporter);
 our @EXPORT = qw(mt mtn ns mt_user);  our @EXPORT = qw(mt mtn ns mt_user);
   
   my %mtcache=();
   
 # ========================================================= The language handle  # ========================================================= The language handle
   
 use vars qw($lh);  use vars qw($lh $current_language);
   
 # ===================================================== The "MakeText" function  # ===================================================== The "MakeText" function
   
Line 191  sub mt (@) { Line 193  sub mt (@) {
                 return $_[0];                  return $_[0];
             }              }
         } else {          } 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 {      } else {
  if (wantarray) {   if (wantarray) {
Line 287  sub get_genlanguages { Line 295  sub get_genlanguages {
   
 sub current_encoding {  sub current_encoding {
     my $default='UTF-8';      my $default='UTF-8';
     if ($Apache::lonnet::env{'browser.os'} eq 'win' &&   # UTF-8 character encoding needed for the whole LON-CAPA system
  $Apache::lonnet::env{'browser.type'} eq 'explorer') {  # (interface language and homework problem content)
         $default='ISO-8859-1';  # 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';
   #    }
     if ($lh) {      if ($lh) {
  my $enc=$lh->maketext('char_encoding');   my $enc=$lh->maketext('char_encoding');
  return ($enc eq 'char_encoding'?$default:$enc);   return ($enc eq 'char_encoding'?$default:$enc);
Line 332  sub get_language_handle { Line 343  sub get_language_handle {
     my @languages=&preferred_languages();      my @languages=&preferred_languages();
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';      $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     $lh=Apache::localize->get_handle(@languages);      $lh=Apache::localize->get_handle(@languages);
       $current_language=&current_language();
     if ($r) {      if ($r) {
  $r->content_languages([&current_language()]);   $r->content_languages([&current_language()]);
     }      }
Line 347  sub gettimezone { Line 359  sub gettimezone {
         }          }
         return $timezone;          return $timezone;
     }      }
     my $cid = $Apache::lonnet::env{'request.course.id'};      my $cid = $Apache::lonnet::env{'request.course.id'};  
     if ($cid ne '') {      if ($cid ne '') {
         if ($Apache::lonnet::env{'course.'.$cid.'.timezone'}) {          if ($Apache::lonnet::env{'course.'.$cid.'.timezone'}) {
             $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'};              $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'};    
         } else {          } else {
             my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'};              my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'};
             if ($cdom ne '') {              if ($cdom ne '') {
Line 469  sub getdatelocale { Line 481  sub getdatelocale {
     return $locale_obj;      return $locale_obj;
 }  }
   
   =pod 
   
   =item * normalize_string
   
 # ==================== Normalize string (reduce fragility in the lexicon files)  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 {  sub normalize_string {
     my $s = shift;      my $s = shift;
     $s =~ s/\s+/ /g;      $s =~ s/\s+/ /g;
Line 486  sub normalize_string { Line 504  sub normalize_string {
     return $s;      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 {  sub ns {
     return normalize_string(@_);      return normalize_string(@_);
 }  }
   
 # mtn: call the mt function and the normalization function easily.  =pod
 # Returns original non-normalized string if there was no translation  
   =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 (@) {  sub mtn (@) {
     my @args = @_; # don't want to modify caller's string; if we      my @args = @_; # don't want to modify caller's string; if we
    # didn't care about that we could set $_[0]     # didn't care about that we could set $_[0]
Removed from v.1.50.2.2  
changed lines
  Added in v.1.57

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>