diff --git a/app/helpers/Emails/EmailHelper/email_en.latte b/app/helpers/Emails/EmailHelper/email_en.latte index 0c108a685..97bedd2e1 100644 --- a/app/helpers/Emails/EmailHelper/email_en.latte +++ b/app/helpers/Emails/EmailHelper/email_en.latte @@ -43,7 +43,7 @@

- If you do not wish to receive this type of notifications, please update your user settings accordingly. + If you do not wish to receive this type of notification, please update your user settings accordingly.

@@ -66,4 +66,4 @@ - \ No newline at end of file + diff --git a/app/helpers/Emails/Notifications/AssignmentPoints/shadowPointsUpdated_en.latte b/app/helpers/Emails/Notifications/AssignmentPoints/shadowPointsUpdated_en.latte index 988f3e6c8..5bce3a38a 100644 --- a/app/helpers/Emails/Notifications/AssignmentPoints/shadowPointsUpdated_en.latte +++ b/app/helpers/Emails/Notifications/AssignmentPoints/shadowPointsUpdated_en.latte @@ -1,7 +1,7 @@ {emailSubject}Shadow Assignment Points Awarded - {$assignment}{/emailSubject}

Updated points of shadow assignment '{$assignment}'

- The amount of points awarded for the shadow assignment '{$assignment}' + The number of points awarded for the shadow assignment '{$assignment}' in the group '{$group}' has been modified. At present, you have {$points} points{if $maxPoints} out of {$maxPoints}{/if}. The shadow assignment can be found at: {$link}. diff --git a/app/helpers/Emails/Notifications/AssignmentPoints/solutionPointsUpdated_en.latte b/app/helpers/Emails/Notifications/AssignmentPoints/solutionPointsUpdated_en.latte index 2fc98d98a..b0fb93ebb 100644 --- a/app/helpers/Emails/Notifications/AssignmentPoints/solutionPointsUpdated_en.latte +++ b/app/helpers/Emails/Notifications/AssignmentPoints/solutionPointsUpdated_en.latte @@ -1,7 +1,7 @@ {emailSubject}Assignment Points Updated - {$assignment}{/emailSubject}

Updated points of assignment '{$assignment}'

- The amount of points awarded for the assignment '{$assignment}' + The number of points awarded for the assignment '{$assignment}' in the group '{$group}' has been modified. At present, you have {$points} out of {$maxPoints}{if $hasBonusPoints} and {$bonusPoints} bonus points{/if}. diff --git a/app/helpers/Emails/Notifications/Assignments/newShadowAssignmentEmail_en.latte b/app/helpers/Emails/Notifications/Assignments/newShadowAssignmentEmail_en.latte index 8687549f5..9c01e67c4 100644 --- a/app/helpers/Emails/Notifications/Assignments/newShadowAssignmentEmail_en.latte +++ b/app/helpers/Emails/Notifications/Assignments/newShadowAssignmentEmail_en.latte @@ -1,7 +1,7 @@ {emailSubject}New Shadow Assignment - {$assignment}{/emailSubject}

New shadow assignment '{$name}' created

- New shadow assignment '{$name}' has been created in your group '{$group}'. + A new shadow assignment '{$name}' has been created in your group '{$group}'. {if $maxPoints}You can acquire a maximum of {$maxPoints} points.{/if} Shadow assignments are designed only to register points for external activites outside ReCodEx. The assignment can be found here: {$link}. diff --git a/app/helpers/Emails/Notifications/Comments/assignmentSolutionComment_en.latte b/app/helpers/Emails/Notifications/Comments/assignmentSolutionComment_en.latte index 75bd457b5..d64440b98 100644 --- a/app/helpers/Emails/Notifications/Comments/assignmentSolutionComment_en.latte +++ b/app/helpers/Emails/Notifications/Comments/assignmentSolutionComment_en.latte @@ -2,7 +2,7 @@

New solution comment of '{$assignment}'

{$comment}

- Comment was added by '{$author}' on {$date|localizedDate:'en'} - to solution of assignment '{$assignment}' submitted by '{$solutionAuthor}'. - Comment can be found on the page showing the detail of the solution: {$link}. + A comment was added by '{$author}' on {$date|localizedDate:'en'} + to the solution of assignment '{$assignment}' submitted by '{$solutionAuthor}'. + The comment can be found on the solution details page: {$link}.

diff --git a/app/helpers/Emails/Notifications/Comments/referenceSolutionComment_en.latte b/app/helpers/Emails/Notifications/Comments/referenceSolutionComment_en.latte index af6cc61b3..986adb653 100644 --- a/app/helpers/Emails/Notifications/Comments/referenceSolutionComment_en.latte +++ b/app/helpers/Emails/Notifications/Comments/referenceSolutionComment_en.latte @@ -2,7 +2,7 @@

New reference solution comment of '{$exercise}'

{$comment}

- Comment was added by '{$author}' on {$date|localizedDate:'en'} - to reference solution of exercise '{$exercise}' submitted by '{$solutionAuthor}'. - Comment can be found on the page showing the detail of the reference solution: {$link}. + A comment was added by '{$author}' on {$date|localizedDate:'en'} + to the reference solution of exercise '{$exercise}' submitted by '{$solutionAuthor}'. + The comment can be found on the reference solution details page: {$link}.

diff --git a/app/helpers/Emails/Notifications/failureResolved_en.latte b/app/helpers/Emails/Notifications/failureResolved_en.latte index d122c4f27..3ab8c76c2 100644 --- a/app/helpers/Emails/Notifications/failureResolved_en.latte +++ b/app/helpers/Emails/Notifications/failureResolved_en.latte @@ -1,7 +1,7 @@ {emailSubject}Submission Failure Resolved - {$email}{/emailSubject}

The administrator has resolved the failure of your solution evaluation of '{$title}'

- Your submission of '{$title}' has failed the evaluation on {$date|localizedDate:'en'}. + Your submission of '{$title}' has failed its evaluation on {$date|localizedDate:'en'}. The administrator has resolved the problem with the following comment:

{$note}

diff --git a/app/helpers/Emails/Notifications/submissionEvaluated_en.latte b/app/helpers/Emails/Notifications/submissionEvaluated_en.latte index 91000b256..6260ebc43 100644 --- a/app/helpers/Emails/Notifications/submissionEvaluated_en.latte +++ b/app/helpers/Emails/Notifications/submissionEvaluated_en.latte @@ -1,15 +1,15 @@ {emailSubject}Submission Evaluated - {$assignment}{/emailSubject}

Your submission of the assignment '{$assignment}' was evaluated

- Your submission of the assignment '{$assignment}' submitted don {$date|localizedDate:'en'} + Your submission of the assignment '{$assignment}' submitted on {$date|localizedDate:'en'} in the group '{$group}' was evaluated. The solution has status {$status} and was awarded {$points} of {$maxPoints} points.

- These notifications are sent only when the evaluation takes longer time - or the solution was resubmitted for evaluation. - The resubmission can be initiated by a teacher or by administrator - (e.g., when exercise configuration is changed or a bug in the system is fixed). + These notifications are sent only when the evaluation takes a longer amount of time + or a solution was resubmitted for evaluation. + A resubmission can be initiated by a teacher or by an administrator + (e.g., when the exercise configuration has changed or a bug in the system has been fixed).

You may see the results at: {$link}.