mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixed inflection of perspectives and similar words #1045 [thijs@vandervossen.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
808d76a858
commit
38a0b5b427
3 changed files with 8 additions and 3 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fixed inflection of perspectives and similar words #1045 [thijs@vandervossen.net]
|
||||
|
||||
* Added Fixnum#even? and Fixnum#odd?
|
||||
|
||||
* Fixed problem with classes being required twice. Object#const_missing now uses require_dependency to load files. It used to use require_or_load which would cause models to be loaded twice, which was not good for validations and other class methods #971 [Nicholas Seckar]
|
||||
|
|
|
@ -81,6 +81,7 @@ module Inflector
|
|||
[/(s)eries$/i, '\1\2eries'],
|
||||
[/([^aeiouy]|qu)ies$/i, '\1y'],
|
||||
[/([lr])ves$/i, '\1f'],
|
||||
[/(tive)s$/i, '\1'],
|
||||
[/([^f])ves$/i, '\1fe'],
|
||||
[/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'],
|
||||
[/([ti])a$/i, '\1um'],
|
||||
|
|
|
@ -57,12 +57,14 @@ class InflectorTest < Test::Unit::TestCase
|
|||
"old_news" => "old_news",
|
||||
"news" => "news",
|
||||
|
||||
"series" => "series"
|
||||
"series" => "series",
|
||||
|
||||
"perspective" => "perspectives"
|
||||
}
|
||||
|
||||
CamelToUnderscore = {
|
||||
"Product" => "product",
|
||||
"SpecialGuest" => "special_guest",
|
||||
"Product" => "product",
|
||||
"SpecialGuest" => "special_guest",
|
||||
"ApplicationController" => "application_controller"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue