--- loncom/localize/lonlocal.pm 2006/04/07 22:03:55 1.38 +++ 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.38 2006/04/07 22:03:55 albertel Exp $ +# $Id: lonlocal.pm,v 1.39 2006/04/20 04:30:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -163,7 +163,7 @@ package Apache::lonlocal; use strict; use Apache::localize; use locale; -use POSIX qw(locale_h); +use POSIX qw(locale_h strftime); require Exporter; @@ -258,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 ((¤t_language=~/^en/) || (!$lh)) { - return ''.localtime($thistime).&gettimezone(); + return ''.localtime($thistime).&gettimezone($thistime); } else { my $format=$lh->maketext('date_locale'); if ($format eq 'date_locale') { @@ -294,7 +295,7 @@ sub locallocaltime { 'month','weekday','ampm') { $format=~s/\$$_/eval('$'.$_)/gse; } - return $format.&gettimezone(); + return $format.&gettimezone($thistime); } }