--- loncom/localize/lonlocal.pm	2010/02/12 14:20:41	1.50.2.3
+++ loncom/localize/lonlocal.pm	2009/01/02 23:07:52	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.50.2.3 2010/02/12 14:20:41 raeburn Exp $
+# $Id: lonlocal.pm,v 1.53 2009/01/02 23:07:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -347,10 +347,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 '') {
@@ -397,15 +397,6 @@ sub locallocaltime {
 
     my $dt = DateTime->from_epoch(epoch => $thistime)
                      ->set_time_zone(&gettimezone($timezone));
-
-    # TimeZone tries to determine the 'local' timezone from $ENV{TZ} if this
-    # fails it searches through various system files. Under certain
-    # circumstances this is an extremly expensive operation.
-    # So after the first run we store the timezone in $ENV{TZ} to significantly
-    # speed up future lookups.
-    $ENV{TZ} = $dt->time_zone()->name()
-        if (! $ENV{TZ} && gettimezone($timezone) eq 'local');
-
     if ((&current_language=~/^en/) || (!$lh)) {
 
 	return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
@@ -478,13 +469,19 @@ sub getdatelocale {
     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 {
     my $s = shift;
     $s =~ s/\s+/ /g;
@@ -495,13 +492,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]