[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.4.1 and 1.54

version 1.50.4.1, 2009/09/14 22:32:09 version 1.54, 2009/02/01 21:54:30
Line 179  use vars qw($lh); Line 179  use vars qw($lh);
   
 # ===================================================== The "MakeText" function  # ===================================================== The "MakeText" function
   
   ######### Localize Cache
   my @localize_cache;
   #########
   
 sub mt (@) {  sub mt (@) {
 #    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');  #    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
 #    print LOG (@_[0]."\n");  #    print LOG (@_[0]."\n");
Line 191  sub mt (@) { Line 195  sub mt (@) {
                 return $_[0];                  return $_[0];
             }              }
         } else {          } else {
             return $lh->maketext(@_);   ######### Localize Cache
    foreach my $e (@localize_cache)
    {
    if($_[0] eq $$e[0]) { return $$e[1]; }
    }
   
    if($#localize_cache == 100) { pop(@localize_cache); }
    my $localize_entry = $lh->maketext(@_);
    unshift(@localize_cache, [ @_, $localize_entry ] );
    #########
               
        return $localize_entry;
         }          }
     } else {      } else {
  if (wantarray) {   if (wantarray) {
Line 347  sub gettimezone { Line 362  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 484  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 507  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.4.1  
changed lines
  Added in v.1.54

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