make moderator digest respect resubmission in it's message

osf/utils/notifications.py

@@ -46,6 +46,7 @@ def notify_submit(resource, user, *args, **kwargs):
 def notify_resubmit(resource, user, *args, **kwargs):
     context = get_email_template_context(resource)
     context['referrer'] = user
+    context['resubmission'] = True
     recipients = list(resource.contributors)
     reviews_signals.reviews_email_submit.send(
         recipients=recipients,

website/reviews/listeners.py

@@ -97,7 +97,10 @@ def reviews_submit_notification_moderators(self, timestamp, context):
         context['message'] = f'submitted updates to "{resource.title}".'
         context['reviews_submission_url'] += f'&revisionId={revision_id}'
     else:
-        context['message'] = f'submitted "{resource.title}".'
+        if context.get('resubmission'):
+            context['message'] = f'resubmitted "{resource.title}".'
+        else:
+            context['message'] = f'submitted "{resource.title}".'
 
     # Get NotificationSubscription instance, which contains reference to all subscribers
     provider_subscription, created = NotificationSubscription.objects.get_or_create(

website/templates/emails/reviews_resubmission_confirmation.html.mako

@@ -2,17 +2,17 @@
 <%def name="content()">
     <div style="margin: 40px;">
        <p>
-            Hello ${recipient.fullname},
+            Hello ${referrer.fullname},
        </p>
        <p>
             The ${document_type} <a href="${reviewable.absolute_url}">${reviewable.title}</a> has been successfully
-            re-submitted to ${reviewable.provider.name}.
+            resubmitted to ${reviewable.provider.name}.
        </p>
        <p>
             ${reviewable.provider.name} has chosen to moderate their submissions using a pre-moderation workflow, which
             means your submission is pending until accepted by a moderator.
-            % if not no_future_emails: You will receive
-                a separate notification informing you of any status changes.
+            % if not no_future_emails:
+                You will receive a separate notification informing you of any status changes.
             % endif
        </p>
        <p>