From e44802c795f68022c4dc753cf89bac3a0371bfb2 Mon Sep 17 00:00:00 2001 From: Anders <6058745+ddabble@users.noreply.github.com> Date: Wed, 26 Oct 2022 23:28:50 +0200 Subject: [PATCH] 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 https://github.com/MAKENTNU/web/issues/563. --- locale/nb/LC_MESSAGES/django.mo | Bin 51610 -> 51640 bytes locale/nb/LC_MESSAGES/django.po | 25 +++++++++++----------- news/models.py | 7 ++++-- news/templates/news/event/event_form.html | 11 +++++----- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/locale/nb/LC_MESSAGES/django.mo b/locale/nb/LC_MESSAGES/django.mo index 3744f0cb38d74c2dc285c9445adb19af48aae778..954ef247dcb1c06d24b62e79f77e282ad23d80aa 100644 GIT binary patch delta 14012 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�aG$HW8PvfBrH$Y_8tVXw(E^QCr;{HS-~; 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 diff --git a/locale/nb/LC_MESSAGES/django.po b/locale/nb/LC_MESSAGES/django.po index 113af6c54..5e4772052 100644 --- 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.
(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." +"
(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 index 34941e2f9..3175c849e 100644 --- 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 index f8c0d4d47..0c9bfafef 100644 --- 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 %}/>