--- loncom/localize/lonlocal.pm	2009/09/14 22:32:09	1.50.4.1
+++ 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.50.4.1 2009/09/14 22:32:09 raeburn Exp $
+# $Id: lonlocal.pm,v 1.51 2008/11/24 16:53:16 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,56 +233,6 @@ sub current_language {
     return 'en';
 }
 
-sub preferred_languages {
-    my @languages=();
-    if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) {
-        @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'form.languages'}));
-    }
-    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.languages'}) {
-        @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
-                 $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.languages'}));
-    }
-
-    if ($Apache::lonnet::env{'environment.languages'}) {
-        @languages=(@languages,
-                    split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'environment.languages'}));
-    }
-    my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
-    if ($browser) {
-        my @browser =
-            map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
-        push(@languages,@browser);
-    }
-
-    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},
-                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
-        if ($domtype ne '') {
-            my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
-            if ($domdefs{'lang_def'} ne '') {
-                push(@languages,$domdefs{'lang_def'});
-            }
-        }
-    }
-    return &get_genlanguages(@languages);
-}
-
-sub get_genlanguages {
-    my (@languages) = @_;
-# turn "en-ca" into "en-ca,en"
-    my @genlanguages;
-    foreach my $lang (@languages) {
-        unless ($lang=~/\w/) { next; }
-        push(@genlanguages,$lang);
-        if ($lang=~/(\-|\_)/) {
-            push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
-        }
-    }
-    #uniqueify the languages list
-    my %count;
-    @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
-    return @genlanguages;
-}
-
 # ============================================================== What encoding?
 
 sub current_encoding {
@@ -329,7 +279,7 @@ sub get_language_handle {
 	my $headers=$r->headers_in;
 	$ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
     }
-    my @languages=&preferred_languages();
+    my @languages=&Apache::loncommon::preferred_languages;
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     $lh=Apache::localize->get_handle(@languages);
     if ($r) {
@@ -340,24 +290,15 @@ sub get_language_handle {
 
 # ========================================================== Localize localtime
 sub gettimezone {
-    my ($timezone) = @_;
-    if ($timezone ne '') {
-        if (!DateTime::TimeZone->is_valid_name($timezone)) {
-            $timezone = 'local';
-        }
-        return $timezone;
-    }
-    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'};
-        } else {
-            my $cdom = $Apache::lonnet::env{'course.'.$cid.'.domain'};
-            if ($cdom ne '') {
-                my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
-                if ($domdefaults{'timezone_def'} ne '') {
-                    $timezone = $domdefaults{'timezone_def'};
-                }
+    my $timezone; 
+    if ($Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'}) {
+        $timezone = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.timezone'};    
+    } elsif ($Apache::lonnet::env{'request.course.id'} ne '') {
+        my $cdom = $Apache::lonnet::env{'course.'.$Apache::lonnet::env{'request.course.id'}.'.domain'};
+        if ($cdom ne '') {
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+            if ($domdefaults{'timezone_def'} ne '') {
+                $timezone = $domdefaults{'timezone_def'};
             }
         }
     } elsif ($Apache::lonnet::env{'request.role.domain'} ne '') {
@@ -382,7 +323,7 @@ sub gettimezone {
 }
 
 sub locallocaltime {
-    my ($thistime,$timezone) = @_;
+    my $thistime=shift;
     if (!defined($thistime) || $thistime eq '') {
 	return &mt('Never');
     }
@@ -396,7 +337,7 @@ sub locallocaltime {
     }
 
     my $dt = DateTime->from_epoch(epoch => $thistime)
-                     ->set_time_zone(&gettimezone($timezone));
+                     ->set_time_zone(&gettimezone());
     if ((&current_language=~/^en/) || (!$lh)) {
 
 	return $dt->strftime("%a %b %e %I:%M:%S %P %Y (%Z)");
@@ -469,13 +410,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;
@@ -486,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]