diff --git a/config/locales/en.yml b/config/locales/en.yml index 93eb8956ad..57d1edab0f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -60,8 +60,10 @@ en: activerecord: errors: + full_messages: + format: "{{message}}" messages: - blank: This field cannot be blank + blank: "%{attribute} is empty - it is a required field and must be filled in" accepted: Must be accepted taken: "This %{attribute} has already been taken" too_long: "%{attribute} is too long (maximum is %{count} characters)" @@ -71,6 +73,10 @@ en: models: user: attributes: + email: + invalid: "Email is invalid - enter a valid email address" + role: + blank: "Account type is empty - it is a required field and an option should be selected from the following list" password: weak_password: Your new password must be more complex. admin: diff --git a/spec/features/account/collaborators_spec.rb b/spec/features/account/collaborators_spec.rb index 0acfbbb710..1702c0f3ce 100644 --- a/spec/features/account/collaborators_spec.rb +++ b/spec/features/account/collaborators_spec.rb @@ -101,7 +101,7 @@ end within(".collaborator_email") do - expect_to_see "This field cannot be blank" + expect_to_see "Email is empty - it is a required field and must be filled in" end end