aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/translation.rb
diff options
context:
space:
mode:
authorRodrigo Rosenfeld Rosas <rr_rosas@yahoo.com.br>2010-09-24 20:41:12 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-24 20:41:12 +0200
commit8d30193b08bd2321a7a78a1f481bd5e4d4d45557 (patch)
tree7e9c8458bd6cb4b2f0d832897197c9770d590342 /activemodel/lib/active_model/translation.rb
parentf625b87f241a6a002274bd01750796985d6e0d8d (diff)
downloadrails-8d30193b08bd2321a7a78a1f481bd5e4d4d45557.tar.gz
rails-8d30193b08bd2321a7a78a1f481bd5e4d4d45557.tar.bz2
rails-8d30193b08bd2321a7a78a1f481bd5e4d4d45557.zip
Properly interpolate i18n keys in modules [#5572 state:resolved]
Diffstat (limited to 'activemodel/lib/active_model/translation.rb')
-rw-r--r--activemodel/lib/active_model/translation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index dbb76244e4..920a133159 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -44,7 +44,7 @@ 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.underscore}.#{attribute}"
+ :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
end
defaults << :"attributes.#{attribute}"