--- loncom/localize/lonlocal.pm	2008/09/19 03:27:04	1.49
+++ loncom/localize/lonlocal.pm	2008/11/24 16:53:16	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.49 2008/09/19 03:27:04 raeburn Exp $
+# $Id: lonlocal.pm,v 1.51 2008/11/24 16:53:16 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -301,6 +301,18 @@ sub gettimezone {
                 $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)) {
@@ -398,13 +410,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;
@@ -415,13 +433,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]