--- loncom/localize/lonlocal.pm	2009/05/06 19:25:49	1.59
+++ loncom/localize/lonlocal.pm	2009/10/02 16:59:29	1.60.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.59 2009/05/06 19:25:49 droeschl Exp $
+# $Id: lonlocal.pm,v 1.60.2.1 2009/10/02 16:59:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -242,6 +242,17 @@ 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 eq 'gci') {
+            return ('gci');
+        } elsif ($domtype eq 'gcitest') {
+            return ('gct');
+        } 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'}));
@@ -262,8 +273,7 @@ sub preferred_languages {
         push(@languages,@browser);
     }
 
-    foreach my $domtype ($Apache::lonnet::env{'user.domain'},$Apache::lonnet::env{'request.role.domain'},
-                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
+    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);
             if ($domdefs{'lang_def'} ne '') {