--- loncom/localize/lonlocal.pm	2009/09/14 22:34:41	1.50.4.2
+++ loncom/localize/lonlocal.pm	2009/02/01 21:54:30	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.50.4.2 2009/09/14 22:34:41 raeburn Exp $
+# $Id: lonlocal.pm,v 1.54 2009/02/01 21:54:30 lueken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -179,6 +179,10 @@ use vars qw($lh);
 
 # ===================================================== The "MakeText" function
 
+######### Localize Cache
+my @localize_cache;
+#########
+
 sub mt (@) {
 #    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
 #    print LOG (@_[0]."\n");
@@ -191,7 +195,18 @@ sub mt (@) {
                 return $_[0];
             }
         } 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 {
 	if (wantarray) {
@@ -234,7 +249,6 @@ sub current_language {
 }
 
 sub preferred_languages {
-    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'}));
@@ -348,10 +362,10 @@ sub gettimezone {
         }
         return $timezone;
     }
-    my $cid = $Apache::lonnet::env{'request.course.id'};
+    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'};
+            $timezone = $Apache::lonnet::env{'course.'.$cid.'.timezone'};    
         } else {
             my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'};
             if ($cdom ne '') {
@@ -470,13 +484,19 @@ sub getdatelocale {
     return $locale_obj;
 }
 
+=pod 
+
+=item * normalize_string
+
+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
 
-# ==================== Normalize string (reduce fragility in the lexicon files)
+=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 {
     my $s = shift;
     $s =~ s/\s+/ /g;
@@ -487,13 +507,27 @@ sub normalize_string {
     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 {
     return normalize_string(@_);
 }
 
-# mtn: call the mt function and the normalization function easily.
-# Returns original non-normalized string if there was no translation
+=pod
+
+=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 (@) {
     my @args = @_; # don't want to modify caller's string; if we
 		   # didn't care about that we could set $_[0]