--- loncom/interface/lonpreferences.pm	2013/01/04 00:23:31	1.202
+++ loncom/interface/lonpreferences.pm	2013/06/07 16:07:46	1.205
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.202 2013/01/04 00:23:31 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.205 2013/06/07 16:07:46 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,32 +152,16 @@ sub languagechanger {
                 text => 'Change Language'});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language')); 
-    my $user       = $env{'user.name'};
-    my $domain     = $env{'user.domain'};
-    my %userenv = &Apache::lonnet::get
-        ('environment',['languages']);
+    my %userenv = &Apache::lonnet::get('environment',['languages']);
     my $language=$userenv{'languages'};
 
-    my $pref=&mt('Preferred language');
-    my %langchoices=('' => 'No language preference');
-    foreach (&Apache::loncommon::languageids()) {
-	if (&Apache::loncommon::supportedlanguagecode($_)) {
-	    $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
-	               = &Apache::loncommon::plainlanguagedescription($_);
-	}
-    }
-    %langchoices = &Apache::lonlocal::texthash(%langchoices);
-    my $selectionbox=
-           &Apache::loncommon::select_form(
-               $language,
-               'language',
-               \%langchoices);
-    $r->print(<<ENDLSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_languages" />
-<br />$pref: $selectionbox
-ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
+    $r->print(
+        '<form name="prefs" action="/adm/preferences" method="post">'."\n".
+        '<input type="hidden" name="action" value="verify_and_change_languages" />'.
+        '<br /><span class="LC_nobreak">'.&mt('Preferred language').':&nbsp;'.
+        &Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
+        '<br /><input type="submit" value="'.&mt('Save').'" /></form>'
+    );
 }
 
 
@@ -807,8 +791,8 @@ sub domcoordchanger {
     if ($userenv{'domcoord.author'} eq 'blocked') {
        $constchecked=' checked="checked"';
     }
-    my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
-    my $construction=&mt('Block access to construction space');
+    my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
+    my $construction=&mt('Block access to Authoring Space');
     my $change=&mt('Save');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
@@ -834,7 +818,7 @@ sub verify_and_change_domcoord {
     } else {
         $status=&mt('off');
     }
-    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r,$message);
 }