diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-11 17:21:22 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-11 18:01:26 +0200 |
| commit | 410a42860b7e2b83b37573e5b72d1f1cb93a9f69 (patch) | |
| tree | 3aa8bcd9ce92e7367634ea524c088072f60c59e5 /activemodel/lib/active_model/translation.rb | |
| parent | f5e1548c1bd5645b9a6bf66c8f5fedf801f23218 (diff) | |
| download | rails-410a42860b7e2b83b37573e5b72d1f1cb93a9f69.tar.gz rails-410a42860b7e2b83b37573e5b72d1f1cb93a9f69.tar.bz2 rails-410a42860b7e2b83b37573e5b72d1f1cb93a9f69.zip | |
Get rid of the alternate namespace lookup.
Diffstat (limited to 'activemodel/lib/active_model/translation.rb')
| -rw-r--r-- | activemodel/lib/active_model/translation.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb index c615311692..6d64c81b5f 100644 --- a/activemodel/lib/active_model/translation.rb +++ b/activemodel/lib/active_model/translation.rb @@ -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] |