PR feedback

courses.dist/modelCourse/templates/achievements/default.html.ep

@@ -7,4 +7,4 @@ Congratulations, you just earned the "<%= $achievement->{name} %>" achievement!
 You have <%= $nextLevelPoints - $pointsEarned %> points remaining until your next level-up.
 
 Great job!
---Prof. X
+--Prof. X

lib/Mojolicious/WeBWorK/Tasks/AchievementNotification.pm

@@ -31,27 +31,26 @@ sub run ($job, $mail_data) {
 	return $job->fail("Could not construct course environment for $mail_data->{courseName}.")
 		unless $ce;
 
+	$job->{language_handle} =
+		WeBWorK::Localize::getLoc($ce->{language} || 'en');
+
 	my $db = WeBWorK::DB->new($ce->{dbLayout});
-	return $job->fail("Could not obtain database connection for $mail_data->{courseName}.")
+	return $job->fail($job->maketext("Could not obtain database connection for [_1].", $mail_data->{courseName}))
 		unless $db;
 
-	return $job->fail("Cannot notify student without an achievement.")
+	return $job->fail($job->maketext("Cannot notify student without an achievement."))
 		unless $mail_data->{achievementID};
-	$mail_data->{achievement} =
-		$db->getAchievement($mail_data->{achievementID});
-	return $job->fail("Could not find achievement $mail_data->{achievementID}.")
+	$mail_data->{achievement} = $db->getAchievement($mail_data->{achievementID});
+	return $job->fail($job->maketext("Could not find achievement [_1].", $mail_data->{achievementID}))
 		unless $mail_data->{achievement};
 
-	$job->{language_handle} =
-		WeBWorK::Localize::getLoc($ce->{language} || 'en');
-
 	my $result_message = eval { $job->send_achievement_notification($ce, $db, $mail_data) };
 	if ($@) {
-		$job->app->log->error("An error occurred while trying to send email: $@");
-		return $job->fail();    # fail silently
+		$job->app->log->error($job->maketext("An error occurred while trying to send email: $@"));
+		return $job->fail($job->maketext("An error occurred while trying to send email: [_1]", $@));    # fail silently
 	}
 	$job->app->log->info("Message sent to $mail_data->{recipient}");
-	return $job->finish();      # succeed silently
+	return $job->finish($job->maketext("Message sent to [_1]", $mail_data->{recipient}));    # succeed silently
 }
 
 sub send_achievement_notification ($job, $ce, $db, $mail_data) {

lib/WeBWorK/AchievementEvaluator.pm

@@ -260,7 +260,7 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 					courseName      => $ce->{courseName},
 					achievementID   => $achievement_id,
 					setID           => $set_id,
-					nextLevelPoints => $nextLevelPoints,
+					nextLevelPoints => $nextLevelPoints || 0,
 					pointsEarned    => $achievementPoints,
 				} ]
 			) if ($achievement->email_template);

lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm

@@ -52,7 +52,7 @@ sub pre_header_initialize ($c) {
 	my $Achievement = $c->db->getAchievement($c->stash('achievementID'));
 
 	if (!$Achievement) {
-		$c->addbadmessage("Achievement $c->stash('achievementID') not found!");
+		$c->addbadmessage($c->maketext("Achievement [_1] not found!", $c->stash('achievementID')));
 		return;
 	}
 

templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep

@@ -15,9 +15,9 @@
 				<th><%= maketext('Name') %></th>
 				<th><%= maketext('Number') %></th>
 				<th><%= maketext('Category') %></th>
-				<th class="text-nowrap"><%= maketext('Edit Users') %></th>
-				<th class="text-nowrap"><%= maketext('Edit Email Template') %></th>
-				<th class="text-nowrap"><%= maketext('Edit Evaluator') %></th>
+				<th><%= maketext('Users') %></th>
+				<th><%= maketext('Notifications') %></th>
+				<th><%= maketext('Evaluator') %></th>
 			</tr>
 		</thead>
 		<tbody class="table-group-divider">

templates/ContentGenerator/Instructor/AchievementNotificationEditor/existing_form.html.ep

@@ -1,5 +1,6 @@
 <div class="row align-items-center mb-2">
-	<%= label_for 'action.existing.target_file_id' => maketext('Use existing template:'), class => 'col-form-label col-auto' =%>
+	<%= label_for 'action.existing.target_file_id' => maketext('Use existing template:'),
+		class => 'col-form-label col-auto' =%>
 	<div class="col-auto">
 		<%= text_field 'action.existing.target_file' => $c->getRelativeSourceFilePath($c->{sourceFilePath}),
 			id => 'action.existing.target_file_id', size => 40, class => 'form-control form-control-sm' =%>