Merge branch 'main' of github.com:tamuhack-org/Ouroboros

tamuhack-org · Dec 8, 2024 · e07c6d1 · e07c6d1
2 parents 12c5423 + 0892dad
commit e07c6d1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/hiss/application/forms.py b/hiss/application/forms.py
@@ -243,7 +243,7 @@ def __init__(self, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
 
-        photo_agreement = "Do you grant permission for TAMUhack to use your name, likeness, voice, and any photographs, video recordings, or audio recordings taken during the event 'TAMUhack 2025' for promotional and media purposes, including but not limited to publications, websites, social media, and press releases?"
+        photo_agreement = "I grant permission for TAMUhack to use my name, likeness, voice, and any photographs, video recordings, or audio recordings taken during the event 'TAMUhack 2025' for promotional and media purposes, including but not limited to publications, websites, social media, and press releases."
         accessibilities = "Please check this box if you require any accommodations to ensure accessibility during this event. Our team will follow up to discuss your needs."
 
         self.fields["agree_to_photos"].label = mark_safe(photo_agreement)

diff --git a/hiss/templates/application/emails/approved.html b/hiss/templates/application/emails/approved.html
@@ -45,7 +45,7 @@ <h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">
           margin-bottom: 20px;
         "
       >
-        You have been accepted to {{EVENT_NAME}} {{EVENT_YEAR}}! We were impressed by your application and we're excited to see you  
+        You have been accepted to {{event_name}} {{event_year}}! We were impressed by your application and we're excited to see you  
         <span style="color: #ADD8E6; font-weight: 700"
         >{{ event_date_text }}.</span>
       </p>
@@ -122,7 +122,7 @@ <h2 style="margin-bottom: 20px; font-size: 16px; color: #777777">
       </h3>
 
       <strong style="color: #ADD8E6; font-size: 16px">
-        The {{ ORGANIZER_NAME }} Team
+        The {{ organizer_name }} Team
       </strong>
     </div>
   </div>

diff --git a/hiss/templates/application/emails/created.html b/hiss/templates/application/emails/created.html
@@ -17,7 +17,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Hi {{ first_nam
 					color: #777777;
 					margin-bottom: 20px;">
 				We just wanted to let you know we received your application for
-				{{EVENT_NAME}} {{EVENT_YEAR}} We'll be carefully reviewing your application
+				{{event_name}} {{event_year}}. We'll be carefully reviewing your application
 				and will get back to you soon!
 			</p>
 
@@ -31,7 +31,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Hi {{ first_nam
 
 			<strong style=" color: #ADD8E6;
 							font-size: 14px;">
-				The {{ORGANIZER_NAME}} Team
+				The {{organizer_name}} Team
 			</strong>
 
 		</div>

diff --git a/hiss/templates/application/emails/rejected.html b/hiss/templates/application/emails/rejected.html
@@ -22,9 +22,12 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 					font-weight: normal;
 					color: #777777;
 					margin-bottom: 20px;">
-					Thank you so much for applying to {{ EVENT_NAME }} {{ EVENT_YEAR }}. We really appreciate the time you took to share your
-				interests and skills with us. Unfortunately, due to space limitations of the MSC, we are only able to accept a limited number hackers, and we are unable to grant you an acceptance. If you're still interested in hacking with us, our spring hackathon, TAMUhack, has a bigger capacity and more awesome prizes to win! We hope to see you there!
+					Thank you so much for applying to {{ event_name }} {{ event_year }}. We really appreciate the time you took to share your
+				interests and skills with us. Unfortunately, due to space limitations of the MSC, we are only able to accept a limited number hackers, and we are unable to grant you an acceptance. 
 				<br>
+				However, we will have a waitlist line and we are extending an invitation for you to join our waitlist. Starting at 10AM, we will admit people from the waitlist line until the MSC capacity has been reached, since not all accepted people will show up to the event.
+				Please come early to ensure you have a higher chance of being admitted to the event as it is <strong>first come, first serve</strong>. More info will be sent in the coming days. We hope to see you there!
+				<!-- If you're still interested in hacking with us, our spring hackathon, TAMUhack, has a bigger capacity and more awesome prizes to win! We hope to see you there! -->
 			</p>
 
 			<!-- <p style="line-height: 20px; -webkit-font-smoothing: antialiased;
@@ -45,7 +48,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 					font-weight: normal;
 					color: #777777;
 					margin-bottom: 20px;">
-					If interested in future iterations of {{EVENT_NAME}}, please join our <a href="https://tamuhack.org/#our-community"
+					If interested in future iterations of {{event_name}}, please join our <a href="https://tamuhack.org/#our-community"
 					target="_blank" style="color:#00ADD8">newsletter</a> to stay informed about application openings.
 					We appreciate your understanding and wish you the very best in your future endeavors.
 
@@ -64,7 +67,7 @@ <h2 style="margin-bottom: 20px; font-size: 14px; color: #777777">Dear {{ first_n
 
 			<strong style=" color: #ADD8E6;
 							font-size: 14px;">
-				The {{ ORGANIZER_NAME }} Team
+				The {{ organizer_name }} Team
 			</strong>
 
 		</div>