--- loncom/localize/lonlocal.pm	2005/11/14 19:53:03	1.36
+++ loncom/localize/lonlocal.pm	2006/04/20 04:30:23	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.36 2005/11/14 19:53:03 albertel Exp $
+# $Id: lonlocal.pm,v 1.39 2006/04/20 04:30:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,10 +161,9 @@ but for most purposes, we do not have to
 package Apache::lonlocal;
 
 use strict;
-use Apache::Constants qw(:common);
 use Apache::localize;
 use locale;
-use POSIX qw(locale_h);
+use POSIX qw(locale_h strftime);
 
 require Exporter;
 
@@ -251,7 +250,7 @@ sub get_language_handle {
     my @languages=&Apache::loncommon::preferred_languages;
     $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     $lh=Apache::localize->get_handle(@languages);
-    if ($r && &Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
 	$r->content_languages([&current_language()]);
     }
 ###    setlocale(LC_ALL,&current_locale);
@@ -259,13 +258,14 @@ sub get_language_handle {
 
 # ========================================================== Localize localtime
 sub gettimezone {
-    return ' ('.$Apache::lonnet::env{'server.timezone'}.')';
+    my ($time) = @_;
+    return ' ('.&strftime("%Z",localtime($time)).')';
 }
 
 sub locallocaltime {
     my $thistime=shift;
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime).&gettimezone();
+	return ''.localtime($thistime).&gettimezone($thistime);
     } else {
 	my $format=$lh->maketext('date_locale');
 	if ($format eq 'date_locale') {
@@ -295,7 +295,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format.&gettimezone();
+	return $format.&gettimezone($thistime);
     }
 }
 
@@ -342,24 +342,6 @@ sub transstatic {
     $$strptr=~s/MT\{([^\}]*)\}/&mt($1)/gse;
 }
 
-# ----------------------------------------------- Handler Routine /adm/localize
-sub handler {
-    my $r=shift;
-    &Apache::lonlocal::get_language_handle($r);
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
-
-    my $uri=$r->uri;
-    $uri=~s/^\/adm\/localize//;
-    my $fn=$Apache::lonnet::perlvar{'lonDocRoot'}.$uri;
-
-    my $file=&Apache::lonnet::getfile($fn);
-    &transstatic(\$file);
-    $r->print($file);
-    return OK;
-}
-
 1;
 
 __END__