Get rid of the alternate namespace lookup.

This commit is contained in:
José Valim 2011-06-11 17:21:22 +02:00
parent f5e1548c1b
commit 410a42860b
3 changed files with 5 additions and 17 deletions

View File

@ -21,7 +21,7 @@ module ActiveModel
@partial_path = "#{@collection}/#{@element}".freeze
@param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
@route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
@i18n_key = self.underscore.tr('/', '.').to_sym
@i18n_key = self.underscore.to_sym
end
# Transform the model name into a more humane format, using I18n. By default,
@ -35,9 +35,8 @@ module ActiveModel
@klass.respond_to?(:i18n_scope)
defaults = @klass.lookup_ancestors.map do |klass|
[klass.model_name.i18n_key,
klass.model_name.i18n_key.to_s.tr('.', '/').to_sym]
end.flatten
klass.model_name.i18n_key
end
defaults << options[:default] if options[:default]
defaults << @human

View File

@ -44,9 +44,8 @@ module ActiveModel
# Specify +options+ with additional translating options.
def human_attribute_name(attribute, options = {})
defaults = lookup_ancestors.map do |klass|
[:"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}",
:"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key.to_s.tr('.', '/')}.#{attribute}"]
end.flatten
:"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
end
defaults << :"attributes.#{attribute}"
defaults << options.delete(:default) if options[:default]

View File

@ -76,15 +76,5 @@ class ActiveModelI18nTests < ActiveModel::TestCase
Person.model_name.human(options)
assert_equal({:default => 'person model'}, options)
end
def test_alternate_namespaced_model_attribute_translation
I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:gender => {:attribute => 'person gender attribute'}}}}
assert_equal 'person gender attribute', Person::Gender.human_attribute_name('attribute')
end
def test_alternate_namespaced_model_translation
I18n.backend.store_translations 'en', :activemodel => {:models => {:person => {:gender => 'person gender model'}}}
assert_equal 'person gender model', Person::Gender.model_name.human
end
end