--- loncom/interface/loncoursegroups.pm 2008/05/07 00:10:59 1.76
+++ loncom/interface/loncoursegroups.pm 2008/10/21 14:29:39 1.79
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.76 2008/05/07 00:10:59 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.79 2008/10/21 14:29:39 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -111,8 +111,10 @@ sub handler {
$crstype);
}
} else {
- $r->print(&mt('You do not have [_1] administration '.
- 'privileges in this [_2]',$gpterm,lc($crstype)));
+ $r->print('
'
+ .&mt('You do not have '.$gpterm.' administration '
+ .'privileges in this '.lc($crstype).'.')
+ .'
');
}
} else {
&print_main_menu($r,$cdom,$cnum,\%functions,\%idx,$view_permission,
@@ -346,7 +348,10 @@ END
''.$functionality.' | '.
''.$quota.' | '.
''.$totalmembers.' | '.
- ''.&mt('Files: ').$totalfiles.' '.&mt('Folders: ').$totaldirs.' | '.
+ ''.
+ ' '.&mt('Files: [_1]',$totalfiles).' '.
+ ''.&mt('Folders: [_1]',$totaldirs).' '.
+ ' | '.
''.$boards.' | '.
''.$diskuse.' | '.
&Apache::loncommon::end_data_table_row());
@@ -390,9 +395,7 @@ END
}
}
} else {
- $r->print(&mt('You are not currently a member of any '.
- 'active [_1]s in this [_2]',$gpterm,
- lc($crstype)));
+ $r->print(&mt('You are not currently a member of any active '.$gpterm.'s in this '.lc($crstype).'.'));
}
}
return;
@@ -406,7 +409,6 @@ sub group_administration {
my @types = ();
my @roles = ();
my @sections = ();
- my @buildsections = ();
my %users = ();
my %userdata = ();
my @members = ();
@@ -566,16 +568,11 @@ sub group_administration {
}
if (defined($env{'form.sectionpick'})) {
@sections=&Apache::loncommon::get_env_multiple('form.sectionpick');
- if (grep/^all$/,@sections) {
- @buildsections = sort {$a cmp $b} keys(%sectioncount);
- } else {
- @buildsections = @sections;
- }
}
}
if (($state eq 'pick_members') || ($state eq 'pick_privs') || ($state eq 'change_privs')) {
- &build_members_list($cdom,$cnum,\@types,\@roles,\@buildsections,\%users,
+ &build_members_list($cdom,$cnum,\@types,\@roles,\@sections,\%users,
\%userdata);
}
if ($state eq 'pick_members') {
@@ -1140,8 +1137,8 @@ sub display_control {
sub verify_delete {
my ($r,$groupname,$formname,$action,$page,$states,$stored) = @_;
$r->print(&Apache::lonhtmlcommon::echo_form_input([]));
- $r->print(&mt("You have requested deletion of the following group: ").''.
- $stored->{'description'}.''.
+ $r->print(&mt('You have requested deletion of the group [_1].'
+ ,''.$stored->{'description'}.'').
'
'.&mt('When a group is deleted the following occurs:').''.
'- '.&mt('All group membership is terminated.').'
'.
'- '.&mt('The group ceases to be available either for viewing or for modification of group settings and membership.').'
'.
@@ -1169,6 +1166,7 @@ sub delete_group {
my @deleted;
my @undeleted;
my %usersettings;
+ my $context = 'deletegroup';
foreach my $key (sort(keys(%membership))) {
if ($key =~ /^\Q$groupname\E:([^:]+:[^:]+)$/) {
my $user = $1;
@@ -1196,7 +1194,10 @@ sub delete_group {
\%usersettings);
}
if ($num_fail > 0) {
- $r->print(&mt('Group deletion failed because deletion of [_1] out of [_2] members failed.',$num_fail,$num_users));
+ $r->print(''
+ .&mt('Group deletion failed because deletion of [_1] out of [_2] members failed.'
+ ,$num_fail,$num_users)
+ .'
');
} else {
my ($result,$message) =
@@ -1205,12 +1206,19 @@ sub delete_group {
if ($result eq 'ok') {
my $outcome = &modify_folders($cdom,$cnum,$groupname);
if ($outcome eq '') {
- $r->print(&mt('Group successfully deleted.'));
+ $r->print(''
+ .&mt('Group successfully deleted.')
+ .'
');
} else {
- $r->print(&mt("Although the group was deleted, an error ([_1]) occurred when removing the group's folder from the 'Course Groups' folder.",$outcome));
+ $r->print(''
+ .&mt("Although the group was deleted, an error occurred when removing"
+ ." the group's folder from the 'Course Groups' folder: [_1]",$outcome)
+ .'
');
}
} else {
- $r->print(&mt('Group deletion failed.'));
+ $r->print(''
+ .&mt('Group deletion failed.')
+ .'
');
}
}
return;
@@ -1221,13 +1229,15 @@ sub reenable_folder {
my $outcome;
my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
my $allgrpsmap = $crspath.'group_allfolders.sequence';
- my $foldertitle = &mt('Course Folder -').$description;
+ my $foldertitle = &mt('Course Folder -[_1]',$description);
my $mapurl = $crspath.'group_folder_'.
$groupname.'.sequence';
my ($errtext,$fatal)=&LONCAPA::map::mapread($allgrpsmap);
if ($fatal) {
- $outcome=&mt('Error reading contents of parent folder to group').
- " ($allgrpsmap): $errtext".'
';
+ $outcome=''
+ .&mt('An error occurred when reading contents of parent folder to group:')
+ ."
($allgrpsmap): $errtext"
+ .'
';
} else {
my $idx=&LONCAPA::map::getresidx($mapurl);
$LONCAPA::map::resources[$idx] = $foldertitle.':'.$mapurl.
@@ -1235,8 +1245,10 @@ sub reenable_folder {
$LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx;
my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1);
if ($errtext) {
- $outcome = &mt('Error saving updated parent folder to group').
- "- $allgrpsmap - $errtext".'
';
+ $outcome=''
+ .&mt('An error occurred when saving updated parent folder to group:'
+ ,"
$allgrpsmap - $errtext")
+ .'
';
} else {
my ($furl,$ferr) =
&Apache::lonuserstate::readmap($cdom.'/'.$cnum);
@@ -1261,8 +1273,10 @@ sub modify_folders {
$map = '/'.$map;
my ($errtext,$fatal) = &LONCAPA::map::mapread($map);
if ($fatal) {
- $outcome=&mt('Error reading contents of parent folder to group').
- " ($map): $errtext".'
';
+ $outcome=''
+ .&mt('An error occurred when reading contents of parent folder to group:')
+ ."
($map): $errtext"
+ .'
';
} else {
my $idx = 0;
my $grpidx;
@@ -1285,7 +1299,10 @@ sub modify_folders {
$#LONCAPA::map::order--;
my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
if ($errtext) {
- $outcome = &mt('Error saving updated parent folder to group'). "- $map - $errtext".'
';
+ $outcome=''
+ .&mt('An error occurred when saving updated parent folder to group:')
+ ."
$map - $errtext"
+ .'
';
} else {
my ($furl,$ferr) =
&Apache::lonuserstate::readmap($cdom.'/'.$cnum);
@@ -1299,8 +1316,8 @@ sub modify_folders {
sub verify_reenable {
my ($r,$groupname,$formname,$action,$page,$states,$stored) = @_;
$r->print(&Apache::lonhtmlcommon::echo_form_input([]));
- $r->print(&mt("You have requested enabling the following previously deleted group: ").''.
- $stored->{'description'}.''.
+ $r->print(&mt('You have requested enabling the previously deleted group [_1].'
+ ,''.$stored->{'description'}.'').
'
'.&mt('When a deleted group is re-enabled the following occurs:').''.
'- '.&mt('Group settings and membership at the time the group was deleted are reinstated.').'
'.
'- '.&mt('A group folder is added to the "Course Groups" folder which contains folders for all groups in the course.').'
');
@@ -1321,7 +1338,7 @@ sub reenable_group {
&Apache::longroup::coursegroups($cdom,$cnum,$groupname,
'deleted_groups');
if (keys(%groups) == 0) {
- $r->print(&mt('The group ([_1]) was not re-enabled, because it is not a deleted group.
Perhaps it has already been re-enabled?',$groupname));
+ $r->print(&mt('The group [_1] was not re-enabled, because it is not a deleted group.[_2]Perhaps it has already been re-enabled?',''.$groupname.''),'
');
return;
}
my %groupinfo =
@@ -1339,6 +1356,7 @@ sub reenable_group {
my $num_users = 0;
my $num_ok = 0;
my $num_fail = 0;
+ my $context = 'reenablegroup';
my (%usersettings,@enabled,@unenabled);
my ($result,$message) =
&Apache::lonnet::toggle_coursegroup_status($cdom,$cnum,$groupname,
@@ -1375,22 +1393,34 @@ $context) eq 'ok') {
&Apache::lonnet::modify_coursegroup_membership($cdom,$cnum,
\%usersettings);
if ($roster_result eq 'ok') {
- $r->print(&mt('Membership reinstated for [_1] users, each with start and end dates for group access set to defaults: [_2] and [_3]',$num_ok,$showstart,$showend).'
');
+ $r->print(''
+ .&mt('Membership reinstated for [quant,_1,user], each with start and end dates for group access set to defaults: [_2] and [_3]',$num_ok,$showstart,$showend)
+ .'
');
}
} else {
- $r->print(&mt('A problem occurred when trying to reinstate [_1] of the [_2] members of the pre-existing group.',$num_fail,$num_users).'
');
+ $r->print(''
+ .&mt('A problem occurred when trying to reinstate [_1] of the [_2] members of the pre-existing group.',$num_fail,$num_users)
+ .'
');
}
} else {
- $r->print(&mt('There were no group members to reinstate, as none were removed when the group was deleted.').'
');
+ $r->print(''
+ .&mt('There were no group members to reinstate, as none were removed when the group was deleted.')
+ .'
');
}
my $outcome = &reenable_folder($cdom,$cnum,$groupname,$description);
if ($outcome eq '') {
- $r->print(&mt('Group successfully re-enabled.'));
- } else {
- $r->print(&mt("Although the group was re-enabled, an error ([_1]) occurred when adding the group's folder to the 'Course Groups' folder.",$outcome));
+ $r->print(''
+ .&mt('Group successfully re-enabled.')
+ .'
');
+ } else {
+ $r->print(''
+ .&mt("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Course Groups' folder: [_1]",$outcome)
+ .'
');
}
} else {
- $r->print(&mt('Re-enabling group failed'));
+ $r->print(''
+ .&mt('Re-enabling group failed.')
+ .'
');
}
return;
}
@@ -1578,8 +1608,7 @@ sub groupsettings_options {
'for different group members?',
);
my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored);
- &topic_bar($r,$image,$lt{'gnde'});
- $r->print('
+ $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'gnde'}).'