--- loncom/localize/lonlocal.pm	2010/12/06 17:52:20	1.60.4.3
+++ loncom/localize/lonlocal.pm	2010/07/07 16:30:48	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.60.4.3 2010/12/06 17:52:20 raeburn Exp $
+# $Id: lonlocal.pm,v 1.61 2010/07/07 16:30:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -242,17 +242,6 @@ sub current_language {
 }
 
 sub preferred_languages {
-    my $defdom = &Apache::lonnet::default_login_domain();
-    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
-        next if ($domtype eq '');
-        if ($domtype =~ /^(\w{2})\w?i$/) {
-            return ($1.'i');
-        } elsif ($domtype =~ /^(\w{2})\w?itest$/) {
-            return ($1.'t');
-        } else {
-            return ('gci');
-        }
-    }
     my @languages=();
     if (($Apache::lonnet::env{'request.role.adv'}) && ($Apache::lonnet::env{'form.languages'})) {
         @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$Apache::lonnet::env{'form.languages'}));
@@ -273,6 +262,7 @@ sub preferred_languages {
         push(@languages,@browser);
     }
 
+    my $defdom = &Apache::lonnet::default_login_domain();
     foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},$defdom) {
         if ($domtype ne '') {
             my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
@@ -305,13 +295,12 @@ sub get_genlanguages {
 
 sub current_encoding {
     my $default='UTF-8';
-# UTF-8 character encoding needed for the whole LON-CAPA system
-# (interface language and homework problem content)
-# See Bugzilla 5702 vs. 2189 and 4067
-#    if ($Apache::lonnet::env{'browser.os'} eq 'win' && 
-#	$Apache::lonnet::env{'browser.type'} eq 'explorer') {
-#        $default='ISO-8859-1';
-#    }
+    unless ($Apache::lonnet::env{'browser.unicode'}) {
+        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'?$default:$enc);