From bcd1613493953f84cdd76572a523fda4c1d8253f Mon Sep 17 00:00:00 2001 From: Lisa Li <42653157+lisa-sa-li@users.noreply.github.com> Date: Sat, 23 Jan 2021 14:06:26 -0500 Subject: [PATCH] added CAD after $$ (#54) --- hackathon_site/event/jinja2/event/landing.html | 6 +++--- .../jinja2/review/emails/accepted_email_body.html | 2 +- hackathon_site/review/tests.py | 12 +++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hackathon_site/event/jinja2/event/landing.html b/hackathon_site/event/jinja2/event/landing.html index 61f03f8..9858b09 100644 --- a/hackathon_site/event/jinja2/event/landing.html +++ b/hackathon_site/event/jinja2/event/landing.html @@ -184,7 +184,7 @@

FAQ

- Unfortunately, our team will not be able to ship out any hardware for MakeUofT 2021. However, the first 200 people to apply and be accepted will be able to get a $25 reimbursement after submitting a demo of their project! If you submit as a team, each eligible team member will receive a separate reimbursement. + Unfortunately, our team will not be able to ship out any hardware for MakeUofT 2021. However, the first 200 people to apply and be accepted will be able to get a $25 CAD reimbursement after submitting a demo of their project! If you submit as a team, each eligible team member will receive a separate reimbursement.
@@ -204,7 +204,7 @@

FAQ

- This year, 1st, 2nd, and 3rd place teams overall will receive cash prizes of $2500, $1500, and $750 respectively, while the winning teams for our design challenges will receive $750. + This year, 1st, 2nd, and 3rd place teams overall will receive cash prizes of $2500, $1500, and $750 CAD respectively, while the winning teams for our design challenges will receive $750 CAD.
@@ -239,7 +239,7 @@

FAQ

- The first 200 people to apply will be able to get a $25 reimbursement after submitting a demo of their project, as an e-transfer to the email used during their application. We'll let you know in your acceptance email if you were one of the first 200 people to apply. + The first 200 people to apply will be able to get a $25 CAD reimbursement after submitting a demo of their project, as an e-transfer to the email used during their application. We'll let you know in your acceptance email if you were one of the first 200 people to apply.
diff --git a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html index fb007fb..01394fc 100644 --- a/hackathon_site/review/jinja2/review/emails/accepted_email_body.html +++ b/hackathon_site/review/jinja2/review/emails/accepted_email_body.html @@ -5,7 +5,7 @@

The {{ hackathon_name }} team has reviewed your application, and we’re excited to welcome you to {{ hackathon_name }}!

{% if reimbursement_eligible %} -

Because you were one of the first 200 people to apply, as long as you submit your project you will be eligible for a $25 reimbursement at the end of the event. Once your project has been submitted, you will receive an e-transfer from us to this email address, {{ user.email }}. If you submit with teammates, and any of them also received this message, you will each be separately eligible for the reimbursement.

+

Because you were one of the first 200 people to apply, as long as you submit your project you will be eligible for a $25 CAD reimbursement at the end of the event. Once your project has been submitted, you will receive an e-transfer from us to this email address, {{ user.email }}. If you submit with teammates, and any of them also received this message, you will each be separately eligible for the reimbursement.

{% endif %}

Read our participant package for all the info regarding the event, and join our {{ chat_room_name }}. Stay tuned for more updates regarding detailed event logistics, and we hope to see you soon! If you have questions, read the FAQ on your dashboard or feel free to contact us.

diff --git a/hackathon_site/review/tests.py b/hackathon_site/review/tests.py index 649a2d0..3ad58be 100644 --- a/hackathon_site/review/tests.py +++ b/hackathon_site/review/tests.py @@ -381,17 +381,23 @@ def test_first_200_applied_accepted_get_reimbursement_message(self): # First 50 should have the reimbursement message for i in range(50): self.assertIn( - "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i + "you will be eligible for a $25 CAD reimbursement", + mail.outbox[i].body, + i, ) # Next 100 (applications 101-200) should have the reimbursement message for i in range(50, 150): self.assertIn( - "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i + "you will be eligible for a $25 CAD reimbursement", + mail.outbox[i].body, + i, ) # Next 4 (applications 201-204) should not have the message for i in range(150, 154): self.assertNotIn( - "you will be eligible for a $25 reimbursement", mail.outbox[i].body, i + "you will be eligible for a $25 CAD reimbursement", + mail.outbox[i].body, + i, )