codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3517 from techAPJ/patch-2

Browse source 
Improve IP blocking error message
This commit is contained in:
Jeff Atwood 2015-06-01 19:37:39 -07:00
commit 576aa30e4f
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/locales/server.en.yml
View file

@ -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:

2
lib/validators/allowed_ip_address_validator.rb
View file

@ -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'))

1
spec/components/validators/allowed_ip_address_validator_spec.rb
View file

@ -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