@@ -35,26 +35,25 @@ sub run ($job, $mail_data) {
35
35
return $job -> fail(" Could not construct course environment for $mail_data ->{courseName}." )
36
36
unless $ce ;
37
37
38
- $job -> {language_handle } =
39
- WeBWorK::Localize::getLoc($ce -> {language } || ' en' );
38
+ $job -> {language_handle } = WeBWorK::Localize::getLoc($ce -> {language } || ' en' );
40
39
41
40
my $db = WeBWorK::DB-> new($ce -> {dbLayout });
42
- return $job -> fail($job -> maketext(" Could not obtain database connection for [_1]." , $mail_data -> {courseName }))
41
+ return $job -> fail($job -> maketext(' Could not obtain database connection for [_1].' , $mail_data -> {courseName }))
43
42
unless $db ;
44
43
45
- return $job -> fail($job -> maketext(" Cannot notify student without an achievement." ))
44
+ return $job -> fail($job -> maketext(' Cannot notify student without an achievement.' ))
46
45
unless $mail_data -> {achievementID };
47
46
$mail_data -> {achievement } = $db -> getAchievement($mail_data -> {achievementID });
48
- return $job -> fail($job -> maketext(" Could not find achievement [_1]." , $mail_data -> {achievementID }))
47
+ return $job -> fail($job -> maketext(' Could not find achievement [_1].' , $mail_data -> {achievementID }))
49
48
unless $mail_data -> {achievement };
50
49
51
50
my $result_message = eval { $job -> send_achievement_notification($ce , $db , $mail_data ) };
52
51
if ($@ ) {
53
- $job -> app-> log -> error($job -> maketext( " An error occurred while trying to send email: $@ " ) );
54
- return $job -> fail($job -> maketext(" An error occurred while trying to send email: [_1]" , $@ ));
52
+ $job -> app-> log -> error(" An error occurred while trying to send email: $@ " );
53
+ return $job -> fail($job -> maketext(' An error occurred while trying to send email: [_1]' , $@ ));
55
54
}
56
55
$job -> app-> log -> info(" Message sent to $mail_data ->{recipient}" );
57
- return $job -> finish($job -> maketext( " Message sent to [_1] " , $mail_data -> { recipient }) );
56
+ return $job -> finish($result_message );
58
57
}
59
58
60
59
sub send_achievement_notification ($job , $ce , $db , $mail_data ) {
0 commit comments