aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/translation.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-02-27 21:23:59 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-27 21:30:03 -0200
commita00bed0c48f469d1cd2de364bfaddbc724046195 (patch)
treeb36c81d3939fc5976b23511460df8991a9b3246f /activemodel/lib/active_model/translation.rb
parentacf0688fdd85a6d6ac278446e81f365239acc198 (diff)
downloadrails-a00bed0c48f469d1cd2de364bfaddbc724046195.tar.gz
rails-a00bed0c48f469d1cd2de364bfaddbc724046195.tar.bz2
rails-a00bed0c48f469d1cd2de364bfaddbc724046195.zip
Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]"
This breaks #6448, you should use :"module/class" as key for namespacing [#6448 state:committed] This reverts commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557.
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 920a133159..dbb76244e4 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.i18n_key}.#{attribute}"
+ :"#{self.i18n_scope}.attributes.#{klass.model_name.underscore}.#{attribute}"
end
defaults << :"attributes.#{attribute}"