aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-07 06:19:10 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-07 06:19:10 +0000
commit38a0b5b427371b53c0d0f159cf5b3806f16aab30 (patch)
tree62b1d9f8e835ad52633eeee2a1e498277eaa3e9a /activesupport
parent808d76a858712bab53f8fecb01694347ce6c1974 (diff)
downloadrails-38a0b5b427371b53c0d0f159cf5b3806f16aab30.tar.gz
rails-38a0b5b427371b53c0d0f159cf5b3806f16aab30.tar.bz2
rails-38a0b5b427371b53c0d0f159cf5b3806f16aab30.zip
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
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/inflector.rb1
-rw-r--r--activesupport/test/inflector_test.rb8
3 files changed, 8 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 792388d2b6..a2528696f4 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -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]
diff --git a/activesupport/lib/active_support/inflector.rb b/activesupport/lib/active_support/inflector.rb
index 0fa6cb6e53..03dd2b092a 100644
--- a/activesupport/lib/active_support/inflector.rb
+++ b/activesupport/lib/active_support/inflector.rb
@@ -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'],
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index ffadb5bd96..fca4072ad9 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -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"
}