--- loncom/interface/slotrequest.pm 2019/06/28 19:46:03 1.141 +++ loncom/interface/slotrequest.pm 2019/07/07 22:06:04 1.142 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for requesting to have slots added to a students record # -# $Id: slotrequest.pm,v 1.141 2019/06/28 19:46:03 raeburn Exp $ +# $Id: slotrequest.pm,v 1.142 2019/07/07 22:06:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -769,7 +769,7 @@ sub release_slot { my ($result,$msg) = &release_reservation($slot_name,$uname,$udom,$symb,$mgr); if (!$result) { - $r->print('

'.&mt($msg).'

'); + $r->print('

'.&mt($msg).'

'); } else { $r->print("

$msg

"); } @@ -941,7 +941,7 @@ sub release_reservation { } else { if (keys(%to_delete)) { $msg = &mt('Reservation release partially complete for [_1]',$description); - } else { + } else { $msg = &mt('No entries found for this user to release for [_1].',$description); } return (0,$msg); @@ -995,7 +995,7 @@ sub release_reservation { # # If release is *not* because of a reservation change, i.e., this is a "drop" - # by a student, or a removal for a single student by an instructor then + # by a student, or a removal for a single student by an instructor then # only remove one entry from slot_reservations.db, where both the user # and the symb match the current context. If useslots was set to map or # map_map, then the symb to match in slot_reservations.db is the symb of @@ -1006,7 +1006,7 @@ sub release_reservation { if ($parm_level == 2) { $symb_to_check = $map_symb; } else { - $symb_to_check = $parm_symb; + $symb_to_check = $parm_symb; } foreach my $entry (keys(%consumed)) { if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { @@ -1024,16 +1024,16 @@ sub release_reservation { $cnum,$udom,$uname,$context) =~ /^error/) { if ($mgr eq 'F') { $msg = &mt('Reservation release partially complete for: [_1]',"$uname:$udom").'
'. - &mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom"); + &mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom"); } else { $msg = &mt('Release partially complete for: [_1]',$description); } return (0,$msg); } else { if ($mgr eq 'F') { - $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); + $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); } else { - $msg = ''.&mt('Released reservation: [_1]',$description).'

'; + $msg = ''.&mt('Released reservation: [_1]',$description).'

'; my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); my $subject = &mt('Reservation change: [_1]',$description); my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description); @@ -1119,7 +1119,7 @@ sub delete_slot { if ($ret eq 'ok') { $r->print('

'.&mt('Slot [_1] marked as deleted.',''.$slot_name.'').'

'); } else { - $r->print('

'.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)

"); + $r->print('

'.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)

"); } } else { if (%consumed) { @@ -1151,9 +1151,9 @@ sub get_slot { my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); if ($slot_name =~ /^error: (.*)/) { - $r->print('

' + $r->print('

' .&mt('An error occurred while attempting to make a reservation. ([_1])',$1) - .'

'); + .'

'); &return_link($r); return 0; } @@ -1206,9 +1206,9 @@ STUFF if (defined($reserved)) { my $retvalue = 0; if ($slot_name =~ /^error: (.*)/) { - $r->print('

' + $r->print('

' .&mt('An error occurred while attempting to make a reservation. ([_1])',$1) - .'

'); + .'

'); } elsif ($reserved > -1) { $r->print('

'.&mt('Successfully signed up: [_1]',$description).'

'); $retvalue = 1;