Made event type labels easier to understand

* `REPEATING` should be the default choice for most events - even if the event is not planned to repeat, because if it's decided in the future that another occurrence should be created, that can be done without having to change the type, and because this event type seems to have the most intuitive behavior for most users. * `STANDALONE` should only be chosen if all the time places need to have one common registration, which is why this event type has a more detailed description including an example, to make it appear more like a non-standard choice. Also, the term "multipart" should be more fitting for which kind of event the option is intended to be used for. These changes should also complement the planned renaming of the event types in #563.
MAKENTNU · Mar 3, 2023 · e44802c · e44802c
1 parent 371cd7f
commit e44802c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/locale/nb/LC_MESSAGES/django.mo b/locale/nb/LC_MESSAGES/django.mo
diff --git a/locale/nb/LC_MESSAGES/django.po b/locale/nb/LC_MESSAGES/django.po
@@ -2379,12 +2379,12 @@ msgid "The article will be hidden until this date."
 msgstr "Artikkelen vil være skjult fram til publiseringstidspunktet."
 
 #: news/models.py:108
-msgid "Repeating"
-msgstr "Gjentagende"
+msgid "Standard (repeating)"
+msgstr "Standard (gjentagende)"
 
 #: news/models.py:109
-msgid "Standalone"
-msgstr "Frittstående"
+msgid "Multipart (standalone)"
+msgstr "Flerdagers (frittstående)"
 
 #: news/models.py:115
 msgid "type of event"
@@ -2671,20 +2671,19 @@ msgid "No registration"
 msgstr "Ingen påmelding"
 
 #: news/templates/news/event/event_form.html:22
-msgid ""
-"Used for repeating events where the user is to register for one of several "
-"occurrences. Each occurrence will have its own registration."
+msgid "Each created occurrence of this event will have its own registration."
 msgstr ""
-"Brukt for gjentagende arrangementer hvor brukeren registrerer seg for ett av "
-"flere tidspunkter. Hvert tidspunkt vil ha sin egen registrering."
+"Hver lagde forekomst av dette arrangementet vil ha sin egen registrering."
 
 #: news/templates/news/event/event_form.html:37
 msgid ""
-"Used for events that happen once, e.g. a weekend-long happening. All "
-"occurrences of the event will have a common registration."
+"All created occurrences of this event will have one common registration.<br/"
+"> (Used e.g. for a multiday workshop where ticket holders are encouraged to "
+"attend some or all of the occurrences.)"
 msgstr ""
-"Brukt for arrangementer som skjer én gang, f.eks. en workshop i en helg. Det "
-"vil være en felles registrering for alle tidspunktene til arrangementet."
+"Alle lagde forekomster av dette arrangementet vil ha én felles registrering."
+"<br/> (Brukt f.eks. for en flerdagers workshop hvor påmeldte er oppfordret "
+"til å delta på alle eller noen av forekomstene.)"
 
 #: news/templates/news/event/event_form.html:55
 #: news/templates/news/event/time_place_form.html:7

diff --git a/news/models.py b/news/models.py
@@ -105,8 +105,11 @@ def past(self) -> 'EventQuerySet[Event]':
 
 class Event(NewsBase):
     class Type(models.TextChoices):
-        REPEATING = 'R', _("Repeating")
-        STANDALONE = 'S', _("Standalone")
+        # TODO: remove the "repeating" and "standalone" parentheses and rename the choice variables to `STANDARD` and `MULTIPART`,
+        #       after a grace period (a couple months?) where old users have time to learn that the choices are simply getting new names
+        #       (See https://github.com/MAKENTNU/web/issues/563 for more details)
+        REPEATING = 'R', _("Standard (repeating)")
+        STANDALONE = 'S', _("Multipart (standalone)")
 
     event_type = models.CharField(
         choices=Type.choices,

diff --git a/news/templates/news/event/event_form.html b/news/templates/news/event/event_form.html
@@ -20,8 +20,7 @@
                                {% if field.value == Event.Type.REPEATING %}checked{% endif %}/>
                         <label for="repeating">{{ Event.Type.REPEATING.label }}
                             <span class="popup-trigger" data-content="{% blocktranslate trimmed %}
-                                Used for repeating events where the user is to register for one of several occurrences.
-                                Each occurrence will have its own registration.
+                                Each created occurrence of this event will have its own registration.
                             {% endblocktranslate %}">
                                 <i class="make-col-yellow question circle icon"></i>
                             </span>
@@ -34,10 +33,10 @@
                         <input id="standalone" type="radio" name="{{ field.name }}" value="{{ Event.Type.STANDALONE }}"
                                {% if field.value == Event.Type.STANDALONE %}checked{% endif %}/>
                         <label for="standalone">{{ Event.Type.STANDALONE.label }}
-                            <span class="popup-trigger" data-content="{% blocktranslate trimmed %}
-                                Used for events that happen once, e.g. a weekend-long happening.
-                                All occurrences of the event will have a common registration.
-                            {% endblocktranslate %}">
+                            <span class="popup-trigger" data-html="{% blocktranslate trimmed %}
+                                All created occurrences of this event will have one common registration.<br/>
+                                (Used e.g. for a multiday workshop where ticket holders are encouraged to attend some or all of the occurrences.)
+                            {% endblocktranslate %}" data-variation="wide">
                                 <i class="make-col-yellow question circle icon"></i>
                             </span>
                         </label>