'.
&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;
@@ -1134,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.').'
'.
@@ -1191,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) =
@@ -1200,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)
+ .'
');
}
}
return;
@@ -1216,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.
@@ -1230,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);
@@ -1256,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;
@@ -1280,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);
@@ -1294,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.').'
');
@@ -1316,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 =
@@ -1371,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.'));
+ $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("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Course Groups' folder: [_1]",$outcome)
+ .'
');
if ($action eq 'create') {
- $r->print(&mt('If you enable the file repository for the [_1], allocate a disk quota.',$gpterm));
+ $r->print(&mt('If you enable the file repository for the '.$gpterm.', allocate a disk quota.'));
} else {
$r->print(&mt('Quota allocated to file repository:'));
}
- $r->print(' Mb');
+ $r->print(' '.&mt('[_1] Mb',''));
if ($action eq 'create') {
- $r->print(' '.
- &mt('A total of [_1] Mb can be divided amongst all [_2]s in the '.
- '[_3], and [_4] Mb are currently unallocated.',$crsquota,
- $gpterm,lc($crstype),sprintf("%.2f",$freespace)));
+ $r->print(' '
+ .&mt('A total of [_1] Mb can be divided amongst all '.$gpterm.'s in the '
+ .lc($crstype).', and [_2] Mb are currently unallocated.'
+ ,$crsquota,sprintf("%.2f",$freespace))
+ );
} else {
$r->print(' ('.&mt('The quota is currently [_1] Mb',
$$stored{'quota'}).').');
- $r->print(' '.&mt('The quota can be increased to [_1] Mb, '.
- 'by adding all unallocated space for [_2]s in the [_3].',
- sprintf("%.2f",$maxposs),$gpterm,lc($crstype)));
+ $r->print(' '
+ .&mt('The quota can be increased to [_1] Mb, '
+ .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.'
+ ,sprintf("%.2f",$maxposs)));
}
$r->print('
@@ -1933,7 +1969,7 @@ sub print_current_settings {
');
if (@{$available} > 0) {
- $r->print(&mt('Available for assignment to members:').
+ $r->print(''.&mt('Available for assignment to members:').''.
'
');
my $rowcell = int(@{$available}/2) + @{$available}%2;
for (my $i=0; $i<@{$available}; $i++) {
@@ -1951,7 +1987,7 @@ sub print_current_settings {
$r->print('
');
}
if (@{$unavailable} > 0) {
- $r->print(&mt('Unavailable for assignment:').
+ $r->print(''.&mt('Unavailable for assignment:').''.
'
');
my $rowcell = int(@{$unavailable}/2) + @{$unavailable}%2;
for (my $j=0; $j<@{$unavailable}; $j++) {
@@ -1968,10 +2004,11 @@ sub print_current_settings {
}
$r->print('
');
}
+ my $quota_text=&mt('[_1] Mb',$quota);
$r->print(<<"END");
$lt{'difn'} $granularity
-
$quota Mb
+
$quota_text
$lt{'stda'} $showstart $lt{'enda'} $showend
@@ -1994,9 +2031,9 @@ sub pick_new_members {
'nnew' => "There are no users to add as new members, as all users".
" matching the specified type(s), role(s), and ".
"section(s) are already affiliated with this group.",
- 'yoma' => 'You may need to use the '."'".'modify existing, past or '.
- 'future members'."'".' page if you need to re-enable '.
- 'or activate access for previous or future members.',
+ 'yoma' => "You may need to use the 'modify existing, past or ".
+ "future members' page if you need to re-enable ".
+ "or activate access for previous or future members.",
);
my %members;
my $totalusers = 0;
@@ -2273,7 +2310,8 @@ sub default_privileges {
if ($fixed ne '') {
$fixed .= '
'."\n";
@@ -3082,11 +3120,19 @@ sub write_group_data {
}
if ($quota !~ /^\d*\.?\d*$/) {
$quota = 0;
- $r->print(&mt('The value you entered for the quota for the file repository in this [_1] contained invalid characters, so it has been set to 0 Mb. You can change this by modifying the [_1] settings. ',$gpterm));
+ $r->print('
'
+ .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+ .' contained invalid characters, so it has been set to 0 Mb. You can change this by'
+ .' modifying the '.$gpterm.' settings.')
+ .'
');
}
if ($quota > $maxposs) {
$quota = $maxposs;
- $r->print(&mt('The value you entered for the quota for the file repository in this [_1] exceeded the maximum possible value, so it has been set to [_2] Mb (the maximum possible value). ',$gpterm,sprintf("%.2f",$maxposs)));
+ $r->print('
'
+ .&mt('The value you entered for the quota for the file repository in this '.$gpterm
+ .' exceeded the maximum possible value, so it has been set to [_1] Mb '
+ .'(the maximum possible value).',sprintf("%.2f",$maxposs))
+ .'
');
}
my %groupinfo = (
description => $esc_description,
@@ -3151,10 +3197,17 @@ sub write_group_data {
my $result = &add_group_folder($cdom,$cnum,$now,$groupname,$action,
$description,$tools,\%groupinfo,
$gpterm,$ucgpterm,$crstype);
- if ($result ne 'ok') {
- $r->print(&mt('A problem occurred when creating folders for the new [_1]. [_2] ',$gpterm,$result));
+ if ($result eq 'ok') {
+ $r->print('
'
+ .&mt($ucgpterm.' [_1] was created.',''.$groupname.'')
+ .'
');
+ } else {
+ $r->print('
'
+ .&mt('A problem occurred when creating folders for the new '.$gpterm.' [_1]:'
+ ,''.$groupname.'')
+ .' '.$result
+ .'
');
}
- $r->print(&mt('[_1] [_2] was created. ',$ucgpterm,$groupname));
} elsif ($action eq 'modify') {
my (@oldtools,@newtools);
if (ref($$stored{'tool'}) eq 'ARRAY') {
@@ -3184,11 +3237,15 @@ sub write_group_data {
my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
$groupname);
if ($parm_result) {
- $r->print(&mt('Error while setting parameters '.
- 'for Discussion Boards folder: '.
- '[_1] .',$parm_result));
+ $r->print('
'
+ .&mt($ucgpterm.' [_1] was updated.',''.$groupname.'')
+ .'
');
}
} else {
my %actiontype = (
@@ -3206,8 +3265,10 @@ sub write_group_data {
&Apache::lonnet::logthis("Failed to store $gpterm $groupname ".
'in '.lc($crstype).': '.$cnum.
' in domain: '.$cdom);
- $r->print(&mt('An error occurred when [_1] the [_2]. '.
- 'Please try again.',$actiontype{$action},$gpterm));
+ $r->print('
'
+ .&mt('An error occurred when [_1] the '.$gpterm.'. '
+ .'Please try again.',$actiontype{$action})
+ .'
');
}
return $result;
}
@@ -3400,7 +3461,9 @@ sub process_membership {
}
if ($num_fail) {
foreach my $type (sort(keys(%failed))) {
- $r->print(&mt('The following users could not be [_1], because an error occurred: ',$type));
+ $r->print('
'
+ .&mt("The following users could not be $type, because an error occurred:")
+ .'