--- loncom/localize/lonlocal.pm	2003/12/22 22:39:07	1.28
+++ 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.28 2003/12/22 22:39:07 www Exp $
+# $Id: lonlocal.pm,v 1.35 2005/11/10 19:19:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,11 @@ sub mt (@) {
     if ($lh) {
 	return $lh->maketext(@_);
     } else {
-	return @_;
+	if (wantarray) {
+	    return @_;
+	} else {
+	    return $_[0];
+	}
     }
 }
 
@@ -202,11 +206,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'?'':$enc);
+	return ($enc eq 'char_encoding'?$default:$enc);
     } else {
-	return undef;
+	return $default;
     }
 }
 
@@ -236,26 +245,28 @@ sub texthash {
 
 sub get_language_handle {
     my $r=shift;
-    my $languages=&Apache::loncommon::preferred_languages;
-    unless ($languages) {
+    if ($r) {
 	my $headers=$r->headers_in;
 	$ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
-    } else {
-	$ENV{'HTTP_ACCEPT_LANGUAGE'}='';
     }
-    $lh=Apache::localize->get_handle($languages);
-    if (&Apache::lonnet::mod_perl_version == 1) {
+    my @languages=&Apache::loncommon::preferred_languages;
+    $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
+    $lh=Apache::localize->get_handle(@languages);
+    if ($r && &Apache::lonnet::mod_perl_version == 1) {
 	$r->content_languages([&current_language()]);
     }
 ###    setlocale(LC_ALL,&current_locale);
 }
 
 # ========================================================== 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') {
@@ -285,7 +296,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone();
     }
 }