From 5abaec66ae200eb5ab43721132a00064d906fe6d Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Tue, 9 Dec 2008 16:56:03 +1100 Subject: [PATCH] remove version check, check for I what I want --- lib/validates_timeliness/validator.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb index e11cf67..1c2fcf1 100644 --- a/lib/validates_timeliness/validator.rb +++ b/lib/validates_timeliness/validator.rb @@ -65,14 +65,14 @@ module ValidatesTimeliness end def add_error(record, attr_name, message, interpolate={}) - if Rails::VERSION::STRING < '2.2' - message = error_messages[message] if message.is_a?(Symbol) - message = message % interpolate.values unless interpolate.empty? - record.errors.add(attr_name, message) - else + if defined?(I18n) # use i18n support in AR for message or use custom message passed to validation method custom = custom_error_messages[message] record.errors.add(attr_name, custom || message, interpolate) + else + message = error_messages[message] if message.is_a?(Symbol) + message = message % interpolate.values unless interpolate.empty? + record.errors.add(attr_name, message) end end