diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
| commit | 2fbf302149cf40c791ca1207a5f984cf58903397 (patch) | |
| tree | 5da770d0fd31520a6264a9864b1db1412646d100 /activemodel/lib/active_model/translation.rb | |
| parent | a0656989c47c29c87c4f243ce3695c39777c67b8 (diff) | |
| parent | b84b759ec60b5005fea183186639408fcf903450 (diff) | |
| download | rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2 rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'activemodel/lib/active_model/translation.rb')
| -rw-r--r-- | activemodel/lib/active_model/translation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb index 920a133159..6d64c81b5f 100644 --- a/activemodel/lib/active_model/translation.rb +++ b/activemodel/lib/active_model/translation.rb @@ -18,12 +18,12 @@ module ActiveModel # # This also provides the required class methods for hooking into the # Rails internationalization API, including being able to define a - # class based i18n_scope and lookup_ancestors to find translations in + # class based +i18n_scope+ and +lookup_ancestors+ to find translations in # parent classes. module Translation include ActiveModel::Naming - # Returns the i18n_scope for the class. Overwrite if you want custom lookup. + # Returns the +i18n_scope+ for the class. Overwrite if you want custom lookup. def i18n_scope :activemodel end |