--- loncom/localize/lonlocal.pm	2005/04/18 22:17:45	1.33
+++ loncom/localize/lonlocal.pm	2005/11/10 19:19:51	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.33 2005/04/18 22:17:45 albertel Exp $
+# $Id: lonlocal.pm,v 1.35 2005/11/10 19:19:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,7 +209,7 @@ sub current_encoding {
     my $default='UTF-8';
     if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
 	$Apache::lonnet::env{'browser.type'} eq 'explorer') {
-        $default=undef;
+        $default='ISO-8859-1';
     }
     if ($lh) {
 	my $enc=$lh->maketext('char_encoding');
@@ -259,11 +259,14 @@ sub get_language_handle {
 }
 
 # ========================================================== Localize localtime
+sub gettimezone {
+    return ' ('.$Apache::lonnet::env{'server.timezone'}.')';
+}
 
 sub locallocaltime {
     my $thistime=shift;
     if ((&current_language=~/^en/) || (!$lh)) {
-	return ''.localtime($thistime);
+	return ''.localtime($thistime).&gettimezone();
     } else {
 	my $format=$lh->maketext('date_locale');
 	if ($format eq 'date_locale') {
@@ -293,7 +296,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone();
     }
 }