Improve usability by adding explanation about existing accounts

website/registrations/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-13 16:43+0200\n"
-"PO-Revision-Date: 2018-04-13 16:44+0200\n"
+"POT-Creation-Date: 2018-05-09 20:43+0200\n"
+"PO-Revision-Date: 2018-05-09 20:48+0200\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -237,58 +237,66 @@ msgid "city"
 msgstr "stad"
 
 #: models.py:234
-msgid "A user with that email address already exists."
-msgstr "Er bestaat al een gebruiker met dit e-mailadres."
+msgid ""
+"A user with that email address already exists. Login using the existing "
+"account and renew the membership by visiting the account settings."
+msgstr ""
+"Er bestaat al een gebruiker met dit e-mailadres. Login met het bestaande "
+"account en vernieuw het lidmaatschap in de accountinstellingen."
 
-#: models.py:244
-msgid "A user with that student number already exists."
-msgstr "Er bestaat al een gebruiker met dit studentnummer."
+#: models.py:246
+msgid ""
+"A user with that student number already exists. Login using the existing "
+"account and renew the membership by visiting the account settings."
+msgstr ""
+"Er bestaat al een gebruiker met dit studentnummer. Login met het bestaande "
+"account en vernieuw het lidmaatschap in de accountinstellingen."
 
-#: models.py:249
+#: models.py:253
 msgid "A user with that username already exists."
 msgstr "Er bestaat al een gebruiker met deze gebruikersnaam."
 
-#: models.py:254 models.py:259
+#: models.py:258 models.py:263
 msgid "This field is required."
 msgstr "Dit veld is verplicht."
 
-#: models.py:274
+#: models.py:278
 msgid "registation"
 msgstr "registratie"
 
-#: models.py:275
+#: models.py:279
 msgid "registrations"
 msgstr "registraties"
 
-#: models.py:282
+#: models.py:286
 msgid "member"
 msgstr "lid"
 
-#: models.py:299 tests/test_models.py:209
+#: models.py:303 tests/test_models.py:209
 msgid "You already have a renewal request queued for review."
 msgstr "Je hebt al een aanvraag tot verlenging openstaan."
 
-#: models.py:307 models.py:308
+#: models.py:311 models.py:312
 msgid "You currently have an active membership."
 msgstr "Je hebt op dit moment een actief lidmaatschap."
 
-#: models.py:321
+#: models.py:325
 msgid "You cannot renew your membership at this moment."
 msgstr "Je kunt je lidmaatschap op dit moment niet verlengen."
 
-#: models.py:327
+#: models.py:331
 msgid ""
 "Supporters cannot have a membership that lasts their entire study duration."
 msgstr "Begunstigers kunnen geen lidmaatschap hebben dat loopt tot afstuderen."
 
-#: models.py:340 templates/registrations/renewal.html:4
+#: models.py:344 templates/registrations/renewal.html:4
 #: templates/registrations/renewal.html:7
 #: templates/registrations/renewal_success.html:4
 #: templates/registrations/renewal_success.html:7
 msgid "renewal"
 msgstr "verlenging"
 
-#: models.py:341
+#: models.py:345
 msgid "renewals"
 msgstr "verlenging"
 
@@ -674,34 +682,37 @@ msgstr ""
 #: templates/registrations/register_member.html:17
 #, python-format
 msgid ""
-"\n"
-"        A membership costs € %(year_fees)s per year, or € %(study_fees)s for "
-"your entire study duration.<br/>\n"
-"        Note: Only Computing Science and Information Sciences students at "
-"the Radboud University can become a member.<br/><br/>\n"
-"        It is still possible to be associated with Thalia, even if you do "
-"not study Computing Science or Information Sciences (anymore): You can "
-"become a supporter. For at least € %(year_fees)s per year, you too can enjoy "
-"everything Thalia has to offer.<br />\n"
-"        <em>Note that this form is only for member registration. Please "
-"visit the board room if you want to become a supporter.</em>\n"
-"    "
+"A membership costs € %(year_fees)s per year, or € %(study_fees)s for your "
+"entire study duration.<br/> Note: Only Computing Science and Information "
+"Sciences students at the Radboud University can become a member.<br/><br/> "
+"It is still possible to be associated with Thalia, even if you do not study "
+"Computing Science or Information Sciences (anymore): You can become a "
+"supporter. For at least € %(year_fees)s per year, you too can enjoy "
+"everything Thalia has to offer.<br /> <em>Note that this form is only for "
+"member registration. Please visit the board room if you want to become a "
+"supporter.</em>"
 msgstr ""
