--- loncom/interface/lonuserutils.pm	2009/02/17 10:12:37	1.80
+++ loncom/interface/lonuserutils.pm	2009/03/05 23:58:00	1.83
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.80 2009/02/17 10:12:37 weissno Exp $
+# $Id: lonuserutils.pm,v 1.83 2009/03/05 23:58:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1914,15 +1914,15 @@ sub aggregate_user_info {
 sub process_date_info {
     my ($userdata) = @_;
     my $now = time;
-    $userdata->{'status'} = &mt('Active');
+    $userdata->{'status'} = 'Active';
     if ($userdata->{'start'} > 0) {
         if ($now < $userdata->{'start'}) {
-            $userdata->{'status'} = &mt('Future');
+            $userdata->{'status'} = 'Future';
         }
     }
     if ($userdata->{'end'} > 0) {
         if ($now > $userdata->{'end'}) {
-            $userdata->{'status'} = &mt('Expired');
+            $userdata->{'status'} = 'Expired';
         }
     }
     return;
@@ -2064,7 +2064,7 @@ END
                        'ua'         => "uncheck all",
                        'ac'         => "Action to take for selected users",
                        'link'       => "Behavior of clickable username link for each user",
-                       'aboutme'    => "Display a user's personal homepage",
+                       'aboutme'    => "Display a user's personal information page",
                        'owin'       => "Open in a new window",
                        'modify'     => "Modify a user's information",
                        'clicker'    => "Clicker-ID",
@@ -2309,6 +2309,11 @@ END
             $grpfilter = 'all';
         }
     }
+    my %ltstatus = &Apache::lonlocal::texthash(
+                                                Active  => 'Active',
+                                                Future  => 'Future',
+                                                Expired => 'Expired',
+                                               );
     # Get groups, role, permanent e-mail so we can sort on them if
     # necessary.
     foreach my $user (keys(%{$userlist})) {
@@ -2521,6 +2526,12 @@ END
                     $r->print('<td>'.&print_username_link($mode,\%in).'</td>');
                 } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
                     $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+                } elsif ($item eq 'status') {
+                    my $showitem = $in{$item};
+                    if (defined($ltstatus{$in{$item}})) {
+                        $showitem = $ltstatus{$in{$item}};
+                    }
+                    $r->print('<td>'.$showitem.'</td>'."\n");
                 } else {
                     $r->print('<td>'.$in{$item}.'</td>'."\n");
                 }
@@ -3003,7 +3014,7 @@ ENDJS
         $output .= $info.$secbox;
     }
     $output .= '<p>'.
-'<input type="button" name="dateselection" value="'.&mt('Make changes').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
+'<input type="button" name="dateselection" value="'.&mt('Save').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
 '</form>';
     return $output;
 }
@@ -3391,7 +3402,7 @@ sub print_first_users_upload_form {
     $str .= '<label><input type="checkbox" name="noFirstLine" /> '.
         &mt('Ignore First Line')."</label></p>\n";
     $str .= '<input type="submit" name="fileupload" value="'.
-        &mt('Go to next step').'">'."<br />\n";
+        &mt('Next').'">'."<br />\n";
     $str .= &Apache::loncommon::end_page();
     $r->print($str);
     return;