aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-22 13:01:53 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-22 13:01:53 -0700
commit9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0 (patch)
tree24dcf69c35ba59e499d4e6e07b4618719599aaf8 /activesupport/lib/active_support
parenta6e05b18d65d07a157ee09d54167c81f3d1440f8 (diff)
parentc0dd0cee46ac2d0864dc8bbdac1fe526f9cec346 (diff)
downloadrails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.gz
rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.bz2
rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.zip
Merge branch 'master' into i18n
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/inflector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index c2738b39fc..1e189465bd 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -173,7 +173,7 @@ module ActiveSupport
if first_letter_in_uppercase
lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
else
- lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+ lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
end
end