--- loncom/localize/lonlocal.pm	2003/12/10 00:32:56	1.27
+++ loncom/localize/lonlocal.pm	2006/04/07 22:03:55	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.27 2003/12/10 00:32:56 www Exp $
+# $Id: lonlocal.pm,v 1.38 2006/04/07 22:03:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,9 +161,7 @@ but for most purposes, we do not have to
 package Apache::lonlocal;
 
 use strict;
-use Apache::Constants qw(:common);
 use Apache::localize;
-use Apache::File;
 use locale;
 use POSIX qw(locale_h);
 
@@ -179,13 +177,17 @@ 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 {
-	return @_;
+	if (wantarray) {
+	    return @_;
+	} else {
+	    return $_[0];
+	}
     }
 }
 
@@ -202,11 +204,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,19 +243,28 @@ sub texthash {
 
 sub get_language_handle {
     my $r=shift;
-    $lh=Apache::localize->get_handle(&Apache::loncommon::preferred_languages);
-    if (&Apache::lonnet::mod_perl_version == 1) {
+    if ($r) {
+	my $headers=$r->headers_in;
+	$ENV{'HTTP_ACCEPT_LANGUAGE'}=$headers->{'Accept-language'};
+    }
+    my @languages=&Apache::loncommon::preferred_languages;
+    $ENV{'HTTP_ACCEPT_LANGUAGE'}='';
+    $lh=Apache::localize->get_handle(@languages);
+    if ($r) {
 	$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') {
@@ -278,7 +294,7 @@ sub locallocaltime {
 	 'month','weekday','ampm') {
 	    $format=~s/\$$_/eval('$'.$_)/gse;
 	}
-	return $format;
+	return $format.&gettimezone();
     }
 }
 
@@ -325,24 +341,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__