Skip to content
Permalink
Browse files

Correct inflection of virus.

Instead of viri, it should be viruses.

Refs #7466
  • Loading branch information...
markstory committed Sep 29, 2015
1 parent 5a8a780 commit 13f147940fbf18482fa9db8d1b93fd423008cedc
Showing with 3 additions and 3 deletions.
  1. +2 −2 lib/Cake/Test/Case/Utility/InflectorTest.php
  2. +1 −1 lib/Cake/Utility/Inflector.php
@@ -128,7 +128,7 @@ public function testInflectingSingulars() {
$this->assertEquals(Inflector::singularize('stimuli'), 'stimulus');
$this->assertEquals(Inflector::singularize('syllabi'), 'syllabus');
$this->assertEquals(Inflector::singularize('termini'), 'terminus');
$this->assertEquals(Inflector::singularize('viri'), 'virus');
$this->assertEquals(Inflector::singularize('viruses'), 'virus');
$this->assertEquals(Inflector::singularize('people'), 'person');
$this->assertEquals(Inflector::singularize('gloves'), 'glove');
$this->assertEquals(Inflector::singularize('doves'), 'dove');
@@ -246,7 +246,7 @@ public function testInflectingPlurals() {
$this->assertEquals(Inflector::pluralize('stimulus'), 'stimuli');
$this->assertEquals(Inflector::pluralize('syllabus'), 'syllabi');
$this->assertEquals(Inflector::pluralize('terminus'), 'termini');
$this->assertEquals(Inflector::pluralize('virus'), 'viri');
$this->assertEquals(Inflector::pluralize('virus'), 'viruses');
$this->assertEquals(Inflector::pluralize('person'), 'people');
$this->assertEquals(Inflector::pluralize('people'), 'people');
$this->assertEquals(Inflector::pluralize('glove'), 'gloves');
@@ -47,7 +47,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',

0 comments on commit 13f1479

Please sign in to comment.
You can’t perform that action at this time.