--- loncom/interface/loncoursegroups.pm 2013/07/22 18:06:51 1.118 +++ loncom/interface/loncoursegroups.pm 2013/09/17 15:04:30 1.121 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursegroups.pm,v 1.118 2013/07/22 18:06:51 bisitz Exp $ +# $Id: loncoursegroups.pm,v 1.121 2013/09/17 15:04:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ use strict; use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); +use Apache::lonhtmlgateway; use Apache::lonlocal; use Apache::lonnavmaps(); use Apache::longroup(); @@ -3534,7 +3535,7 @@ sub process_membership { if ($num_ok) { my $msgall =''; foreach my $type (sort(keys(%added))) { - my $message = &mt('The following users were successfully [_1]',$type); + my $message = &mt("The following users were successfully $type"); if (!($type eq 'deleted' || $type eq 'expired')) { $message .= &mt(' with the following privileges'); } @@ -4120,10 +4121,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", @@ -4209,15 +4209,15 @@ sub validate_groupname { } if ($action eq 'create') { if (exists($curr_groups{$groupname})) { - return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm). + return $exitmsg.$lt{'cnnb'}.&mt("an existing $gpterm"). $lt{'inth'}.'.
'.$lt{'grna'}; } elsif (exists($deleted_groups{$groupname})) { - return $exitmsg.$lt{'cnnb'}.&mt('a [_1] which previously existed',$gpterm). + return $exitmsg.$lt{'cnnb'}.&mt("a $gpterm which previously existed"). $lt{'inth'}.'.
'.$lt{'grna'}; } } elsif ($action eq 'modify') { unless(exists($curr_groups{$groupname})) { - $earlyout = &mt('[_1] name:',$ucgpterm).' '.$groupname.$lt{'thgr'}. + $earlyout = &mt("$ucgpterm name:").' '.$groupname.$lt{'thgr'}. $lt{'inth'}; return $earlyout; }