Permalink
Browse files

Properly interpolate i18n keys in modules [#5572 state:resolved]

  • Loading branch information...
1 parent f625b87 commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557 @rosenfeld rosenfeld committed with josevalim Sep 24, 2010
@@ -266,8 +266,8 @@ def generate_message(attribute, type = :invalid, options = {})
type = options.delete(:message) if options[:message].is_a?(Symbol)
defaults = @base.class.lookup_ancestors.map do |klass|
- [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.attributes.#{attribute}.#{type}",
- :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.#{type}" ]
+ [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.attributes.#{attribute}.#{type}",
+ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.#{type}" ]
end
defaults << options.delete(:message)
@@ -2,7 +2,7 @@
module ActiveModel
class Name < String
- attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key
+ attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
alias_method :cache_key, :collection
def initialize(klass, namespace = nil)
@@ -18,6 +18,7 @@ def initialize(klass, namespace = nil)
@partial_path = "#{@collection}/#{@element}".freeze
@param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
@route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
+ @i18n_key = _singularize(self, '.').to_sym
end
# Transform the model name into a more humane format, using I18n. By default,
@@ -31,7 +32,7 @@ def human(options={})
@klass.respond_to?(:i18n_scope)
defaults = @klass.lookup_ancestors.map do |klass|
- klass.model_name.underscore.to_sym
+ klass.model_name.i18n_key
end
defaults << options.delete(:default) if options[:default]
@@ -42,9 +43,10 @@ def human(options={})
end
private
- def _singularize(str)
- ActiveSupport::Inflector.underscore(str).tr('/', '_')
- end
+
+ def _singularize(string, replacement='_')
+ ActiveSupport::Inflector.underscore(string).tr('/', replacement)
+ end
end
# == Active Model Naming
@@ -60,6 +62,9 @@ def _singularize(str)
# BookCover.model_name # => "BookCover"
# BookCover.model_name.human # => "Book cover"
#
+ # BookCover.model_name.i18n_key # => "book_cover"
+ # BookModule::BookCover.model_name.i18n_key # => "book_module.book_cover"
+ #
# Providing the functionality that ActiveModel::Naming provides in your object
# is required to pass the Active Model Lint test. So either extending the provided
# method below, or rolling your own is required..
@@ -44,7 +44,7 @@ def lookup_ancestors
# 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.underscore}.#{attribute}"
+ :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
end
defaults << :"attributes.#{attribute}"
@@ -55,6 +55,14 @@ def test_errors_full_messages_translates_human_attribute_name_for_model_attribut
assert_equal ["Person's name not found"], @person.errors.full_messages
end
+ def test_errors_full_messages_translates_human_attribute_name_for_model_in_module_attributes
+ I18n.backend.store_translations('en', :activemodel => {:attributes => {:person_module => {:person => {:name => "Person in Module's name"}}}})
+ person = PersonModule::Person.new
+ person.errors.add(:name, 'not found')
+ PersonModule::Person.expects(:human_attribute_name).with(:name, :default => 'Name').returns("Person in Module's name")
+ assert_equal ["Person in Module's name not found"], person.errors.full_messages
+ end
+
def test_errors_full_messages_uses_format
I18n.backend.store_translations('en', :errors => {:format => "Field %{attribute} %{message}"})
@person.errors.add('name', 'empty')
@@ -363,4 +371,15 @@ def test_validates_with_message_string
assert_equal ["I am a custom error"], @person.errors[:title]
end
+ def test_model_with_module_i18n_scope
+ I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person_module => {:person => {:blank => 'generic blank'}}}}}
+ PersonModule::Person.validates_presence_of :title
+ person = PersonModule::Person.new
+ person.valid?
+ assert_equal ['generic blank'], person.errors[:title]
+
+ I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person_module => {:person => {:attributes => {:title => {:blank => 'title cannot be blank'}}}}}}}
+ person.valid?
+ assert_equal ['title cannot be blank'], person.errors[:title]
+ end
end
@@ -11,3 +11,8 @@ def condition_is_true
class Child < Person
end
+
+module PersonModule
+ class Person < ::Person
+ end
+end

0 comments on commit 8d30193

Please sign in to comment.