--- loncom/localize/lonlocal.pm	2005/02/17 08:51:08	1.32
+++ loncom/localize/lonlocal.pm	2005/11/14 19:53:03	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.32 2005/02/17 08:51:08 albertel Exp $
+# $Id: lonlocal.pm,v 1.36 2005/11/14 19:53:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,7 +163,6 @@ package Apache::lonlocal;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::localize;
-use Apache::File;
 use locale;
 use POSIX qw(locale_h);
 
@@ -179,9 +178,9 @@ use vars qw($lh);
 # ===================================================== The "MakeText" function
 
 sub mt (@) {
-#    my $fh=Apache::File->new('>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
-#    print $fh @_[0]."\n";
-#    $fh->close();
+#    open(LOG,'>>/home/www/loncapa/loncom/localize/localize/newphrases.txt');
+#    print LOG (@_[0]."\n");
+#    close(LOG);
     if ($lh) {
 	return $lh->maketext(@_);
     } else {
@@ -206,11 +205,16 @@ sub current_language {
 # ============================================================== What encoding?
 
 sub current_encoding {
+    my $default='UTF-8';
+    if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
+	$Apache::lonnet::env{'browser.type'} eq 'explorer') {
+        $default='ISO-8859-1';
+    }
     if ($lh) {
 	my $enc=$lh->maketext('char_encoding');
-	return ($enc eq 'char_encoding'?'UTF-8':$enc);
+	return ($enc eq 'char_encoding'?$default:$enc);
     } else {
-	return 'UTF-8';
+	return $default;
     }
 }
 
@@ -254,11 +258,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') {
@@ -288,7 +295,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone();
     }
 }