-"\n"
-"        Een lidmaatschap kost € %(year_fees)s per jaar, of € %(study_fees)s "
-"voor je hele studieperiode.<br/>\n"
-"        Let wel op: Je kunt alleen lid worden wanneer je informatica of "
-"informatiekunde studeert aan de Radboud Universiteit.<br/><br/>\n"
-"        Mocht je nu geen Informatica of Informatiekunde (meer) studeren, "
-"maar toch verbonden willen zijn, dan kan dat ook. Hiervoor kun je "
-"begunstiger van Thalia worden. Voor minimaal € %(year_fees)s per jaar kun je "
-"ook genieten van alles wat Thalia je te bieden heeft.\n"
-"        <em>Let op dat dit formulier alleen gebruikt kan worden voor "
-"registratie van leden. Neem contact op met het bestuur als je begunstiger "
-"wilt worden.</em>\n"
-"    "
+"Een lidmaatschap kost € %(year_fees)s per jaar, of € %(study_fees)s voor je "
+"hele studieperiode.<br/>Let wel op: Je kunt alleen lid worden wanneer je "
+"informatica of informatiekunde studeert aan de Radboud Universiteit.<br/><br/"
+">Mocht je nu geen Informatica of Informatiekunde (meer) studeren, maar toch "
+"verbonden willen zijn, dan kan dat ook. Hiervoor kun je begunstiger van "
+"Thalia worden. Voor minimaal € %(year_fees)s per jaar kun je ook genieten "
+"van alles wat Thalia je te bieden heeft.<br/><em>Let op dat dit formulier "
+"alleen gebruikt kan worden voor registratie van leden. Neem contact op met "
+"het bestuur als je begunstiger wilt worden.</em>"
+
+#: templates/registrations/register_member.html:26
+msgid ""
+"If you've been a member before you should login using your existing account "
+"and renew your membership by visiting the account settings. You'll be unable "
+"to re-register using this form."
+msgstr ""
+"Ben je al eens lid geweest van Thalia? Log dan in met je bestaande account "
+"en vernieuw je lidmaatschap in de accountinstellingen. Je kunt je niet "
+"opnieuw registreren via dit formulier."
 
-#: templates/registrations/register_member.html:60
+#: templates/registrations/register_member.html:67
 #, python-format
 msgid ""
 "I accept the <a target=\"_blank\" href=\"%(privacy_policy_url)s\">privacy "
@@ -710,7 +721,7 @@ msgstr ""
 "Ik ga akkoord met het <a target=\"_blank\" href=\"%(privacy_policy_url)s"
 "\">privacybeleid</a>"
 
-#: templates/registrations/register_member.html:66
+#: templates/registrations/register_member.html:73
 #: templates/registrations/renewal.html:78
 msgid "send"
 msgstr "verstuur"

website/registrations/models.py

@@ -231,7 +231,9 @@ class Registration(Entry):
 
         if get_user_model().objects.filter(email=self.email).exists():
             errors.update({
-                'email': _('A user with that email address already exists.')})
+                'email': _('A user with that email address already exists. '
+                           'Login using the existing account and renew the '
+                           'membership by visiting the account settings.')})
 
         if (self.student_number is not None and (
             Profile.objects.filter(
@@ -241,7 +243,9 @@ class Registration(Entry):
                 .exclude(pk=self.pk).exists())):
             errors.update({
                 'student_number':
-                    _('A user with that student number already exists.')})
+                    _('A user with that student number already exists. '
+                      'Login using the existing account and renew the '
+                      'membership by visiting the account settings.')})
 
         if self.username is not None and get_user_model().objects.filter(
                 username=self.username).exists():

website/registrations/templates/registrations/register_member.html

@@ -14,7 +14,7 @@
     <h1>{% trans "registration" %}</h1>
 
     <p class="tcenter">
-    {% blocktrans %}
+    {% blocktrans trimmed %}
         A membership costs € {{ year_fees }} per year, or € {{ study_fees }} for your entire study duration.<br/>
         Note: Only Computing Science and Information Sciences students at the Radboud University can become a member.<br/><br/>
         It is still possible to be associated with Thalia, even if you do not study Computing Science or Information Sciences (anymore): You can become a supporter. For at least € {{ year_fees }} per year, you too can enjoy everything Thalia has to offer.<br />
@@ -22,6 +22,13 @@
     {% endblocktrans %}
     </p>
 
+    <p class="tcenter">
+    {% blocktrans trimmed %}
+        If you've been a member before you should login using your existing account and renew your membership by visiting the account settings.
+        You'll be unable to re-register using this form.
+    {% endblocktrans %}
+    </p>
+
     <hr/>
 
     <form method="post" enctype="multipart/form-data" class="form-horizontal span8 offset2">