aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-20 14:10:25 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-20 14:10:25 -0300
commit770fa81bbad8a77b41a1b5af3c926e6652acccd6 (patch)
tree4ba2f7b7450dab866709a13e93bc03f94dd25495 /activemodel/lib
parent53edd3268461a063979221f896c77f1b42edda67 (diff)
downloadrails-770fa81bbad8a77b41a1b5af3c926e6652acccd6.tar.gz
rails-770fa81bbad8a77b41a1b5af3c926e6652acccd6.tar.bz2
rails-770fa81bbad8a77b41a1b5af3c926e6652acccd6.zip
Don't pass `:within` option to the i18n
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/validations/exclusion.rb2
-rw-r--r--activemodel/lib/active_model/validations/inclusion.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb
index 3331162bc0..dfeec37ca1 100644
--- a/activemodel/lib/active_model/validations/exclusion.rb
+++ b/activemodel/lib/active_model/validations/exclusion.rb
@@ -9,7 +9,7 @@ module ActiveModel
def validate_each(record, attribute, value)
if include?(record, value)
- record.errors.add(attribute, :exclusion, options.except(:in).merge!(:value => value))
+ record.errors.add(attribute, :exclusion, options.except(:in, :within).merge!(:value => value))
end
end
end
diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index c995e28d64..5a679e0423 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -9,7 +9,7 @@ module ActiveModel
def validate_each(record, attribute, value)
unless include?(record, value)
- record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+ record.errors.add(attribute, :inclusion, options.except(:in, :within).merge!(:value => value))
end
end
end