Simplify and shorten validation warnings

See https://weblate.securedrop.org/translate/securedrop/securedrop/en/?checksum=4422f6d628edc7de#comments
freedomofpress · Jul 16, 2020 · cbd233a · cbd233a
1 parent fbacfad
commit cbd233a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/securedrop/journalist_app/forms.py b/securedrop/journalist_app/forms.py
@@ -23,17 +23,15 @@ def otp_secret_validation(form, field):
 def minimum_length_validation(form, field):
     if len(field.data) < Journalist.MIN_USERNAME_LEN:
         raise ValidationError(
-            gettext('Field must be at least {min_chars} '
-                    'characters long but only got '
-                    '{num_chars}.'.format(
-                        min_chars=Journalist.MIN_USERNAME_LEN,
-                        num_chars=len(field.data))))
+            gettext('Must be at least {min_chars} '
+                    'characters long.'
+                    .format(min_chars=Journalist.MIN_USERNAME_LEN)))
 
 
 def name_length_validation(form, field):
     if len(field.data) > Journalist.MAX_NAME_LEN:
         raise ValidationError(gettext(
-            'Field can not be more than {max_chars} characters.'
+            'Cannot be longer than {max_chars} characters.'
             .format(max_chars=Journalist.MAX_NAME_LEN)))
 
 

diff --git a/securedrop/tests/test_journalist.py b/securedrop/tests/test_journalist.py
@@ -781,7 +781,7 @@ def test_admin_add_user_first_name_too_long_warning(journalist_app, test_admin):
                                   password=VALID_PASSWORD,
                                   is_admin=None))
         text = resp.data.decode('utf-8')
-        assert 'Field can not be more than' in text
+        assert 'Cannot be longer than' in text
 
 
 def test_admin_add_user_last_name_too_long_warning(journalist_app, test_admin):
@@ -795,7 +795,7 @@ def test_admin_add_user_last_name_too_long_warning(journalist_app, test_admin):
                                   password=VALID_PASSWORD,
                                   is_admin=None))
         text = resp.data.decode('utf-8')
-        assert 'Field can not be more than' in text
+        assert 'Cannot be longer than' in text
 
 
 def test_admin_edits_user_invalid_username(
@@ -1244,7 +1244,7 @@ def test_admin_add_user_too_short_username(journalist_app, test_admin):
                                   password='pentagonpapers',
                                   password_again='pentagonpapers',
                                   is_admin=None))
-        msg = 'Field must be at least {} characters long'
+        msg = 'Must be at least {} characters long'
         assert (msg.format(Journalist.MIN_USERNAME_LEN) in resp.data.decode('utf-8'))