Fixes issue #273 - translations for namespaced models. ActiveRecord uses i18n_key methods which return "namespace/model_name"("namespace.model_name" in rails 3.0.x) for Namespace::ModelName. Ransack should used the same pattern.

This commit is contained in:
Bonias 2013-09-05 11:13:03 +02:00
parent 3250d339be
commit ba6a8fcb18
4 changed files with 41 additions and 7 deletions

View File

@ -23,7 +23,7 @@ module Ransack
attribute_names = attributes_str.split(/_and_|_or_/) attribute_names = attributes_str.split(/_and_|_or_/)
combinator = attributes_str.match(/_and_/) ? :and : :or combinator = attributes_str.match(/_and_/) ? :and : :or
defaults = base_ancestors.map do |klass| defaults = base_ancestors.map do |klass|
:"ransack.attributes.#{klass.model_name.singular}.#{original_name}" :"ransack.attributes.#{i18n_key(klass)}.#{original_name}"
end end
translated_names = attribute_names.map do |attr| translated_names = attribute_names.map do |attr|
@ -50,7 +50,7 @@ module Ransack
raise ArgumentError, "A context is required to translate associations" raise ArgumentError, "A context is required to translate associations"
end end
defaults = key.blank? ? [:"#{context.klass.i18n_scope}.models.#{context.klass.model_name.singular}"] : [:"ransack.associations.#{context.klass.model_name.singular}.#{key}"] defaults = key.blank? ? [:"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"] : [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
defaults << context.traverse(key).model_name.human defaults << context.traverse(key).model_name.human
options = {:count => 1, :default => defaults} options = {:count => 1, :default => defaults}
I18n.translate(defaults.shift, options) I18n.translate(defaults.shift, options)
@ -65,20 +65,20 @@ module Ransack
interpolations = {} interpolations = {}
interpolations[:attr_fallback_name] = I18n.translate( interpolations[:attr_fallback_name] = I18n.translate(
(associated_class ? (associated_class ?
:"ransack.attributes.#{associated_class.model_name.singular}.#{attr_name}" : :"ransack.attributes.#{i18n_key(associated_class)}.#{attr_name}" :
:"ransack.attributes.#{context.klass.model_name.singular}.#{attr_name}" :"ransack.attributes.#{i18n_key(context.klass)}.#{attr_name}"
), ),
:default => [ :default => [
(associated_class ? (associated_class ?
:"#{associated_class.i18n_scope}.attributes.#{associated_class.model_name.singular}.#{attr_name}" : :"#{associated_class.i18n_scope}.attributes.#{i18n_key(associated_class)}.#{attr_name}" :
:"#{context.klass.i18n_scope}.attributes.#{context.klass.model_name.singular}.#{attr_name}" :"#{context.klass.i18n_scope}.attributes.#{i18n_key(context.klass)}.#{attr_name}"
), ),
:".attributes.#{attr_name}", :".attributes.#{attr_name}",
attr_name.humanize attr_name.humanize
] ]
) )
defaults = [ defaults = [
:"ransack.attributes.#{context.klass.model_name.singular}.#{name}" :"ransack.attributes.#{i18n_key(context.klass)}.#{name}"
] ]
if include_associations && associated_class if include_associations && associated_class
defaults << '%{association_name} %{attr_fallback_name}' defaults << '%{association_name} %{attr_fallback_name}'
@ -89,5 +89,13 @@ module Ransack
options = {:count => 1, :default => defaults} options = {:count => 1, :default => defaults}
I18n.translate(defaults.shift, options.merge(interpolations)) I18n.translate(defaults.shift, options.merge(interpolations))
end end
def self.i18n_key(klass)
if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
klass.model_name.i18n_key.to_s.tr('.', '/')
else
klass.model_name.i18n_key.to_s
end
end
end end
end end

View File

@ -0,0 +1,14 @@
require 'spec_helper'
module Ransack
describe Translate do
describe '.attribute' do
it 'translate namespaced attribute like AR does' do
ar_translation = ::Namespace::Article.human_attribute_name(:title)
ransack_translation = Ransack::Translate.attribute(:title, :context => ::Namespace::Article.search.context)
ransack_translation.should eq ar_translation
end
end
end
end

View File

@ -5,3 +5,9 @@ en:
attributes: attributes:
person: person:
name: Full Name name: Full Name
activerecord:
attributes:
namespace/article:
title: AR Namespaced Title
namespace_article:
title: Old Ransack Namespaced Title

View File

@ -37,6 +37,12 @@ class Article < ActiveRecord::Base
has_many :notes, :as => :notable has_many :notes, :as => :notable
end end
module Namespace
class Article < ::Article
end
end
class Comment < ActiveRecord::Base class Comment < ActiveRecord::Base
belongs_to :article belongs_to :article
belongs_to :person belongs_to :person