[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

[raeburn]

raeburn		Tue May 12 00:20:43 2015 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    Backport 1.263. 
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.62 loncom/interface/domainprefs.pm:1.160.6.63
--- loncom/interface/domainprefs.pm:1.160.6.62	Tue May  5 14:58:48 2015
+++ loncom/interface/domainprefs.pm	Tue May 12 00:20:42 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.62 2015/05/05 14:58:48 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.63 2015/05/12 00:20:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4696,11 +4696,8 @@
                 my $includeempty = 1;
                 $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
             } elsif ($item eq 'lang_def') {
-                my %langchoices = &get_languages_hash();
-                $langchoices{''} = 'No language preference';
-                %langchoices = &Apache::lonlocal::texthash(%langchoices);
-                $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
-                                                              \%langchoices);
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
             } else {
                 my $size;
                 if ($item eq 'portal_def') {
@@ -4769,7 +4766,7 @@
                     $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                 }
                 $datatable .= '</select> '.&mt('Internal ID:').
-                              '<input type="text" size="10" name="addinststatus" value="" /></span>'.
+                              '<input type="text" size="10" name="addinststatus" value="" />'.
                               ' '.&mt('(new)').
                               '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
                               &mt('Name displayed:').