Copyediting related to press site #3711

src/core/forms/forms.py

@@ -106,8 +106,8 @@ class Meta:
 
 class PasswordResetForm(forms.Form):
 
-    password_1 = forms.CharField(widget=forms.PasswordInput, label=_('Password 1'))
-    password_2 = forms.CharField(widget=forms.PasswordInput, label=_('Password 2'))
+    password_1 = forms.CharField(widget=forms.PasswordInput, label=_('Password'))
+    password_2 = forms.CharField(widget=forms.PasswordInput, label=_('Confirm Password'))
 
     def clean_password_2(self):
         password_1 = self.cleaned_data.get("password_1")
@@ -193,6 +193,10 @@ class Meta:
                    'date_confirmed', 'confirmation_code', 'is_active',
                    'is_staff', 'is_admin', 'date_joined', 'password',
                    'is_superuser', 'enable_digest')
+        widgets = {
+            'biography': forms.Textarea(),
+            'signature': forms.Textarea(),
+        }
 
     def save(self, commit=True):
         user = super(EditAccountForm, self).save(commit=False)

src/core/locales/cy/LC_MESSAGES/django.po

@@ -178,7 +178,7 @@ msgid "Salutation"
 msgstr "Cyfarchiad "
 
 #: src/core/models.py:222
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:224

src/core/locales/de/LC_MESSAGES/django.po

@@ -172,7 +172,7 @@ msgid "Salutation"
 msgstr "Anrede"
 
 #: src/core/models.py:222
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:224

src/core/locales/en-us/LC_MESSAGES/django.po

@@ -178,7 +178,7 @@ msgid "Salutation"
 msgstr ""
 
 #: src/core/models.py:219
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:221

src/core/locales/fr/LC_MESSAGES/django.po

@@ -193,7 +193,7 @@ msgid "Salutation"
 msgstr "Salutation"
 
 #: src/core/models.py:222
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:224

src/core/locales/it/LC_MESSAGES/django.po

@@ -178,7 +178,7 @@ msgid "Salutation"
 msgstr "Titolo"
 
 #: src/core/models.py:222
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:224

src/core/locales/nl/LC_MESSAGES/django.po

@@ -174,7 +174,7 @@ msgid "Salutation"
 msgstr "Aanspreking"
 
 #: src/core/models.py:222
-msgid "Name suffix eg. jr"
+msgid "Name suffix"
 msgstr ""
 
 #: src/core/models.py:224

src/core/migrations/0001_initial.py

@@ -65,7 +65,7 @@ class Migration(migrations.Migration):
             name='Contact',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('recipient', models.EmailField(max_length=200, verbose_name='Who would you like to contact')),
+                ('recipient', models.EmailField(max_length=200, verbose_name='Who would you like to contact?')),
                 ('sender', models.EmailField(max_length=200, verbose_name='Your contact email address')),
                 ('subject', models.CharField(max_length=300, verbose_name='Subject')),
                 ('body', models.TextField(verbose_name='Your message')),

src/core/migrations/0074_account_suffix.py

@@ -15,6 +15,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='account',
             name='suffix',
-            field=models.CharField(blank=True, help_text='Name suffix eg. jr', max_length=300, null=True),
+            field=models.CharField(
+                blank=True,
+                verbose_name='Name suffix',
+                max_length=300,
+                null=True,
+            ),
         ),
     ]

src/core/models.py

@@ -219,7 +219,7 @@ class Account(AbstractBaseUser, PermissionsMixin):
         max_length=300,
         null=True,
         blank=True,
-        help_text=_('Name suffix eg. jr'),
+        verbose_name=_('Name suffix'),
     )
     biography = models.TextField(null=True, blank=True, verbose_name=_('Biography'))
     orcid = models.CharField(max_length=40, null=True, blank=True, verbose_name=_('ORCiD'))
@@ -1481,7 +1481,7 @@ def __str__(self):
 
 
 class Contact(models.Model):
-    recipient = models.EmailField(max_length=200, verbose_name='Who would you like to contact')
+    recipient = models.EmailField(max_length=200, verbose_name='Who would you like to contact?')
     sender = models.EmailField(max_length=200, verbose_name=_('Your contact email address'))
     subject = models.CharField(max_length=300, verbose_name=_('Subject'))
     body = models.TextField(verbose_name=_('Your message'))

src/core/views.py

@@ -343,8 +343,13 @@ def register(request):
                 new_user.add_account_role('author', request.journal)
             logic.send_confirmation_link(request, new_user)
 
-            messages.add_message(request, messages.SUCCESS, 'Your account has been created, please follow the'
-                                                            'instructions in the email that has been sent to you.')
+            messages.add_message(
+                request,
+                messages.SUCCESS,
+                'Your account has been created. '
+                'Please follow the instructions '
+                'in the email that has been sent to you.'
+            )
             return redirect(reverse('core_login'))
 
     template = 'core/accounts/register.html'

src/journal/migrations/0026_journal_keywords.py

@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='journal',
             name='keywords',
-            field=models.ManyToManyField(blank=True, null=True, to='submission.Keyword'),
+            field=models.ManyToManyField(blank=True, null=True, to='submission.Keyword', verbose_name='Discipline'),
         ),
     ]

src/journal/models.py

@@ -139,7 +139,12 @@ class Journal(AbstractSiteModel):
     # DEPRECATED "description" in favour of "journal_description" setting
     description = models.TextField(null=True, blank=True, verbose_name="Journal Description")
     contact_info = models.TextField(null=True, blank=True, verbose_name="Contact Information")
-    keywords = models.ManyToManyField("submission.Keyword", blank=True, null=True)
+    keywords = models.ManyToManyField(
+        "submission.Keyword",
+        blank=True,
+        null=True,
+        verbose_name="Discipline",
+    )
 
     disable_metrics_display = models.BooleanField(default=False)
     disable_article_images = models.BooleanField(