mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

inflection regexp are meant to be applied once

This commit is contained in:
Xavier Noria 2012-02-12 16:57:47 -08:00
parent dc03a2f56c
commit 5cff94fd85
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/inflector/methods.rb
View File

@ -92,7 +92,7 @@ module ActiveSupport
# "author_id" # => "Author" # "author_id" # => "Author"
def humanize(lower_case_and_underscored_word) def humanize(lower_case_and_underscored_word)
result = lower_case_and_underscored_word.to_s.dup result = lower_case_and_underscored_word.to_s.dup
inflections.humans.each { |(rule, replacement)| break if result.gsub!(rule, replacement) } inflections.humans.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
result.gsub!(/_id$/, "") result.gsub!(/_id$/, "")
result.gsub!(/_/, ' ') result.gsub!(/_/, ' ')
result.gsub(/([a-z\d]*)/i) { |match| result.gsub(/([a-z\d]*)/i) { |match|
@ -311,7 +311,7 @@ module ActiveSupport
if word.empty? || inflections.uncountables.include?(result.downcase[/\b\w+\Z/]) if word.empty? || inflections.uncountables.include?(result.downcase[/\b\w+\Z/])
result result
else else
rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) } rules.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
result result
end end
end end