Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Correct inflection of virus.
It should not be viri, instead it should be viruses.

Refs #7466
  • Loading branch information
markstory committed Sep 29, 2015
1 parent 5909354 commit ef79994
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Utility/Inflector.php
Expand Up @@ -46,7 +46,7 @@ class Inflector
'/(?<!u)(m)an$/i' => '\1en',
'/(c)hild$/i' => '\1hildren',
'/(buffal|tomat)o$/i' => '\1\2oes',
'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin)us$/i' => '\1i',
'/us$/i' => 'uses',
'/(alias)$/i' => '\1es',
'/(ax|cris|test)is$/i' => '\1es',
Expand Down
4 changes: 2 additions & 2 deletions tests/TestCase/Utility/InflectorTest.php
Expand Up @@ -123,7 +123,7 @@ public function testInflectingSingulars()
$this->assertEquals('stimulus', Inflector::singularize('stimuli'));
$this->assertEquals('syllabus', Inflector::singularize('syllabi'));
$this->assertEquals('terminus', Inflector::singularize('termini'));
$this->assertEquals('virus', Inflector::singularize('viri'));
$this->assertEquals('virus', Inflector::singularize('viruses'));
$this->assertEquals('person', Inflector::singularize('people'));
$this->assertEquals('glove', Inflector::singularize('gloves'));
$this->assertEquals('dove', Inflector::singularize('doves'));
Expand Down Expand Up @@ -246,7 +246,7 @@ public function testInflectingPlurals()
$this->assertEquals('stimuli', Inflector::pluralize('stimulus'));
$this->assertEquals('syllabi', Inflector::pluralize('syllabus'));
$this->assertEquals('termini', Inflector::pluralize('terminus'));
$this->assertEquals('viri', Inflector::pluralize('virus'));
$this->assertEquals('viruses', Inflector::pluralize('virus'));
$this->assertEquals('people', Inflector::pluralize('person'));
$this->assertEquals('people', Inflector::pluralize('people'));
$this->assertEquals('gloves', Inflector::pluralize('glove'));
Expand Down

0 comments on commit ef79994

Please sign in to comment.