diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c70974eb8..d760b4b5f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1286,7 +1286,7 @@ en: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "is not allowed." ip_address: - blocked: "is blocked." + blocked: "New registrations are not allowed from your IP address." max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member." invite_mailer: diff --git a/lib/validators/allowed_ip_address_validator.rb b/lib/validators/allowed_ip_address_validator.rb index 461ad3449..fec0e61c6 100644 --- a/lib/validators/allowed_ip_address_validator.rb +++ b/lib/validators/allowed_ip_address_validator.rb @@ -5,7 +5,7 @@ class AllowedIpAddressValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) if record.ip_address if ScreenedIpAddress.should_block?(record.ip_address) - record.errors.add(attribute, options[:message] || I18n.t('user.ip_address.blocked')) + record.errors.add(attribute, I18n.t('user.ip_address.blocked')) end if record.trust_level == TrustLevel[0] && SpamHandler.should_prevent_registration_from_ip?(record.ip_address) record.errors.add(attribute, I18n.t('user.ip_address.max_new_accounts_per_registration_ip')) diff --git a/spec/components/validators/allowed_ip_address_validator_spec.rb b/spec/components/validators/allowed_ip_address_validator_spec.rb index c898cc73d..ecef8497e 100644 --- a/spec/components/validators/allowed_ip_address_validator_spec.rb +++ b/spec/components/validators/allowed_ip_address_validator_spec.rb @@ -11,6 +11,7 @@ describe AllowedIpAddressValidator do ScreenedIpAddress.stubs(:should_block?).returns(true) validate expect(record.errors[:ip_address]).to be_present + expect(record.errors[:ip_address][0]).to eq(I18n.t('user.ip_address.blocked')) end end