'
@@ -1756,19 +1786,19 @@ sub groupsettings_options {
} else {
$r->print(&mt('Quota allocated to group portfolio:'));
}
- $r->print(' '.&mt('[_1] Mb','
'));
+ $r->print(' '.&mt('[_1] MB','
'));
if ($action eq 'create') {
$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.'
+ .&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',
+ $r->print(' ('.&mt('The quota is currently [_1] MB',
$$stored{'quota'}).').');
$r->print('
'
- .&mt('The quota can be increased to [_1] Mb, '
+ .&mt('The quota can be increased to [_1] MB, '
.'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.'
,sprintf("%.2f",$maxposs)));
}
@@ -2016,10 +2046,10 @@ sub print_current_settings {
dfac => 'Default access dates',
ygrs => "Your group selections - ",
tfwa => "The following settings will apply to the group:",
- difn => 'Different collaborative tools
for different members:',
stda => 'Start date:',
enda => 'End date:',
);
+ $lt{'difn'} = &mt('Different collaborative tools[_1]for different members:','
');
my $showstart = &Apache::lonlocal::locallocaltime($startdate);
my $showend;
if ($enddate == 0) {
@@ -2069,7 +2099,7 @@ sub print_current_settings {
$r->print('');
}
- my $quota_text=&mt('[_1] Mb',$quota);
+ my $quota_text=&mt('[_1] MB',$quota);
my $granu_text=&mt($granularity);
$r->print(<<"END");
@@ -2548,6 +2578,7 @@ sub current_membership {
'actn' => 'Action?',
'name' => 'Name',
'usnm' => 'Username',
+ 'stid' => 'ID',
'doma' => 'Domain',
'stda' => 'Start Date',
'enda' => 'End Date',
@@ -2609,7 +2640,7 @@ END
$lt{'name'} $lt{'usnm'} $lt{'doma'}
-
ID
+
$lt{'ID'} $lt{'stda'} $lt{'enda'}
END
@@ -2733,7 +2764,10 @@ END
}
$r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print(&mt('There are no active, future or previous group members to modify.'));
+ $r->print(
+ '
'
+ .&mt('There are no active, future or previous group members to modify.')
+ .'
');
}
return $numcurrent;
}
@@ -2801,7 +2835,7 @@ sub change_privs_form {
}
}
if (!$exp_or_del) {
- $r->print($lt{'nome'}.'
');
+ $r->print('
'.$lt{'nome'}.'
');
}
$r->print(&Apache::lonhtmlcommon::topic_bar(4,&mt('Setting optional privileges for specific group members')));
@@ -3197,7 +3231,7 @@ sub write_group_data {
$quota = 0;
$r->print('
'
.&mt('The value you entered for the quota for the group portfolio in this '.$gpterm
- .' contained invalid characters, so it has been set to 0 Mb. You can change this by'
+ .' contained invalid characters, so it has been set to 0 MB. You can change this by'
.' modifying the '.$gpterm.' settings.')
.'
');
}
@@ -3205,7 +3239,7 @@ sub write_group_data {
$quota = $maxposs;
$r->print('
'
.&mt('The value you entered for the quota for the group portfolio in this '.$gpterm
- .' exceeded the maximum possible value, so it has been set to [_1] Mb '
+ .' exceeded the maximum possible value, so it has been set to [_1] MB '
.'(the maximum possible value).',sprintf("%.2f",$maxposs))
.'
');
}
@@ -3364,10 +3398,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 '.$gpterm.'. '
- .'Please try again.',$actiontype{$action})
- .'
');
+ $r->print('
'
+ .&mt('An error occurred when '.$actiontype{$action}.' the '.$gpterm.'. '
+ .'Please try again.')
+ .'';
foreach my $user (@{$added{$type}}) {
my $privlist = '';
if (!($type eq 'deleted' || $type eq 'expired')) {
@@ -4120,10 +4155,9 @@ sub create_homepage {
my ($cdom,$cnum,$name,$groupinfo,$tools,$gpterm,$ucgpterm,$now) = @_;
my $functionality = join(',',@{$tools});
my $content = &unescape($$groupinfo{description});
- $content=~s/\s+$//s;
- $content=~s/^\s+//s;
- $content=~s/\$//s;
- $content=&Apache::lonfeedback::clear_out_html($content,1);
+ chomp($content);
+ my $gateway = Apache::lonhtmlgateway->new();
+ $content = $gateway->process_incoming_html($content,1);
my %pageinfo = (
'aaa_title' => "$ucgpterm: $name",
@@ -4183,43 +4217,40 @@ sub validate_groupname {
}
my %lt = &Apache::lonlocal::texthash (
igna => "Invalid $gpterm name",
- tgne => "The $gpterm name entered ",
grna => "$ucgpterm names and section names used in a ".
"$crstype must be unique.",
- isno => "is not a valid name.",
gnmo => "$ucgpterm names may only contain letters, ".
"numbers or underscores.",
- cnnb => "can not be used as it is the name of ",
- inth => " in this $crstype",
- thgr => "- does not correspond to the name of an ".
- "existing $gpterm",
);
- my $exitmsg = ''.$lt{'igna'}.' '.$lt{'igna'}.'