diff --git a/commentaries/templates/commentaries/vet_commentary_email_accepted.html b/commentaries/templates/commentaries/vet_commentary_email_accepted.html index 630b8d6916b6c1de4fbd2890cdaaf5d881129c25..8e5814eb3f2531e0a19039c27843eb77b9381fa0 100644 --- a/commentaries/templates/commentaries/vet_commentary_email_accepted.html +++ b/commentaries/templates/commentaries/vet_commentary_email_accepted.html @@ -1,4 +1,4 @@ -Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }}, +Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }}, The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has been activated at https://scipost.org/commentary/{{ commentary.arxiv_or_DOI_string }}. You are now welcome to submit your comments. diff --git a/commentaries/templates/commentaries/vet_commentary_email_modified.html b/commentaries/templates/commentaries/vet_commentary_email_modified.html index 908e8d6c53363352c36f51b674a8cb264f5d5cdc..e6a8cbada068ef2e003adcff527662660488ef9c 100644 --- a/commentaries/templates/commentaries/vet_commentary_email_modified.html +++ b/commentaries/templates/commentaries/vet_commentary_email_modified.html @@ -1,4 +1,4 @@ -Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }}, +Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }}, The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has been activated (with slight modifications to your submitted details). You are now welcome to submit your comments. diff --git a/commentaries/templates/commentaries/vet_commentary_email_rejected.html b/commentaries/templates/commentaries/vet_commentary_email_rejected.html index e2bac06f202eb64c1237ff6fb5ed72f4b55f891a..8e9bad0ab1a87c0f26ec7a57138d30fac4d14e8c 100644 --- a/commentaries/templates/commentaries/vet_commentary_email_rejected.html +++ b/commentaries/templates/commentaries/vet_commentary_email_rejected.html @@ -1,4 +1,4 @@ -Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }}, +Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }}, The Commentary Page you have requested, concerning publication with title {{ commentary.title }} by {{ commentary.author_list }}, has not been activated for the following reason: {{ refusal_reason }}. diff --git a/comments/models.py b/comments/models.py index 5da586da0a102c2c9665f016fc2973ca934eef88..fb646ec83460f6db725cf3a38d58c33b0818b6a5 100644 --- a/comments/models.py +++ b/comments/models.py @@ -166,7 +166,7 @@ class Comment(TimeStampedModel): """Return author string if not anonymous.""" author = self.get_author() if author: - return '{} {}'.format(author.get_title_display(), author.user.last_name) + return '{} {}'.format(author.profile.get_title_display(), author.user.last_name) return 'Anonymous' diff --git a/journals/utils.py b/journals/utils.py index 5289e1a95ba9d817df223a3fccd1fa2e688e30d1..73d4865890217893e204d53f882ff7c5e7629c86 100644 --- a/journals/utils.py +++ b/journals/utils.py @@ -15,7 +15,7 @@ class JournalUtils(BaseMailUtil): def send_authors_paper_published_email(cls): """ Requires loading 'publication' attribute. """ email_text = ('Dear ' - + cls.publication.accepted_submission.submitted_by.get_title_display() + + cls.publication.accepted_submission.submitted_by.profile.get_title_display() + ' ' + cls.publication.accepted_submission.submitted_by.user.last_name + ', \n\nWe are happy to inform you that your Submission to SciPost,\n\n' + diff --git a/scipost/models.py b/scipost/models.py index 178ac32690ad19515c2317d5f36d552baaca5217..54d353a287df104f36b49132e8fd5b49faa6f764 100644 --- a/scipost/models.py +++ b/scipost/models.py @@ -101,7 +101,7 @@ class Contributor(models.Model): @property def formal_str(self): - return '%s %s' % (self.get_title_display(), self.user.last_name) + return '%s %s' % (self.profile.get_title_display(), self.user.last_name) @property def is_active(self): diff --git a/submissions/templates/partials/submissions/pool/referee_invitations.html b/submissions/templates/partials/submissions/pool/referee_invitations.html index 519e68b49894825af61646b06126cbdf8ad8949c..c120b79eb9e5c01bff013d8741de8c0102798faf 100644 --- a/submissions/templates/partials/submissions/pool/referee_invitations.html +++ b/submissions/templates/partials/submissions/pool/referee_invitations.html @@ -30,7 +30,7 @@ <div class="badge badge-danger">overdue</div> {% endif %} </td> - <td class="py-3">{{ invitation.get_title_display }} {{invitation.first_name}} {{invitation.last_name}}</td> + <td class="py-3">{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}</td> <td> {{ invitation.date_invited }} </td> diff --git a/submissions/templates/partials/submissions/recommendation_fellow_content.html b/submissions/templates/partials/submissions/recommendation_fellow_content.html index 51ea083986bc844fa8c524f322532fd4c6dcaf3f..72ae8e269d6c274b6daa420ea4d76e673983e5b6 100644 --- a/submissions/templates/partials/submissions/recommendation_fellow_content.html +++ b/submissions/templates/partials/submissions/recommendation_fellow_content.html @@ -4,7 +4,7 @@ {% block recommendation_header %} - <h4 class="text-muted mb-2">By {{ recommendation.submission.editor_in_charge.get_title_display }} {{ recommendation.submission.editor_in_charge.user.first_name }} {{ recommendation.submission.editor_in_charge.user.last_name }}, formulated on {{ recommendation.date_submitted }}</h4> + <h4 class="text-muted mb-2">By {{ recommendation.submission.editor_in_charge.profile.get_title_display }} {{ recommendation.submission.editor_in_charge.user.first_name }} {{ recommendation.submission.editor_in_charge.user.last_name }}, formulated on {{ recommendation.date_submitted }}</h4> {% endblock %} {% block recommendation_remarks_for_editorial_college %} diff --git a/submissions/templates/partials/submissions/submission_refereeing_history.html b/submissions/templates/partials/submissions/submission_refereeing_history.html index e0050aa27795560e2cc742f6e1e64bffd70833ec..bfd68ce819416185f381978c59afaff16afd6720 100644 --- a/submissions/templates/partials/submissions/submission_refereeing_history.html +++ b/submissions/templates/partials/submissions/submission_refereeing_history.html @@ -16,7 +16,7 @@ </div> <ul class="my-2 pl-4"> {% for report in sibling.reports.accepted %} - <li><a href="{{ report.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li> + <li><a href="{{ report.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li> {% include 'partials/comments/comments_list.html' with comments=report.comments.vetted css_class='my-1 pl-4' target_blank=target_blank %} {% endfor %} </ul> diff --git a/submissions/utils.py b/submissions/utils.py index e097a806bcc57c4799e7af11d6de71a93a7450e6..acc7229c91d4014c666cbed2ad14b448b9d1128c 100644 --- a/submissions/utils.py +++ b/submissions/utils.py @@ -21,7 +21,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def send_assignment_request_email(cls): """ Requires loading 'assignment' attribute. """ - email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' ' + + email_text = ('Dear ' + cls.assignment.to.profile.get_title_display() + ' ' + cls.assignment.to.user.last_name + ', \n\nWe have received a Submission to SciPost ' + 'for which we would like you to consider becoming Editor-in-charge:\n\n' + @@ -54,7 +54,7 @@ class SubmissionUtils(BaseMailUtil): '\n<p>Many thanks in advance for your collaboration,</p>' '<p>The SciPost Team.</p>') email_context = { - 'title': cls.assignment.to.get_title_display(), + 'title': cls.assignment.to.profile.get_title_display(), 'last_name': cls.assignment.to.user.last_name, 'sub_title': cls.assignment.submission.title, 'author_list': cls.assignment.submission.author_list, @@ -75,7 +75,7 @@ class SubmissionUtils(BaseMailUtil): def send_EIC_appointment_email(cls): """ Requires loading 'assignment' attribute. """ r = cls.assignment - email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' ' + email_text = ('Dear ' + cls.assignment.to.profile.get_title_display() + ' ' + cls.assignment.to.user.last_name + ', \n\nThank you for accepting to become Editor-in-charge ' 'of the SciPost Submission\n\n' @@ -113,7 +113,7 @@ class SubmissionUtils(BaseMailUtil): '<p>Many thanks in advance for your collaboration,</p>' '<p>The SciPost Team.</p>') email_context = { - 'title': cls.assignment.to.get_title_display(), + 'title': cls.assignment.to.profile.get_title_display(), 'last_name': cls.assignment.to.user.last_name, 'sub_title': cls.assignment.submission.title, 'author_list': cls.assignment.submission.author_list, @@ -134,7 +134,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def send_author_prescreening_passed_email(cls): """ Requires loading 'assignment' attribute. """ - email_text = ('Dear ' + cls.assignment.submission.submitted_by.get_title_display() + ' ' + email_text = ('Dear ' + cls.assignment.submission.submitted_by.profile.get_title_display() + ' ' + cls.assignment.submission.submitted_by.user.last_name + ', \n\nWe are pleased to inform you that your recent Submission to SciPost,\n\n' + cls.assignment.submission.title + ' by ' + cls.assignment.submission.author_list @@ -189,7 +189,7 @@ class SubmissionUtils(BaseMailUtil): '<p>Sincerely,</p>' '<p>The SciPost Team.</p>') email_context = { - 'title': cls.assignment.submission.submitted_by.get_title_display(), + 'title': cls.assignment.submission.submitted_by.profile.get_title_display(), 'last_name': cls.assignment.submission.submitted_by.user.last_name, 'sub_title': cls.assignment.submission.title, 'author_list': cls.assignment.submission.author_list, @@ -220,7 +220,7 @@ class SubmissionUtils(BaseMailUtil): 'Dear ' + cls.invitation.get_title_display() + ' ' + cls.invitation.last_name + ',\n\n' 'On behalf of the Editor-in-charge ' - + cls.invitation.submission.editor_in_charge.get_title_display() + ' ' + + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' ' + cls.invitation.submission.editor_in_charge.user.last_name + ', we would like to cordially remind you of our recent request to referee\n\n' + cls.invitation.submission.title + ' by ' @@ -295,7 +295,7 @@ class SubmissionUtils(BaseMailUtil): email_context = { 'title': cls.invitation.get_title_display(), 'last_name': cls.invitation.last_name, - 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(), + 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(), 'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name, 'sub_title': cls.invitation.submission.title, 'author_list': cls.invitation.submission.author_list, @@ -328,7 +328,7 @@ class SubmissionUtils(BaseMailUtil): 'Dear ' + cls.invitation.get_title_display() + ' ' + cls.invitation.last_name + ',\n\n' 'On behalf of the Editor-in-charge ' - + cls.invitation.submission.editor_in_charge.get_title_display() + ' ' + + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' ' + cls.invitation.submission.editor_in_charge.user.last_name + ', we would like to cordially remind you of our recent request to referee\n\n' + cls.invitation.submission.title + ' by ' @@ -381,7 +381,7 @@ class SubmissionUtils(BaseMailUtil): email_context = { 'title': cls.invitation.get_title_display(), 'last_name': cls.invitation.last_name, - 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(), + 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(), 'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name, 'sub_title': cls.invitation.submission.title, 'author_list': cls.invitation.submission.author_list, @@ -412,7 +412,7 @@ class SubmissionUtils(BaseMailUtil): email_text = ('Dear ' + cls.invitation.get_title_display() + ' ' + cls.invitation.last_name + ',\n\n' 'On behalf of the Editor-in-charge ' - + cls.invitation.submission.editor_in_charge.get_title_display() + ' ' + + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' ' + cls.invitation.submission.editor_in_charge.user.last_name + ', we would like to inform you that your report on\n\n' + cls.invitation.submission.title + ' by ' @@ -452,7 +452,7 @@ class SubmissionUtils(BaseMailUtil): email_context = { 'title': cls.invitation.get_title_display(), 'last_name': cls.invitation.last_name, - 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(), + 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(), 'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name, 'sub_title': cls.invitation.submission.title, 'author_list': cls.invitation.submission.author_list, @@ -474,7 +474,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def acknowledge_report_email(cls): """ Requires loading 'report' attribute. """ - email_text = ('Dear ' + cls.report.author.get_title_display() + ' ' + + email_text = ('Dear ' + cls.report.author.profile.get_title_display() + ' ' + cls.report.author.user.last_name + ',' '\n\nMany thanks for your Report on Submission\n\n' + cls.report.submission.title + ' by ' @@ -527,7 +527,7 @@ class SubmissionUtils(BaseMailUtil): '\n<strong>Requested changes</strong>: <br/><p>{{ requested_changes|linebreaks }}</p>' '\n<strong>Remarks for Editors</strong>: <br/><p>{{ remarks_for_editors|linebreaks }}</p>') email_context = { - 'ref_title': cls.report.author.get_title_display(), + 'ref_title': cls.report.author.profile.get_title_display(), 'ref_last_name': cls.report.author.user.last_name, 'sub_title': cls.report.submission.title, 'author_list': cls.report.submission.author_list, @@ -557,7 +557,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def send_author_report_received_email(cls): """ Requires loading 'report' attribute. """ - email_text = ('Dear ' + cls.report.submission.submitted_by.get_title_display() + ' ' + + email_text = ('Dear ' + cls.report.submission.submitted_by.profile.get_title_display() + ' ' + cls.report.submission.submitted_by.user.last_name + ', \n\nA Report has been posted on your recent Submission to SciPost,\n\n' + cls.report.submission.title + ' by ' + cls.report.submission.author_list + '.' @@ -588,7 +588,7 @@ class SubmissionUtils(BaseMailUtil): '<p>Sincerely,</p>' '<p>The SciPost Team.</p>') email_context = { - 'auth_title': cls.report.submission.submitted_by.get_title_display(), + 'auth_title': cls.report.submission.submitted_by.profile.get_title_display(), 'auth_last_name': cls.report.submission.submitted_by.user.last_name, 'sub_title': cls.report.submission.title, 'author_list': cls.report.submission.author_list, @@ -620,7 +620,7 @@ class SubmissionUtils(BaseMailUtil): if cls.communication.comtype in ['AtoE', 'RtoE', 'StoE']: recipient_email.append(cls.communication.submission.editor_in_charge.user.email) recipient_greeting = ('Dear ' + - cls.communication.submission.editor_in_charge.get_title_display() + ' ' + + cls.communication.submission.editor_in_charge.profile.get_title_display() + ' ' + cls.communication.submission.editor_in_charge.user.last_name) further_action_page = ('https://scipost.org/submission/editorial_page/' + cls.communication.submission.preprint.identifier_w_vn_nr) @@ -630,14 +630,14 @@ class SubmissionUtils(BaseMailUtil): elif cls.communication.comtype in ['EtoA']: recipient_email.append(cls.communication.submission.submitted_by.user.email) recipient_greeting = ('Dear ' + - cls.communication.submission.submitted_by.get_title_display() + ' ' + + cls.communication.submission.submitted_by.profile.get_title_display() + ' ' + cls.communication.submission.submitted_by.user.last_name) bcc_emails.append(cls.communication.submission.editor_in_charge.user.email) bcc_emails.append('submissions@scipost.org') elif cls.communication.comtype in ['EtoR']: recipient_email.append(cls.communication.referee.user.email) recipient_greeting = ('Dear ' + - cls.communication.referee.get_title_display() + ' ' + + cls.communication.referee.profile.get_title_display() + ' ' + cls.communication.referee.user.last_name) bcc_emails.append(cls.communication.submission.editor_in_charge.user.email) bcc_emails.append('submissions@scipost.org') @@ -672,7 +672,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def send_author_revision_requested_email(cls): """ Requires loading 'submission' and 'recommendation' attributes. """ - email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' + + email_text = ('Dear ' + cls.submission.submitted_by.profile.get_title_display() + ' ' + cls.submission.submitted_by.user.last_name + ', \n\nThe Editor-in-charge of your recent Submission to SciPost,\n\n' + cls.submission.title + ' by ' + cls.submission.author_list + ',' @@ -719,7 +719,7 @@ class SubmissionUtils(BaseMailUtil): '<p>Sincerely,</p>' '<p>The SciPost Team.</p>') email_context = { - 'auth_title': cls.submission.submitted_by.get_title_display(), + 'auth_title': cls.submission.submitted_by.profile.get_title_display(), 'auth_last_name': cls.submission.submitted_by.user.last_name, 'sub_title': cls.submission.title, 'author_list': cls.submission.author_list, @@ -741,7 +741,7 @@ class SubmissionUtils(BaseMailUtil): @classmethod def send_author_College_decision_email(cls): """ Requires loading 'submission' and 'recommendation' attributes. """ - email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' + + email_text = ('Dear ' + cls.submission.submitted_by.profile.get_title_display() + ' ' + cls.submission.submitted_by.user.last_name + ', \n\nThe Editorial College of SciPost has taken a decision ' 'regarding your recent Submission,\n\n' + @@ -808,7 +808,7 @@ class SubmissionUtils(BaseMailUtil): '<p>Sincerely,</p>' '<p>The SciPost Team.</p>') email_context = { - 'auth_title': cls.submission.submitted_by.get_title_display(), + 'auth_title': cls.submission.submitted_by.profile.get_title_display(), 'auth_last_name': cls.submission.submitted_by.user.last_name, 'sub_title': cls.submission.title, 'author_list': cls.submission.author_list, diff --git a/submissions/views.py b/submissions/views.py index fb0689332c400f35db88739593c77a0f15fc2cde..29bf3589d5caa2bce1cc2249424ec3ceedf3e7fe 100644 --- a/submissions/views.py +++ b/submissions/views.py @@ -786,7 +786,7 @@ def editorial_assignment(request, identifier_w_vn_nr, assignment_id=None): if submission.editor_in_charge: messages.success( request, '{} {} has already agreed to be Editor-in-charge of this Submission.'.format( - submission.editor_in_charge.get_title_display(), + submission.editor_in_charge.profile.get_title_display(), submission.editor_in_charge.user.last_name)) return redirect('submissions:pool') elif submission.status == STATUS_ASSIGNMENT_FAILED: diff --git a/templates/email/authors/acknowledge_resubmission.html b/templates/email/authors/acknowledge_resubmission.html index ad17676eed41947636a2ddc6f562b8344637c500..56cfe1721c795963a06329dfc08a6e9c2c04e63c 100644 --- a/templates/email/authors/acknowledge_resubmission.html +++ b/templates/email/authors/acknowledge_resubmission.html @@ -1,4 +1,4 @@ -<p>Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},</p> +<p>Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},</p> <p> We have received your Resubmission to SciPost <br><br> diff --git a/templates/email/authors/acknowledge_submission.html b/templates/email/authors/acknowledge_submission.html index 8a4e2bb3f5ceb49de486ca268b4d661982df0ae0..065a74dc312f7079772614f02642ee3936b764f9 100644 --- a/templates/email/authors/acknowledge_submission.html +++ b/templates/email/authors/acknowledge_submission.html @@ -1,4 +1,4 @@ -<p>Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},</p> +<p>Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},</p> <p> We have received your Submission to SciPost <br><br> diff --git a/templates/email/authors/confirm_puboffer_acceptance.html b/templates/email/authors/confirm_puboffer_acceptance.html index 1b6a199130a33fb8202ad7a401917d250267b42b..fcb4b453293c9ef0bfd9ca1d1b1051a93f457902 100644 --- a/templates/email/authors/confirm_puboffer_acceptance.html +++ b/templates/email/authors/confirm_puboffer_acceptance.html @@ -1,5 +1,5 @@ <p> - Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }}, + Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }}, </p> <p> We hereby confirm your acceptance of our publication offer of your Submission diff --git a/templates/email/authors/inform_authors_comment_received.html b/templates/email/authors/inform_authors_comment_received.html index 4c833668c949bc4d928bc9c8e9359ad1273236af..0272dd015e32dd5e71fbfa2274d5bc98f353b028 100644 --- a/templates/email/authors/inform_authors_comment_received.html +++ b/templates/email/authors/inform_authors_comment_received.html @@ -1,5 +1,5 @@ <p> - Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }}, + Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }}, </p> <p> We would like to inform you that a Comment has been posted on your recent Submission diff --git a/templates/email/authors/inform_authors_contributor_commented_report.html b/templates/email/authors/inform_authors_contributor_commented_report.html index 6859a8a9da132d8acc1aa963c5c1527ef0c1237b..c8cfe615d4219557b641342eb94378f3517c5f5e 100644 --- a/templates/email/authors/inform_authors_contributor_commented_report.html +++ b/templates/email/authors/inform_authors_contributor_commented_report.html @@ -1,5 +1,5 @@ <p> - Dear {{ report.submission.submitted_by.get_title_display }} {{ report.submission.submitted_by.user.last_name }}, + Dear {{ report.submission.submitted_by.profile.get_title_display }} {{ report.submission.submitted_by.user.last_name }}, </p> <p> For your information, a Contributor Comment has been posted on a recent Report on your Submission diff --git a/templates/email/authors/inform_authors_editorial_decision.html b/templates/email/authors/inform_authors_editorial_decision.html index a28072d69aecb76ecae23cd067ce07705e7e82ce..1cdd11c4feab85d4f4f9ee7d90adbd10e7702727 100644 --- a/templates/email/authors/inform_authors_editorial_decision.html +++ b/templates/email/authors/inform_authors_editorial_decision.html @@ -1,6 +1,6 @@ {% load automarkup %} <p> - Dear {{ decision.submission.submitted_by.get_title_display }} {{ decision.submission.submitted_by.user.last_name }}, + Dear {{ decision.submission.submitted_by.profile.get_title_display }} {{ decision.submission.submitted_by.user.last_name }}, </p> <p> The Editorial College of SciPost has come to a decision regarding your Submission diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html index 3787809638becb6423216292c3e710e5b5370a9a..8edaa0ab33e4ca6f7c831e99af3ad25a1b7115cb 100644 --- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html +++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html @@ -1,5 +1,5 @@ <p> - Dear {{ assignment.submission.submitted_by.get_title_display }} {{ assignment.submission.submitted_by.user.last_name }}, + Dear {{ assignment.submission.submitted_by.profile.get_title_display }} {{ assignment.submission.submitted_by.user.last_name }}, </p> <p> For your information, your Submission diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.html b/templates/email/authors/inform_authors_manuscript_withdrawn.html index 641084448c74e68310a237c869283a29b1636661..cf9d4de40a9db53cfb71ff69ff232fbe7d4ff8d3 100644 --- a/templates/email/authors/inform_authors_manuscript_withdrawn.html +++ b/templates/email/authors/inform_authors_manuscript_withdrawn.html @@ -1,5 +1,5 @@ <p> - Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }}, + Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }}, </p> <p> We hereby acknowledge withdrawal of your recent SciPost submission, diff --git a/templates/email/authors/request_pubfrac_check.html b/templates/email/authors/request_pubfrac_check.html index ecd83f640d3fe32ec3e9cd1b78041a1b2c1fd17f..37c4bb79a96b1139104b37c45d76e9d1fe9c6734 100644 --- a/templates/email/authors/request_pubfrac_check.html +++ b/templates/email/authors/request_pubfrac_check.html @@ -1,5 +1,5 @@ <p> - Dear {{ publication.accepted_submission.submitted_by.get_title_display }} {{ publication.accepted_submission.submitted_by.user.last_name }}, + Dear {{ publication.accepted_submission.submitted_by.profile.get_title_display }} {{ publication.accepted_submission.submitted_by.user.last_name }}, </p> <p> For your recent SciPost publication, diff --git a/templates/email/commenters/inform_commenter_comment_received.html b/templates/email/commenters/inform_commenter_comment_received.html index b94e9c6ea5848cf41b74fb0e39d61681e20cd315..9592c289885ca0c6b374369079228c5229a33c0c 100644 --- a/templates/email/commenters/inform_commenter_comment_received.html +++ b/templates/email/commenters/inform_commenter_comment_received.html @@ -1,6 +1,6 @@ {% load automarkup %} -<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p> +<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p> <p> We hereby confirm reception of your {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %}, concerning <br/> diff --git a/templates/email/commenters/inform_commenter_comment_rejected.html b/templates/email/commenters/inform_commenter_comment_rejected.html index 8590ac57b2fe4fe0e7cf24dac8c8f50810ad26a4..e97476e2be576c727965cdbcd93521180d6ba353 100644 --- a/templates/email/commenters/inform_commenter_comment_rejected.html +++ b/templates/email/commenters/inform_commenter_comment_rejected.html @@ -1,6 +1,6 @@ {% load automarkup %} -<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p> +<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p> <p> The {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} you have submitted, concerning <br/> diff --git a/templates/email/commenters/inform_commenter_comment_vetted.html b/templates/email/commenters/inform_commenter_comment_vetted.html index 594dd4889adf67ed75385b3982a8a90ad6149322..bc9393592d7ab0f99b1a269c3adfa16cd2c1f01e 100644 --- a/templates/email/commenters/inform_commenter_comment_vetted.html +++ b/templates/email/commenters/inform_commenter_comment_vetted.html @@ -1,6 +1,6 @@ {% load automarkup %} -<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p> +<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p> <p> The {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} you have submitted, concerning diff --git a/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html b/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html index c7910ddd0a615600a08e0af2d10e2bcac6a0de5b..89b8d7c54a1692c845c8825dbed2753d3cc21185 100644 --- a/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html +++ b/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html @@ -1,5 +1,5 @@ <p> - Dear {{ object.duplicate_of.get_title_display }} {{ object.duplicate_of.user.last_name }}, + Dear {{ object.duplicate_of.profile.get_title_display }} {{ object.duplicate_of.user.last_name }}, </p> <p> We noticed that you had two separate registrations at SciPost, and have consolidated your two accounts into a single active one, namely your account with username <strong><em style="color: green;">{{ object.duplicate_of.user.username }}</em></strong>. diff --git a/templates/email/eic/assignment_request.html b/templates/email/eic/assignment_request.html index c37be4b33d53030911dc6e4d5236d3ab1b5c0dcc..1f24672965c5628ae28bd33aa8c78fc8125941d3 100644 --- a/templates/email/eic/assignment_request.html +++ b/templates/email/eic/assignment_request.html @@ -1,5 +1,5 @@ <p> - Dear {{ object.to.get_title_display }} {{ object.to.user.last_name }}, + Dear {{ object.to.profile.get_title_display }} {{ object.to.user.last_name }}, </p> <p> We have received a Submission to SciPost for which we would like you to consider becoming Editor-in-charge: diff --git a/templates/email/eic/inform_eic_comment_received.html b/templates/email/eic/inform_eic_comment_received.html index d326b01998d386afd8ea742811c8c206050ee299..940d843fccd8745de2f5f6f32854f1d7cc94cf19 100644 --- a/templates/email/eic/inform_eic_comment_received.html +++ b/templates/email/eic/inform_eic_comment_received.html @@ -1,7 +1,7 @@ -<p>Dear {{ comment.core_content_object.editor_in_charge.get_title_display }} {{ comment.core_content_object.editor_in_charge.user.last_name }},</p> +<p>Dear {{ comment.core_content_object.editor_in_charge.profile.get_title_display }} {{ comment.core_content_object.editor_in_charge.user.last_name }},</p> <p> - {{ comment.author.get_title_display }} {{ comment.author.user.last_name }} has delivered a Comment for Submission: + {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }} has delivered a Comment for Submission: </p> <p> {{ comment.core_content_object.title }} diff --git a/templates/email/eic/inform_eic_manuscript_withdrawn.html b/templates/email/eic/inform_eic_manuscript_withdrawn.html index f601baf855d30e6ec8057b614217b742482bdb26..6d3711ef5010c1d2fdcb6236fb43f374b9ef87e4 100644 --- a/templates/email/eic/inform_eic_manuscript_withdrawn.html +++ b/templates/email/eic/inform_eic_manuscript_withdrawn.html @@ -1,4 +1,4 @@ -<p>Dear {{ submission.editor_in_charge.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p> +<p>Dear {{ submission.editor_in_charge.profile.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p> <p> For your information, the authors of Submission diff --git a/templates/email/eic/inform_eic_report_received.html b/templates/email/eic/inform_eic_report_received.html index 3710e9af72a3f318dbe9a345f6b4267f4c2c0b0e..dd5cd56c57fb1cfcb5fe7e5608beab99e95f09b1 100644 --- a/templates/email/eic/inform_eic_report_received.html +++ b/templates/email/eic/inform_eic_report_received.html @@ -1,7 +1,7 @@ -<p>Dear {{ report.submission.editor_in_charge.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p> +<p>Dear {{ report.submission.editor_in_charge.profile.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p> <p> - Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission: + Referee {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission: </p> <p> {{ report.submission.title }} diff --git a/templates/email/eic/referee_response.html b/templates/email/eic/referee_response.html index 7a7b7782a6825758e3136a8d4257eee0fc18bbe2..653fe8ec463b321257266cc5aa6f97c6aba3b322 100644 --- a/templates/email/eic/referee_response.html +++ b/templates/email/eic/referee_response.html @@ -1,7 +1,7 @@ -<p>Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},</p> +<p>Dear {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},</p> <p> - Referee {% if invitation.referee %}{{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission + Referee {% if invitation.referee %}{{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission </p> <p> {{ invitation.submission.title }} diff --git a/templates/email/eic/referee_unresponsive.html b/templates/email/eic/referee_unresponsive.html index 499b9722bfb26669ca17a229a45e8fc59a77c365..89c905eec86acc73f0ceaacaea64bedc39152b45 100644 --- a/templates/email/eic/referee_unresponsive.html +++ b/templates/email/eic/referee_unresponsive.html @@ -1,5 +1,5 @@ <p> - Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, + Dear {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, </p> <p> Referee {{ invitation.get_title_display }} {{ invitation.last_name }}, whom you invited to referee diff --git a/templates/email/eic/submission_reappointment.html b/templates/email/eic/submission_reappointment.html index 1107435d70ff8647f8eb0edfe893b189029d0b94..7595e5b5772aca5e16d1d1a98b301c3de5dc1671 100644 --- a/templates/email/eic/submission_reappointment.html +++ b/templates/email/eic/submission_reappointment.html @@ -1,4 +1,4 @@ -<p>Dear {{ submission.editor_in_charge.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p> +<p>Dear {{ submission.editor_in_charge.profile.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p> <p> The authors of the SciPost Submission diff --git a/templates/email/email_comment_made_citable.html b/templates/email/email_comment_made_citable.html index eeae17f15511c40c2e24852f3a1d25e2a4ddb91a..5d84301c825f44db392f639f9568a0c0e2d15be3 100644 --- a/templates/email/email_comment_made_citable.html +++ b/templates/email/email_comment_made_citable.html @@ -1,9 +1,9 @@ -<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p> +<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p> <p> The Comment you have submitted, concerning publication with title - {{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} (<a href="https://scipost.org{{comment.get_absolute_url}}">see on SciPost.org</a>) + {{ comment.core_content_object.title }} by {% if comment.core_content_object.author_list %}{{ comment.core_content_object.author_list }}{% elif comment.core_content_object.author %}{{ comment.core_content_object.author }}{% endif %} (<a href="https://scipost.org{{ comment.get_absolute_url }}">see on SciPost.org</a>) has been ascribed DOI <a href="//doi.org/{{ comment.doi_string }}">{{ comment.doi_string }}</a> (https://doi.org/{{ comment.doi_string }}), and is thus now citable in the form: </p> <p> diff --git a/templates/email/email_report_made_citable.html b/templates/email/email_report_made_citable.html index 1c871e5d6b251d88d732be89f5401adf5896d5ea..ca9b259714e9728b70364f45309df33b10e41537 100644 --- a/templates/email/email_report_made_citable.html +++ b/templates/email/email_report_made_citable.html @@ -1,4 +1,4 @@ -<p>Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},</p> +<p>Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},</p> <p> Your Report on Submission: diff --git a/templates/email/email_report_made_citable.txt b/templates/email/email_report_made_citable.txt index a09663eebe0302d0482076600f9fdb25c6d5b97d..a6c85f85470a84ac934fd6b202312a3ca092dc5f 100644 --- a/templates/email/email_report_made_citable.txt +++ b/templates/email/email_report_made_citable.txt @@ -1,4 +1,4 @@ -Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }}, +Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}, Your Report on Submission: diff --git a/templates/email/fellows/email_fellow_assigned_submission.html b/templates/email/fellows/email_fellow_assigned_submission.html index 71b4f6ddc95fe316c359d70bc96984c3b2a41ff4..d57d281f0369a29dd2697265d87037925fffe13c 100644 --- a/templates/email/fellows/email_fellow_assigned_submission.html +++ b/templates/email/fellows/email_fellow_assigned_submission.html @@ -1,4 +1,4 @@ -Dear {{ assignment.to.get_title_display }} {{ assignment.to.user.last_name }}, +Dear {{ assignment.to.profile.get_title_display }} {{ assignment.to.user.last_name }}, Thank you for accepting to become Editor-in-charge of the SciPost Submission diff --git a/templates/email/fellows/email_fellow_replaced_by_other.html b/templates/email/fellows/email_fellow_replaced_by_other.html index 92f1e04c6b64824c4ed9137995346023af5c9279..7ca463e87c5caacd477dc04a03db8eb4743c6fb4 100644 --- a/templates/email/fellows/email_fellow_replaced_by_other.html +++ b/templates/email/fellows/email_fellow_replaced_by_other.html @@ -1,4 +1,4 @@ -Dear {{ assignment.to.get_title_display }} {{ assignment.to.user.last_name }}, +Dear {{ assignment.to.profile.get_title_display }} {{ assignment.to.user.last_name }}, We have deprecated your assignment as Editor-in-charge of Submission diff --git a/templates/email/fellows/email_fellow_tasklist.html b/templates/email/fellows/email_fellow_tasklist.html index 6b10719dd889956f88f51c02d569868af74e86a0..e31fe3710860fd20cdad38d2c6efba640358467f 100644 --- a/templates/email/fellows/email_fellow_tasklist.html +++ b/templates/email/fellows/email_fellow_tasklist.html @@ -1,4 +1,4 @@ -<p>Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},</p> +<p>Dear {{ fellow.profile.get_title_display }} {{ fellow.user.last_name }},</p> <p>Please find below a summary of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely intervention on any point in need of attention. Your good work as an Editorial Fellow is greatly appreciated!</p> diff --git a/templates/email/org_contacts/email_contact_for_activation.html b/templates/email/org_contacts/email_contact_for_activation.html index 3c22cb2ba554360fc5c31a811841e6d96fc87b2a..d7f37d8fba43b6a2e4e61da704f798c6a20e1e72 100644 --- a/templates/email/org_contacts/email_contact_for_activation.html +++ b/templates/email/org_contacts/email_contact_for_activation.html @@ -1,10 +1,10 @@ -<p>Dear {{contact.get_title_display}} {{contact.user.last_name}},</p> +<p>Dear {{ contact.get_title_display }} {{ contact.user.last_name }},</p> <p> Many thanks for sponsoring SciPost. We have now created a personal account for you on scipost.org, which will allow you to access all relevant information and functionalities related to sponsoring. </p> <p> - In order to activate your account, please navigate to <a href="https://scipost.org{% url 'organizations:activate_account' contact.activation_key %}?email={{contact.user.email}}">this link</a>. You will be asked to choose a password, after which you will be able to login (your username being defined as your email address). + In order to activate your account, please navigate to <a href="https://scipost.org{% url 'organizations:activate_account' contact.activation_key %}?email={{ contact.user.email }}">this link</a>. You will be asked to choose a password, after which you will be able to login (your username being defined as your email address). </p> <p> After logging in, you will find a “Org dashboard†link in the top menu, which will take you to your info page, where you will find further links for managing your account and the associated data (in particular, the public visibility settings of your sponsorship amounts and associated documents). diff --git a/templates/email/production_send_proofs.html b/templates/email/production_send_proofs.html index 2474e4b625fdcec949c55dfd0307a0fc4234e217..a6c1c084ba7afd4172c2010156ace93705e1be36 100644 --- a/templates/email/production_send_proofs.html +++ b/templates/email/production_send_proofs.html @@ -1,5 +1,5 @@ <p> - Dear {% for author in proofs.stream.submission.authors.all %}{{ author.get_title_display }} {{ author.user.last_name }}{% if not forloop.last %}, {% elif proofs.stream.submission.authors.count > 1 %} and {% endif %}{% endfor %}, + Dear {% for author in proofs.stream.submission.authors.all %}{{ author.profile.get_title_display }} {{ author.user.last_name }}{% if not forloop.last %}, {% elif proofs.stream.submission.authors.count > 1 %} and {% endif %}{% endfor %}, </p> <p> diff --git a/templates/email/referees/confirmation_invitation_response.html b/templates/email/referees/confirmation_invitation_response.html index 5194156e5dffd522f4de15d2d82a6e81962e2968..d8183c155607bcd9d4ba315e60dd5d95dcedd355 100644 --- a/templates/email/referees/confirmation_invitation_response.html +++ b/templates/email/referees/confirmation_invitation_response.html @@ -1,4 +1,4 @@ -<p>Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},</p> +<p>Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},</p> <p> We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission diff --git a/templates/email/referees/inform_referee_authors_replied_to_report.html b/templates/email/referees/inform_referee_authors_replied_to_report.html index 089c8afa4e3f325a2c42bb793a7a82e6dde8f2ea..f851931e2cfc29777ca0ecf0f6f32f926cf635a8 100644 --- a/templates/email/referees/inform_referee_authors_replied_to_report.html +++ b/templates/email/referees/inform_referee_authors_replied_to_report.html @@ -1,5 +1,5 @@ <p> - Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }}, + Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}, </p> <p> For your information, an Author Reply has been posted on your recent Report on diff --git a/templates/email/referees/inform_referee_contributor_commented_report.html b/templates/email/referees/inform_referee_contributor_commented_report.html index 71c327038efb07138e128a24b218b7b835707206..518f9efd5a49cd2d28ef7487f9f41853894378e8 100644 --- a/templates/email/referees/inform_referee_contributor_commented_report.html +++ b/templates/email/referees/inform_referee_contributor_commented_report.html @@ -1,5 +1,5 @@ <p> - Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }}, + Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}, </p> <p> For your information, a Contributor Comment has been posted on your recent Report on diff --git a/templates/email/referees/inform_referee_manuscript_withdrawn.html b/templates/email/referees/inform_referee_manuscript_withdrawn.html index a88db6f1e895d96c3e22f3be34cc038c55e7eefe..c0bb6f6518d6883db06b9ef776dcdf2cd8b5a766 100644 --- a/templates/email/referees/inform_referee_manuscript_withdrawn.html +++ b/templates/email/referees/inform_referee_manuscript_withdrawn.html @@ -1,5 +1,5 @@ <p> - Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}, + Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}, </p> <p> This is a simple email to inform you that the authors of diff --git a/templates/email/referees/inform_referee_report_received.html b/templates/email/referees/inform_referee_report_received.html index 420253b29485403019d9798855a5b31fbdc273f3..07b2e3e69f644b476c5b41c6ff3b9829ebda4034 100644 --- a/templates/email/referees/inform_referee_report_received.html +++ b/templates/email/referees/inform_referee_report_received.html @@ -1,5 +1,5 @@ <p> - Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }}, + Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}, </p> <p>We hereby confirm reception of your Report on Submission</p> diff --git a/templates/email/referees/invite_contributor_to_referee.html b/templates/email/referees/invite_contributor_to_referee.html index a6cafd69f3595f725a3ade490a9aa722aa491e0b..87191c20ca0bcd04bffc4a7768817dae822f0ee9 100644 --- a/templates/email/referees/invite_contributor_to_referee.html +++ b/templates/email/referees/invite_contributor_to_referee.html @@ -1,8 +1,8 @@ <p> - Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}, + Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}, </p> <p> - We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee: + We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee: <br><br> {{ invitation.submission.title }} <br>by {{ invitation.submission.author_list }}<br> diff --git a/templates/email/referees/invite_contributor_to_referee_reminder1.html b/templates/email/referees/invite_contributor_to_referee_reminder1.html index a1c0ebed3d9d4f373851c66598aebd64b28c7944..8e56cc9b81d238fa70ccb88b213484a5f0aac748 100644 --- a/templates/email/referees/invite_contributor_to_referee_reminder1.html +++ b/templates/email/referees/invite_contributor_to_referee_reminder1.html @@ -1,9 +1,9 @@ <h3>Re: refereeing invitation. First automatic reminder</h3> <p> - Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}, + Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}, </p> <p> - Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> + Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> {{ invitation.submission.title }}<br> by {{ invitation.submission.author_list }}<br> (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}). diff --git a/templates/email/referees/invite_contributor_to_referee_reminder2.html b/templates/email/referees/invite_contributor_to_referee_reminder2.html index d6b656ecf17c7cdcba521291d68bbe18755d572e..96947dbe3daa67af593674706e97e823de1ea620 100644 --- a/templates/email/referees/invite_contributor_to_referee_reminder2.html +++ b/templates/email/referees/invite_contributor_to_referee_reminder2.html @@ -1,9 +1,9 @@ <h3>Re: refereeing invitation. Second (and last) automatic reminder</h3> <p> - Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}, + Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}, </p> <p> - Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> + Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> {{ invitation.submission.title }}<br> by {{ invitation.submission.author_list }}<br> (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}). diff --git a/templates/email/referees/invite_unregistered_to_referee.html b/templates/email/referees/invite_unregistered_to_referee.html index 2f5c4fbc7322c46bc20a755c73e8242cd2dac55b..524d3c4f312dcdedaefea0cd02a08dd0a8c592bc 100644 --- a/templates/email/referees/invite_unregistered_to_referee.html +++ b/templates/email/referees/invite_unregistered_to_referee.html @@ -2,7 +2,7 @@ Dear {{ invitation.get_title_display }} {{ invitation.last_name }}, </p> <p> - On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> + On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> {{ invitation.submission.title }}<br> by {{ invitation.submission.author_list }}<br> (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}). diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder1.html b/templates/email/referees/invite_unregistered_to_referee_reminder1.html index 021fe3fabb6ddd6514a2adad4d2eaf2afe123ad2..81aa6cbbfbee8210e3f3f501c88c795674fa476c 100644 --- a/templates/email/referees/invite_unregistered_to_referee_reminder1.html +++ b/templates/email/referees/invite_unregistered_to_referee_reminder1.html @@ -3,7 +3,7 @@ Dear {{ invitation.get_title_display }} {{ invitation.last_name }}, </p> <p> - Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> + Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> {{ invitation.submission.title }}<br> by {{ invitation.submission.author_list }}<br> (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}). diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder2.html b/templates/email/referees/invite_unregistered_to_referee_reminder2.html index 71e89874d13e9ef5bd05a81d5db6de1931e191e0..7388b23ba5faf35d2ff7c3d0ef6b6b0f974b34e5 100644 --- a/templates/email/referees/invite_unregistered_to_referee_reminder2.html +++ b/templates/email/referees/invite_unregistered_to_referee_reminder2.html @@ -3,7 +3,7 @@ Dear {{ invitation.get_title_display }} {{ invitation.last_name }}, </p> <p> - Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> + Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br> {{ invitation.submission.title }}<br> by {{ invitation.submission.author_list }}<br> (see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}). diff --git a/templates/email/referees/reinvite_contributor_to_referee.html b/templates/email/referees/reinvite_contributor_to_referee.html index 053e5a39e5e7ff4c5cba04a6b1074cb9cb397bb4..d87395665b457aa39b87d474fbc1311352686e79 100644 --- a/templates/email/referees/reinvite_contributor_to_referee.html +++ b/templates/email/referees/reinvite_contributor_to_referee.html @@ -10,7 +10,7 @@ (<a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">see on SciPost.org</a>) </p> <p> - have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to quickly review this new version. + have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to quickly review this new version. </p> <p> Please accept or decline the invitation (login required) as soon as possible (ideally within the next 2 days). diff --git a/templates/email/referees/remind_referee_deadline_1week.html b/templates/email/referees/remind_referee_deadline_1week.html index 47fb08344f67a034a0795d4cd99e0b8796b6b6cb..65bf441dd1c6e14223277c8dbe90b64a8c1f5baf 100644 --- a/templates/email/referees/remind_referee_deadline_1week.html +++ b/templates/email/referees/remind_referee_deadline_1week.html @@ -1,5 +1,5 @@ <p> - Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}, + Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}, </p> <p> This is a simple email to remind you of the approaching deadline (in one week) to send a Report on diff --git a/templates/email/submissions_assignment_failed.html b/templates/email/submissions_assignment_failed.html index 50325341264851db339279b72f59ffbf79c21f8c..a1e2e83f761650742e4a696831e8528409c6fb82 100644 --- a/templates/email/submissions_assignment_failed.html +++ b/templates/email/submissions_assignment_failed.html @@ -1,4 +1,4 @@ -<p>Dear {{ object.submitted_by.get_title_display }} {{ object.submitted_by.user.last_name }},</p> +<p>Dear {{ object.submitted_by.profile.get_title_display }} {{ object.submitted_by.user.last_name }},</p> <p>Your recent Submission to SciPost,</p> <p>{{ object.title }}</p> <p>by {{ object.author_list }}</p> diff --git a/theses/forms.py b/theses/forms.py index 2a05dbdde0cf44cc7a386619450eb5135219fee9..9939d0f4edd0b1f9fea6273f2f72602ddf0ee812 100644 --- a/theses/forms.py +++ b/theses/forms.py @@ -68,7 +68,7 @@ class VetThesisLinkForm(BaseRequestThesisLinkForm): def vet_request(self, thesislink, user): mail_params = { - 'vocative_title': thesislink.requested_by.get_title_display(), + 'vocative_title': thesislink.requested_by.profile.get_title_display(), 'thesislink': thesislink, 'full_url': build_absolute_uri_using_site(thesislink.get_absolute_url()) }