From f4ed751c26da1458be13fd7bc40dde27e4ed4146 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Sat, 28 Mar 2009 19:51:11 +1100
Subject: [PATCH] changed back to using error_value_formats for Rails 2.0/2.1

---
 README.rdoc                           | 2 +-
 lib/validates_timeliness.rb           | 2 +-
 lib/validates_timeliness/validator.rb | 8 +++++---
 spec/validator_spec.rb                | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index b9d97bf..de7f8b3 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -304,7 +304,7 @@ values inserted in the error messages for temporal restrictions like so
 
 For Rails 2.0/2.1:
 
-  ValidatesTimeliness::Validator.default_error_value_formats.update(
+  ValidatesTimeliness::Validator.error_value_formats.update(
     :time     => '%H:%M:%S',
     :date     => '%Y-%m-%d',
     :datetime => '%Y-%m-%d %H:%M:%S'
diff --git a/lib/validates_timeliness.rb b/lib/validates_timeliness.rb
index b824c7f..fd6ef54 100644
--- a/lib/validates_timeliness.rb
+++ b/lib/validates_timeliness.rb
@@ -38,7 +38,7 @@ module ValidatesTimeliness
         errors = defaults['activerecord']['errors']['messages'].inject({}) {|h,(k,v)| h[k.to_sym] = v.gsub(/\{\{\w*\}\}/, '%s');h }
         ::ActiveRecord::Errors.default_error_messages.update(errors)
 
-        ValidatesTimeliness::Validator.default_error_value_formats = defaults['validates_timeliness']['error_value_formats'].symbolize_keys
+        ValidatesTimeliness::Validator.error_value_formats = defaults['validates_timeliness']['error_value_formats'].symbolize_keys
       end
     end
     
diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb
index 54ff4be..972a176 100644
--- a/lib/validates_timeliness/validator.rb
+++ b/lib/validates_timeliness/validator.rb
@@ -2,8 +2,6 @@ module ValidatesTimeliness
 
   class Validator
     cattr_accessor :ignore_restriction_errors
-    cattr_accessor :default_error_value_formats
-
     self.ignore_restriction_errors = false
 
     RESTRICTION_METHODS = {
@@ -163,10 +161,14 @@ module ValidatesTimeliness
         if defined?(I18n)
           I18n.translate('validates_timeliness.error_value_formats')
         else
-          default_error_value_formats
+          @@error_value_formats
         end
       end
 
+      def error_value_formats=(formats)
+        @@error_value_formats = formats
+      end
+
       def evaluate_option_value(value, type, record)
         case value
         when Time, Date
diff --git a/spec/validator_spec.rb b/spec/validator_spec.rb
index 36fa6f7..5eff1d9 100644
--- a/spec/validator_spec.rb
+++ b/spec/validator_spec.rb
@@ -563,8 +563,8 @@ describe ValidatesTimeliness::Validator do
         if defined?(I18n)
           I18n.backend.store_translations 'en', :validates_timeliness => { :error_value_formats => custom }
         else
-          @@formats = ValidatesTimeliness::Validator.default_error_value_formats
-          ValidatesTimeliness::Validator.default_error_value_formats = custom
+          @@formats = ValidatesTimeliness::Validator.error_value_formats
+          ValidatesTimeliness::Validator.error_value_formats = custom
         end
       end
 
@@ -590,7 +590,7 @@ describe ValidatesTimeliness::Validator do
         if defined?(I18n)
           I18n.reload!
         else
-          ValidatesTimeliness::Validator.default_error_value_formats = @@formats
+          ValidatesTimeliness::Validator.error_value_formats = @@formats
         end
       end
     end