github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove core extensions in favor of I18n#translate and I18n#localize

Browse Source
This commit is contained in:
Sven Fuchs
2008-07-02 19:21:07 +02:00
parent 7403c825a0
commit 8f74ba96c4
9 changed files with 86 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/lib/active_record/validations.rb
View File

@@ -22,7 +22,7 @@ module ActiveRecord
class << self
def default_error_messages
ActiveSupport::Deprecation.warn("ActiveRecord::Errors.default_error_messages has been deprecated. Please use 'active_record.error_messages'.t.")
'active_record.error_messages'.t
I18n.translate 'active_record.error_messages'
end
end
@@ -43,7 +43,7 @@ module ActiveRecord
# error can be added to the same +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
# If no +msg+ is supplied, "invalid" is assumed.
def add(attribute, message = nil)
message ||= :"active_record.error_messages.invalid".t
message ||= I18n.translate :"active_record.error_messages.invalid"
@errors[attribute.to_s] ||= []
@errors[attribute.to_s] << message
end
@@ -168,7 +168,7 @@ module ActiveRecord
full_messages << message
else
key = :"active_record.human_attribute_names.#{@base.class.name.underscore.to_sym}.#{attr}"
attr_name = key.t(locale) || @base.class.human_attribute_name(attr)
attr_name = I18n.translate(key, locale, :raise => true) rescue @base.class.human_attribute_name(attr)
full_messages << attr_name + " " + message
end
end

2
activerecord/test/cases/validations_i18n_test.rb
View File

@@ -79,7 +79,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
def test_errors_full_messages_translates_human_attribute_name_for_model_attributes
@topic.errors.instance_variable_set :@errors, { 'title' => 'empty' }
I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US').returns('Title')
I18n.expects(:translate).with(:"active_record.human_attribute_names.topic.title", 'en-US', :raise => true).returns('Title')
@topic.errors.full_messages :locale => 'en-US'
end
end