diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-20 09:13:20 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-20 09:13:20 +0200 |
| commit | 585c8c17c303fc46fcf014a644a541eae6cb5ffd (patch) | |
| tree | b53e4531f2374e56c10e69a4127054573ad6a17b /activerecord/lib | |
| parent | b09c6e7444cf05f986e601bcc22cf17ede7b63bd (diff) | |
| download | rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.tar.gz rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.tar.bz2 rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.zip | |
rename Backend::Simple#add_translations to set_translations
because it overwrites existing translations
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/lang/en-US.rb | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/validations.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/lang/en-US.rb b/activerecord/lib/active_record/lang/en-US.rb index 7c3bcfd85e..f307f40f1a 100644 --- a/activerecord/lib/active_record/lang/en-US.rb +++ b/activerecord/lib/active_record/lang/en-US.rb @@ -1,4 +1,4 @@ -I18n.backend.add_translations :'en-US', { +I18n.backend.set_translations :'en-US', { :active_record => { :error_messages => { :inclusion => "is not included in the list", diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index 0ca68989d2..bcb204f1ba 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -21,7 +21,7 @@ module ActiveRecord class << self def default_error_messages - # TODO deprecate this? + # ActiveSupport::Deprecation.warn("ActiveRecord::Errors.default_error_messages has been deprecated. Please use :'active_record.error_messages'.t.") :'active_record.error_messages'.t end end |