diff options
| author | thoefer <mail@tomhoefer.de> | 2011-06-08 13:40:17 +0200 |
|---|---|---|
| committer | thoefer <mail@tomhoefer.de> | 2011-06-08 13:40:17 +0200 |
| commit | 0831b7e076af1ecae41a55dd82cb0582b96518a0 (patch) | |
| tree | f8ff6e346eae4560e6d7a0112abcc99c0704455c /activemodel/lib/active_model/translation.rb | |
| parent | 8c1762f11e4c2b32a0aff6cbda27f359d8c9d31c (diff) | |
| download | rails-0831b7e076af1ecae41a55dd82cb0582b96518a0.tar.gz rails-0831b7e076af1ecae41a55dd82cb0582b96518a0.tar.bz2 rails-0831b7e076af1ecae41a55dd82cb0582b96518a0.zip | |
Brought back alternative convention for namespaced models in i18n.
Diffstat (limited to 'activemodel/lib/active_model/translation.rb')
| -rw-r--r-- | activemodel/lib/active_model/translation.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb index 6d64c81b5f..c615311692 100644 --- a/activemodel/lib/active_model/translation.rb +++ b/activemodel/lib/active_model/translation.rb @@ -44,8 +44,9 @@ 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}" - end + [:"#{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 defaults << :"attributes.#{attribute}" defaults << options.delete(:default) if options[:default] |