--- loncom/interface/lonpreferences.pm	2009/01/14 15:46:19	1.133
+++ loncom/interface/lonpreferences.pm	2009/02/19 11:27:52	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.133 2009/01/14 15:46:19 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.142 2009/02/19 11:27:52 zhu Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,7 +126,7 @@ $warning
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
 <label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
 }
 
 
@@ -172,7 +172,7 @@ sub languagechanger {
 <input type="hidden" name="action" value="verify_and_change_languages" />
 <br />$pref: $selectionbox
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
 }
 
 
@@ -190,7 +190,7 @@ sub verify_and_change_languages {
         $message=&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['languages']);
-        &Apache::lonnet::delenv('environment\.languages');
+        &Apache::lonnet::delenv('environment.languages');
         $message=&mt('Reset preferred language.');
     }
     &Apache::loncommon::flush_langs_cache($user,$domain);
@@ -227,7 +227,7 @@ sub texenginechanger {
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change Math Preferences',
       'preftxt'  => 'Preferred method to display Math',
-      'change'   => 'Change',
+      'change'   => 'Save',
       'exmpl'    => 'Examples',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
@@ -239,8 +239,9 @@ sub texenginechanger {
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_texengine" />
 <p>
-$lt{'preftxt'}:<br />
-$selectionbox <input type="submit" value="$lt{'change'}" />
+$lt{'preftxt'}: $selectionbox 
+<br />
+<input type="submit" value="$lt{'change'}" />
 </p>
 </form>
 <br />
@@ -306,7 +307,7 @@ sub verify_and_change_texengine {
         $message=&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['texengine']);
-        &Apache::lonnet::delenv('environment\.texengine');
+        &Apache::lonnet::delenv('environment.texengine');
         $message=&mt('Reset preferred math display.');
     }
 
@@ -402,7 +403,7 @@ sub rolesprefchanger {
 </p>
 '.$roles_check_list.'
 <br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
 
@@ -451,7 +452,7 @@ sub verify_and_change_rolespref {
         $message=&mt('Recent '.$role.'s Hotlist is Enabled');
     } else {
         &Apache::lonnet::del('environment',['recentroles']);
-        &Apache::lonnet::delenv('environment\.recentroles');
+        &Apache::lonnet::delenv('environment.recentroles');
         $message=&mt('Recent '.$role.'s Hotlist is Disabled');
     }
     if ($hotlist_n) {
@@ -555,7 +556,7 @@ sub verify_and_change_screenname {
         $message=&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.';
     } else {
         &Apache::lonnet::del('environment',['screenname']);
-        &Apache::lonnet::delenv('environment\.screenname');
+        &Apache::lonnet::delenv('environment.screenname');
         $message=&mt('Reset screenname.');
     }
 # Nickname
@@ -568,7 +569,7 @@ sub verify_and_change_screenname {
         $message.=&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.';
     } else {
         &Apache::lonnet::del('environment',['nickname']);
-        &Apache::lonnet::delenv('environment\.nickname');
+        &Apache::lonnet::delenv('environment.nickname');
         $message.=&mt('Reset nickname.');
     }
     &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
@@ -607,7 +608,7 @@ sub iconchanger {
     my $useicons=&mt('Use icons and text');
     my $usebuttons=&mt('Use buttons and text');
     my $useicononly=&mt('Use icons only');
-    my $change=&mt('Change');
+    my $change=&mt('Save');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_icons" />
@@ -700,7 +701,7 @@ sub domcoordchanger {
     }
     my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
     my $construction=&mt('Block access to construction space');
-    my $change=&mt('Change');
+    my $change=&mt('Save');
     $r->print(<<ENDSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_domcoord" />
@@ -779,11 +780,11 @@ sub msgforwardchanger {
                                           mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
  # old: 'Message Notification Email Address(es)',
                                           mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
-                                          chg   => 'Change',
+                                          chg   => 'Save',
                                           email => 'The e-mail address entered in row ',
                                           notv => 'is not a valid e-mail address',
                                           toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one", 
-                                          prme => 'Back to preferences menu',
+                                          prme => 'Back',
                                         );
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changemsgforward',
@@ -955,8 +956,8 @@ ENDMSG
     $r->print(qq|
 <br /><hr />
 <input type="hidden" name="numnotify" value="$num" />
-<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
 <input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
 </form>
 |);
 
@@ -1002,7 +1003,7 @@ sub verify_and_change_msgforward {
                     .'<br />';
     } else {
         &Apache::lonnet::del('environment',['msgforward']);
-        &Apache::lonnet::delenv('environment\.msgforward');
+        &Apache::lonnet::delenv('environment.msgforward');
         $message.= &mt("Set message forwarding to 'off'.").'<br />';
     }
     my $critnotification;
@@ -1042,7 +1043,7 @@ sub verify_and_change_msgforward {
         $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
     } else {
         &Apache::lonnet::del('environment',['notification']);
-        &Apache::lonnet::delenv('environment\.notification');
+        &Apache::lonnet::delenv('environment.notification');
         $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
     }
     if ($critnotification) {
@@ -1051,7 +1052,7 @@ sub verify_and_change_msgforward {
         $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
     } else {
         &Apache::lonnet::del('environment',['critnotification']);
-        &Apache::lonnet::delenv('environment\.critnotification');
+        &Apache::lonnet::delenv('environment.critnotification');
         $message.=&mt("Set critical message notification to 'off'.").'<br />';
     }
     if ($critnotification || $notification) {
@@ -1061,7 +1062,7 @@ sub verify_and_change_msgforward {
             $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
         } else {
             &Apache::lonnet::del('environment',['notifywithhtml']);
-            &Apache::lonnet::delenv('environment\.notifywithhtml');
+            &Apache::lonnet::delenv('environment.notifywithhtml');
             if ($totaladdresses == 1) {
                 $message.=&mt("Set notification address to receive excerpts with html stripped.");
             } else {
@@ -1070,7 +1071,7 @@ sub verify_and_change_msgforward {
         }
     } else {
         &Apache::lonnet::del('environment',['notifywithhtml']);
-        &Apache::lonnet::delenv('environment\.notifywithhtml');
+        &Apache::lonnet::delenv('environment.notifywithhtml');
     }
     if ($message) {
         $message .= '<br /><hr />';
@@ -1115,6 +1116,9 @@ sub colorschanger {
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $save = &mt('Save');
+    my $rstall = &mt('Reset All');
+    my $resetdefault = &mt('Reset All Colors to Default');
     $r->print(<<ENDCOL);
 <script type="text/javascript">
 
@@ -1153,8 +1157,8 @@ $start_data_table
 $chtable
 $end_data_table
 </table>
-<input type="submit" value="Change Custom Colors" />
-<input type="submit" name="resetall" value="Reset All Colors to Default" />
+<input type="submit" value="$save" />
+<input type="submit" name="resetall" value="$rstall" title="$resetdefault" />
 </form>
 ENDCOL
 }
@@ -1182,7 +1186,7 @@ sub verify_and_change_colors {
 	    $message.=&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>.<br />';
 	} else {
 	    &Apache::lonnet::del('environment',[$entry]);
-	    &Apache::lonnet::delenv('environment\.'.$entry);
+	    &Apache::lonnet::delenv('environment.'.$entry);
 	    $message.=&mt('Reset '.$colortypes{$item}.'.').'<br />';
 	}
     }
@@ -1338,7 +1342,7 @@ sub client_form {
                 'currentpass' => 'Current Password',
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
-                'changepass' => 'Change Password');
+                'changepass' => 'Save');
 
     my $output = qq|
 <form name="client" >
@@ -1601,9 +1605,9 @@ sub discussionchanger {
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
         'actn' => 'Action',
-        'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+        'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
         'prca' => 'Preferences can be set that determine',
-        'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
+        'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identfied as "New"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
@@ -1663,15 +1667,8 @@ END
 END
     $r->print(&Apache::loncommon::end_data_table_row().
 	      &Apache::loncommon::end_data_table());
-    $r->print(<<"END");
-<br />
-<br />
-<input type="submit" name="sub" value="Save Changes" />
-<br />
-<br />
-Note: $lt{'thde'}
-</form>
-END
+
+    $r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');
 }
                                                                                                                 
 sub verify_and_change_discussion {
@@ -1688,7 +1685,7 @@ sub verify_and_change_discussion {
         } else {
             $message .= &mt('In discussions: all posts will be displayed.').'<br />';
             &Apache::lonnet::del('environment',['discdisplay']);
-            &Apache::lonnet::delenv('environment\.discdisplay');
+            &Apache::lonnet::delenv('environment.discdisplay');
         }
     }
     if (defined($env{'form.discmark'}) ) {
@@ -1700,7 +1697,7 @@ sub verify_and_change_discussion {
         } else {
             $message.=&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.').'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
-            &Apache::lonnet::delenv('environment\.discmarkread');
+            &Apache::lonnet::delenv('environment.discmarkread');
         }
     }
 #    $r->print(<<ENDVCSCREEN);
@@ -1732,14 +1729,21 @@ sub coursedisplaychanger {
 	    $whatsnewselect = '';
         }
     }
-    my %pagenames = (
+    my %pagenames = &Apache::lonlocal::texthash(
                        firstres => 'First resource',
-                       whatsnew => "What's new page",
+                       whatsnew => "What's New page",
                     );
-    my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
-    my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+    my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
+    my $whatsnew_on=&mt("Display the [_1]What's New page[_2] - a summary of items in the course which require attention.",'<b>','</b>');
 
-    $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
+    $r->print('<br /><b>'
+             .&mt('Set the default page to be displayed when you select a course role')
+             .'</b>&nbsp;'
+             .&mt('(Currently: [_1])',$pagenames{$currvalue})
+             .'<br />'
+             .&mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New page[_2] in the course.",'<i>','</i>')
+             .'<br /><br />'
+    );
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1747,7 +1751,7 @@ sub coursedisplaychanger {
 <label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
 <label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
 ENDLSCREEN
-    $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
+    $r->print('<br /><br /><input type="submit" value="'.&mt('Save').'" />
 </form>');
 }
 
@@ -1771,7 +1775,7 @@ sub verify_and_change_coursepage {
     } else {
         $message .= $lt{'apwb'}.'<br />';
         &Apache::lonnet::del('environment',['course_init_display']);
-        &Apache::lonnet::delenv('environment\.course_init_display');
+        &Apache::lonnet::delenv('environment.course_init_display');
     }
     my $refpage = $env{'form.refpage'};
     if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
@@ -1810,7 +1814,7 @@ if (&Apache::lonnet::usertools_access($u
 my @menu=
     ({	categorytitle=>'Personal Data',
 	items =>[
-	    {	linktext => 'About Me',
+	    {	linktext => 'Personal Information Page',
 		url => $aboutmeurl,
 		permission => $permissions{'aboutme'},
 		#help => 'Prefs_About_Me',
@@ -1891,7 +1895,7 @@ my @menu=
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
 		icon => 'mail-message-new.png',
-		linktitle => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.'
+		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
     },
@@ -2147,7 +2151,7 @@ sub handler2 {
         '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
     push (@Options,{ action => 'none', 
                      linktext =>
-                         q{Edit the 'About Me' Personal Information Screen},
+                         q{Edit the Personal Information Page},
 		     help => 'Prefs_About_Me',
                      href => $aboutmeaction});
     push (@Options,({ action => 'changecolors',
@@ -2424,7 +2428,7 @@ sub handler2 {
 
 sub toggle_debug {
     if ($env{'user.debug'}) {
-        &Apache::lonnet::delenv('user\.debug');
+        &Apache::lonnet::delenv('user.debug');
     } else {
         &Apache::lonnet::appenv({'user.debug' => 1});
     }