Merge branch 'main' into 741-graphql-api

amelie/activities/templates/includes/activity_enrollment.html

@@ -2,48 +2,65 @@
 
 {% if obj.enrollment_open and not obj.oauth_application %}
     {% if not obj.enrollment_full %}
+
         <p>
+            {% if request.person %}
+                {# Begin of logged in user #}
+                {% if obj.places_available == None %}
+                    {# Display how many people signed up. #}
+                    {% if obj.participants %}
+                        {% blocktrans count sign_ups=obj.confirmed_participants.count %}
+                            1 person signed up.
+                        {% plural %}
+                            {{ sign_ups }} people signed up.
+                        {% endblocktrans %}
+                    {% endif %}
+                {% else %}
+                    {# Display how many people signed up. #}
+                    {% if obj.participants %}
+                        {% blocktrans with sign_ups=obj.confirmed_participants.count places=obj.maximum %}
+                            {{ sign_ups }}/{{ places }} people signed up.
+                        {%  endblocktrans %}
+                    {% endif %}
+                {% endif %}
+            {% else %}
+                {# Begin of guest user, don't display sign-up numbers #}
+                {% if obj.places_available == 1 %}
+                    {% blocktrans  %}
+                        For this activity, there is one place left.
+                    {% endblocktrans %}
+                {% elif obj.places_available > 1 and obj.places_available <= 10 %}
+                    {% blocktrans with places=obj.places_available %}
+                        For this activity, there are {{ places }} places left.
+                    {% endblocktrans %}
+                {% else %}
+                    {% blocktrans %}
+                        For this activity, there are still places left.
+                    {% endblocktrans %}
+                {% endif %}
+            {% endif %}
+
             {% if obj.places_available == None %}
+                {# Some shared text between logged in and logged out #}
                 {% blocktrans %}
-                    For this activity there is no maximum number of participants
-                {% endblocktrans %}
-                {% if  obj.price != 0.00 %}
+                    For this activity there is no maximum number of participants.
+                {%  endblocktrans %}
+                {% if obj.price != 0.00 %}
                     {% blocktrans %}
                         If you want to be at this activity, you need to enroll.
                     {% endblocktrans %}
                 {% endif %}
             {% else %}
-                {% if request.person %}
-                    {% blocktrans count places=obj.places_available %}
-                       For this activity, there is one place left.
-                    {% plural %}
-                       For this activity there are {{ places }} places left.
-                    {% endblocktrans %}
-                {% else %}
-                    {% if obj.places_available == 1 %}
-                        {% blocktrans  %}
-                            For this activity, there is one place left.
-                        {% endblocktrans %}
-                    {% elif obj.places_available > 1 and obj.places_available <= 10 %}
-                        {% blocktrans with places=obj.places_available %}
-                            For this activity, there are {{ places }} places left.
-                        {% endblocktrans %}
-                    {% else %}
-                        {% blocktrans %}
-                            For this activity, there are still places left.
-                        {% endblocktrans %}
-                    {% endif %}
-                {%  endif %}
                 {% blocktrans %}
                     If you want to be at this activity, you need to enroll.
                 {% endblocktrans %}
             {% endif %}
-                {% blocktrans with enddate=obj.enrollment_end|date:"d F Y" endtime=obj.enrollment_end|date:"H:i" %}
-                     You can enroll for this activity until {{ enddate }} at {{ endtime }}.
-                {% endblocktrans %}
 
+            {% blocktrans with enddate=obj.enrollment_end|date:"d F Y" endtime=obj.enrollment_end|date:"H:i" %}
+                   You can enroll for this activity until {{ enddate }} at {{ endtime }}.
+            {% endblocktrans %}
         </p>
-    {% elif not request.person %}
+    {% else %}
         <p>
             {% blocktrans %}
                 The maximum number of participants for this activity has been reached.