Merge branch 'release/v12.48'

rowers/tasks.py

@@ -1067,7 +1067,7 @@ def handle_sendemail_raceregistration(
     else:
         debug = True
 
-    subject = "A new competitor has registered for virtual race {n}".format(
+    subject = "A new competitor has registered for virtual challenge {n}".format(
         n = racename
         )
 
@@ -1097,7 +1097,7 @@ def handle_sendemail_racesubmission(
     else:
         debug = True
 
-    subject = "A new result has been submitted for virtual race {n}".format(
+    subject = "A new result has been submitted for virtual challenge {n}".format(
         n = racename
         )
 

rowers/templates/course_replace.html

@@ -23,7 +23,7 @@
   <li class="grid_2">
     <p>
       This replaces the course {{ course.name }} with the course you select below for all
-      planned sessions and virtual races, and then deletes this course.
+      planned sessions and virtual challenges, and then deletes this course.
     </p>
     <form id="course_form" method="post">
     <table>

rowers/templates/disqualification_view.html

@@ -40,7 +40,7 @@
 <ul class="main-content">
   <li class="grid_4">
     <p>
-      Before you reject this race result, please carefully review it
+      Before you reject this challenge result, please carefully review it
       using the information below. If you still want to reject the entry,
       scroll down to the rejection form.
     </p>

rowers/templates/disqualificationemail.html

@@ -3,7 +3,7 @@
 <p>Dear <strong>{{ username }}</strong>,</p>
 
 <p>
-  Unfortunately, the result that you have submitted for the virtual race {{ racename }} has been rejected by the race organizer. 
+  Unfortunately, the result that you have submitted for the virtual challenge {{ racename }} has been rejected by the challenge organizer.
 </p>
 
 <p>
@@ -11,7 +11,7 @@
 </p>
 
 <p>
-  The race organizer added the following explanation:
+  The challenge organizer added the following explanation:
 <p>
 
 <p>
@@ -19,15 +19,14 @@
 </p>
 
 <p>
-  The decision to reject your result is the sole responsibility of the race organizer. If you disagree with the decision, please do contact him or her.
+  The decision to reject your result is the sole responsibility of the challenge organizer. If you disagree with the decision, please do contact him or her.
 </p>
 
 <p>
-  You are still registered for the race and can submit a result.
+  You are still registered for the challenge and can submit a result.
 </p>
 
 <p>
   Best Regards, the Rowsandall Team
 </p>
 {% endblock %}
-

rowers/templates/race_submit.html

@@ -2,7 +2,7 @@
 {% load staticfiles %}
 {% load rowerfilters %}
 
-{% block title %}Submit Race Result{% endblock %}
+{% block title %}Submit challenge Result{% endblock %}
 
 {% block meta %}
 <script type='text/javascript'
@@ -23,7 +23,7 @@
   <li class="grid_4">
     <form id="race_submit_form"
           method="post">
-      <p>Select one of the following workouts that you rowed within the race window</p>
+      <p>Select one of the following workouts that you rowed within the challenge window</p>
       <table width="100%">
         <tr>
           {% for field in w_form.hidden_fields %}
@@ -45,7 +45,7 @@
   <li class="grid_4">
     <p>
       Warning: If you submit a workout that was marked as "private", it will
-      be made public by submitting it as a race result.
+      be made public by submitting it as a challenge result.
     </p>
   </li>
 </ul>

rowers/templates/raceregisteredemail.html

@@ -3,17 +3,17 @@
 <p>Dear <strong>{{ username }}</strong>,</p>
 
 <p>
-  A new competitor has registered for the race {{ racename }}: {{ registeredname }}
+  A new competitor has registered for the challenge {{ racename }}: {{ registeredname }}
 </p>
 
 
 <p>
-  You can check race participants and results on the race page on Rowsandall:
+  You can check challenge participants and results on the challenge page on Rowsandall:
   <a href="{{ siteurl }}/rowers/virtualevent/{{ raceid }}">{{ racename }}</a>
 </p>
 
 <p>
-  You are receiving this email because you are on the start list for this race.
+  You are receiving this email because you are on the start list for this challenge.
   If you do not wish to receive these notifications, you can switch them off
   throught the link above.
 </p>
@@ -22,4 +22,3 @@
   Best Regards, the Rowsandall Team
 </p>
 {% endblock %}
-

rowers/templates/racesubmissionemail.html

@@ -8,12 +8,12 @@
 
 
 <p>
-  Check out the results on the race page!
+  Check out the results on the challenge page!
   <a href="{{ siteurl }}/rowers/virtualevent/{{ raceid }}">{{ racename }}</a>
 </p>
 
 <p>
-  You are receiving this email because you are on the start list for this race.
+  You are receiving this email because you are on the start list for this challenge.
   If you do not wish to receive these notifications, you can switch them off
   throught the link above.
 </p>
@@ -22,4 +22,3 @@
   Best Regards, the Rowsandall Team
 </p>
 {% endblock %}
-

rowers/templates/rankings.html

@@ -95,7 +95,7 @@
       parts of workouts for improved calculation accuracy.
     </p>
 
-    <p>Want to add race results but you don't have stroke data?
+    <p>Want to add challenge results but you don't have stroke data?
       <a href="/rowers/workout/addmanual/">Click here.</a></p>
 
     <p>Scroll down for the chart and pace predictions for ranking pieces.</p>

rowers/templates/share.html

@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block og_title %}{{ race.name }}{% endblock %}
-{% block description %}Virtual Rowing Race {{ race.name }}{% endblock %}
+{% block description %}Virtual Rowing Challenge {{ race.name }}{% endblock %}
 
 {% if racelogo %}
 {% block og_image %}

rowers/templates/virtualeventedit.html

@@ -2,11 +2,11 @@
 {% load staticfiles %}
 {% load rowerfilters %}
 
-{% block title %}Edit Virtual Race{% endblock %}
+{% block title %}Edit Virtual Challenge{% endblock %}
 
 {% block main %}
 
-<h1>Edit Race {{ race.name }}</h1>
+<h1>Edit Challenge {{ race.name }}</h1>
 
 <ul class="main-content">
   <li class="grid_2">
@@ -30,7 +30,7 @@
   <li class="grid_2 omega">
     <p>
       <ul>
-        <li>All times are local times in the race course time zone</li>
+        <li>All times are local times in the challenge course time zone</li>
         <li>Adding a contact phone number and email is not mandatory, but we
           strongly recommend it.</li>
         <li>If your event has a registration closure deadline, participants

rowers/templates/virtualeventranking.html

@@ -8,7 +8,7 @@
 {% leaflet_css %}
 {% endblock %}
 
-{% block title %}Rowsandall Virtual Race{% endblock %}
+{% block title %}Rowsandall Virtual Challenge{% endblock %}
 
 {% block scripts %}
 {% include "monitorjobs.html" %}
@@ -18,7 +18,7 @@
 {% endblock %}
 
 {% block og_title %}{{ race.name }}{% endblock %}
-{% block description %}Virtual Rowing Race {{ race.name }}{% endblock %}
+{% block description %}Virtual Rowing Challenge {{ race.name }}{% endblock %}
 
 {% if racelogo %}
 {% block og_image %}
@@ -185,7 +185,7 @@
   <li class="grid_2">
     <div id="raceinfo">
       <p>
-        <h2>Race Information</h2>
+        <h2>Challenge Information</h2>
       </p>
       <p>
         <table class="listtable shortpadded" width="100%">
@@ -242,7 +242,8 @@
     <div id="registerbuttons">
         {% if request.user.is_anonymous %}
         <p>
-          Registered users of rowsandall.com can participate in this event. Participation is free, unless specified differently in the race comment above.
+          Registered users of rowsandall.com can participate in this challenge.
+          Participation is free, unless specified differently in the comment above.
           {% if race.sessiontype == 'race' %}
           <a href="/rowers/virtualevent/{{ race.id }}/register"><h3>Register</h3></a>
           {% else %}
@@ -251,8 +252,8 @@
         </p>
       {% else %}
         <p>
-          See race rules below. Participation to this race is free,
+          See challenge rules below. Participation to this challenge is free,
-          unless specified differently in the race comment above.
+          unless specified differently in the comment above.
         </p>
         <p>
         {% for button in buttons %}
@@ -272,12 +273,12 @@
               <a href="/rowers/virtualevent/{{ race.id }}/submit">Submit Workout</a>
             </td>
             <td>
-              Submit a workout that is already on the site as your race result
+              Submit a workout that is already on the site as your challenge result
             </td>
           </tr>
           <tr>
             <td>
-              <a href="/rowers/workout/upload">Upload your race result</a>
+              <a href="/rowers/workout/upload/{{ race.id }}/">Upload your challenge result</a>
             </td>
             <td>
               Upload a new workout to the site and submit it as a result. You
@@ -287,7 +288,7 @@
           {% if race.sessiontype == 'indoorrace' %}
           <tr>
             <td>
-              <a href="/rowers/workout/addmanual">Enter your race result manually</a>
+              <a href="/rowers/workout/addmanual/{{ race.id }}">Enter your challenge result manually</a>
             </td>
             <td>
               If you don't have a data file, enter the results
@@ -318,10 +319,10 @@
         {% if button == 'editbutton' %}
         <p>
           {% if race.sessiontype == 'race' %}
-          <a href="/rowers/virtualevent/{{ race.id }}/edit">Edit Race
+          <a href="/rowers/virtualevent/{{ race.id }}/edit">Edit Challenge
           </a>
           {% else  %}
-          <a href="/rowers/virtualevent/{{ race.id }}/editindoor">Edit Race
+          <a href="/rowers/virtualevent/{{ race.id }}/editindoor">Edit Challenge
           </a>
           {% endif %}
         </p>
@@ -385,21 +386,21 @@
     {% if race.sessiontype == 'race' %}
     {% if record.emailnotifications %}
     <a href="/rowers/raceregistration/togglenotification/{{ race.id }}">
-      Unsubscribe from race notifications by email
+      Unsubscribe from challenge notifications by email
     </a>
     {% else %}
     <a href="/rowers/raceregistration/togglenotification/{{ race.id }}">
-      Subscribe to race notifications by email
+      Subscribe to challenge notifications by email
     </a>
     {% endif %}
     {% else %}
     {% if record.emailnotifications %}
     <a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}">
-      Unsubscribe from race notifications by email
+      Unsubscribe from challenge notifications by email
     </a>
     {% else %}
     <a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}">
-      Subscribe to race notifications by email
+      Subscribe to challenge notifications by email
     </a>
     {% endif %}
     {% endif %}
@@ -412,31 +413,31 @@
         <h2>Rules</h2>
       </p>
       <p>
-        Virtual races are intended as an informal way to add a
+        Virtual challenge are intended as an informal way to add a
         competitive element to training and as a quick way to set
-        up and manage small regattas.
+        up and manage for example race intensity practices.
       </p>
       <p>
-        On the water races are rowed on the course shown.
+        On the water challenges are rowed on the course shown.
         You cannot submit results rowed
         on other bodies of water.
       </p>
       <p>
-        Indoor races are open for all, wherever you live.
+        Indoor challenge are open for all, wherever you live.
         However, be aware of the
-        time zone for the race window.
+        time zone for the challenge window.
       </p>
         <p>
           As a rowsandall.com user, you can
           register to take part in this event. Please note the registration
           deadline. You must register before this deadline.
           You can always withdraw from participating before the registration
-          deadline or the start of the race window, whichever is earlier.
+          deadline or the start of the challenge window, whichever is earlier.
         </p>
         <p>
-          After the start of the race window and before the submission deadline,
+          After the start of the challenge window and before the submission deadline,
-          you can submit results by linking the race to one of your uploaded
+          you can submit results by linking the challenge to one of your uploaded
-          workouts. The workout start time must be within the race window
+          workouts. The workout start time must be within the challenge window
           and your course must pass through the blue polygons on the course
           map (in the right order), for your result to be valid.
         </p>
@@ -445,30 +446,30 @@
         are shown.
       </p>
       <p>
-        Race results are stored permanently and are not deleted when
+        Challenge results are stored permanently and are not deleted when
         you delete the respective workout or remove your account.
-        By registering, you agree with this and the race rules.
+        By registering, you agree with this and the challenge rules.
       </p>
       <p>
-        If you use a manually added workout for your indoor race result,
+        If you use a manually added workout for your indoor challenge result,
         please attach a screenshot of the ergometer display for verification.
       </p>
       <p>
-        Virtual Racing on rowsandall.com is honors based. Please be a good
+        Virtual Challenges on rowsandall.com is honors based. Please be a good
         sport, submit real results rowed by you, and make sure you set the
         boat type correctly. For (future functionality) age and gender
         corrected times, please be sure your gender and birth date are set
         correctly in your user settings.
       </p>
       <p>
-        Virtual races are intended as an informal way to add a
+        Virtual challenges are intended as an informal way to add a
-        competitive element to training. Virtual races are not
+        competitive element to training. Virtual challenges are not
         refereed or staffed to provide for participants safety.
         Individual participants are entirely responsible for their
-        safety while participating in a virtual race.
+        safety while participating in a virtual challenge.
       </p>
       <p>
-        Until the evaluation closure time, the race organizer can
+        Until the evaluation closure time, the challenge organizer can
         review and reject entries. If you are disqualified in this
         way, you will receive an email with the reason.
       </p>
@@ -488,9 +489,9 @@
      href="https://twitter.com/intent/tweet"
      data-url="{{ request.build_absolute_uri }}"
      {% if race.sessiontype == 'race' %}
-     data-text="@rowsandall #rowingdata Participate in virtual race '{{ race.name }}'">Tweet</a>
+     data-text="@rowsandall #rowingdata Participate in virtual challenge '{{ race.name }}'">Tweet</a>
   {% else %}
-  data-text="@rowsandall #rowingdata Participate in Indoor Rowing virtual race '{{ race.name }}'">Tweet</a>
+  data-text="@rowsandall #rowingdata Participate in Indoor Rowing virtual challenge '{{ race.name }}'">Tweet</a>
 {% endif %}
 </p><p>
   <a href="https://www.pinterest.com/pin/create/button/"
@@ -500,7 +501,7 @@
 
 
 {% if not racelogo and race.manager == request.user %}
-<a href="/rowers/virtualevent/{{ race.id }}/image">Add Race Logo</a>
+<a href="/rowers/virtualevent/{{ race.id }}/image">Add Challenge Logo</a>
 {% endif %}
 {% endblock %}
 

rowers/templates/workout_form.html

@@ -140,7 +140,7 @@ $('#id_workouttype').change();
     <h1>Racing</h1>
     {% for race in indoorraces %}
     <p>
-      <a href="/rowers/virtualevent/{{ race.id }}/submit/{{ workout.id|encode }}/">Submit this to Indoor Race {{ race.name }}</a>
+      <a href="/rowers/virtualevent/{{ race.id }}/submit/{{ workout.id|encode }}/">Submit this to Indoor Challenge {{ race.name }}</a>
     </p>
     {% endfor %}
   </li>

rowers/templates/workout_view.html

@@ -47,7 +47,7 @@
     {% if records %}
     {% for record in records %}
     <p>
-      This workout was a race. See race result here:
+      This workout was run as a virtual challenge. See challenge result here:
       <a href="/rowers/virtualevent/{{ record.race.id }}/">{{ record.race.name }}</a>
     </p>
     {% endfor %}
@@ -55,7 +55,7 @@
     {% if recordsindoor %}
     {% for record in recordsindoor %}
     <p>
-      This workout was a race. See race result here:
+      This workout was as a virtual challenge. See challenge result here:
       <a href="/rowers/virtualevent/{{ record.race.id }}/">{{ record.race.name }}</a>
     </p>
     {% endfor %}