mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-24 14:56:43 +00:00
cleanup setup and version check guff. enable action view extension by default until version 2
This commit is contained in:
parent
9dd3282a81
commit
497a97e0b0
@ -21,15 +21,15 @@ module ValidatesTimeliness
|
|||||||
|
|
||||||
class << self
|
class << self
|
||||||
|
|
||||||
def load_error_messages_with_i18n
|
def load_error_messages
|
||||||
I18n.load_path += [ LOCALE_PATH ]
|
if defined?(I18n)
|
||||||
I18n.reload!
|
I18n.load_path += [ LOCALE_PATH ]
|
||||||
end
|
I18n.reload!
|
||||||
|
else
|
||||||
def load_error_messages_without_i18n
|
messages = YAML::load(IO.read(LOCALE_PATH))
|
||||||
messages = YAML::load(IO.read(LOCALE_PATH))
|
errors = messages['en']['activerecord']['errors']['messages'].inject({}) {|h,(k,v)| h[k.to_sym] = v.gsub(/\{\{\w*\}\}/, '%s');h }
|
||||||
errors = messages['en']['activerecord']['errors']['messages'].inject({}) {|h,(k,v)| h[k.to_sym] = v.gsub(/\{\{\w*\}\}/, '%s');h }
|
::ActiveRecord::Errors.default_error_messages.update(errors)
|
||||||
::ActiveRecord::Errors.default_error_messages.update(errors)
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_error_messages
|
def default_error_messages
|
||||||
@ -40,23 +40,11 @@ module ValidatesTimeliness
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def setup_for_rails_2_0
|
|
||||||
load_error_messages_without_i18n
|
|
||||||
end
|
|
||||||
alias :setup_for_rails_2_1 :setup_for_rails_2_0
|
|
||||||
|
|
||||||
def setup_for_rails_2_2
|
|
||||||
load_error_messages_with_i18n
|
|
||||||
end
|
|
||||||
alias :setup_for_rails_2_3 :setup_for_rails_2_2
|
|
||||||
|
|
||||||
def setup_for_rails
|
def setup_for_rails
|
||||||
major, minor = Rails::VERSION::MAJOR, Rails::VERSION::MINOR
|
major, minor = Rails::VERSION::MAJOR, Rails::VERSION::MINOR
|
||||||
self.default_timezone = ::ActiveRecord::Base.default_timezone
|
self.default_timezone = ::ActiveRecord::Base.default_timezone
|
||||||
self.send("setup_for_rails_#{major}_#{minor}")
|
self.enable_datetime_select_extension!
|
||||||
rescue
|
self.load_error_messages
|
||||||
puts "Rails version #{major}.#{minor}.x not explicitly supported by validates_timeliness plugin. Setting up for Rails 2.2, but you may encounter some problems."
|
|
||||||
setup_for_rails_2_2
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user