[LON-CAPA-cvs] cvs: loncom /localize lonlocal.pm

[raeburn]

raeburn		Mon Dec  6 12:52:06 2010 EDT

  Modified files:              
    /loncom/localize	lonlocal.pm 
  Log:
  - Customization for GCI_3.
    - language codes are three characters or less.
  
Index: loncom/localize/lonlocal.pm
diff -u loncom/localize/lonlocal.pm:1.60.4.2 loncom/localize/lonlocal.pm:1.60.4.3
--- loncom/localize/lonlocal.pm:1.60.4.2        Mon Dec  6 00:35:19 2010
+++ loncom/localize/lonlocal.pm Mon Dec  6 17:52:20 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Localization routines
 #
-# $Id: lonlocal.pm,v 1.60.4.2 2010/12/06 00:35:19 raeburn Exp $
+# $Id: lonlocal.pm,v 1.60.4.3 2010/12/06 17:52:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -245,9 +245,9 @@
     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+ci/) {
-            return ($domtype);
-        } elsif ($domtype =~ /^(\w+c)itest$/) {
+        if ($domtype =~ /^(\w{2})\w?i$/) {
+            return ($1.'i');
+        } elsif ($domtype =~ /^(\w{2})\w?itest$/) {
             return ($1.'t');
         } else {
             return ('gci');