Skip to content

Commit 6f8f4c5

Browse files
committed
Adding waves -> wave as irregular singularization rule. Fixes #47.
1 parent 47d9181 commit 6f8f4c5

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cake/libs/inflector.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ function __initSingularRules() {
318318
'nexus', 'Niasese', 'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese', 'proceedings',
319319
'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors', 'sea[- ]bass', 'series', 'Shavese', 'shears',
320320
'siemens', 'species', 'swine', 'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese',
321-
'whiting', 'wildebeest', 'Yengeese');
321+
'whiting', 'wildebeest', 'Yengeese'
322+
);
322323

323324
$coreIrregularSingular = array(
324325
'atlases' => 'atlas',
@@ -349,7 +350,9 @@ function __initSingularRules() {
349350
'soliloquies' => 'soliloquy',
350351
'testes' => 'testis',
351352
'trilbys' => 'trilby',
352-
'turfs' => 'turf');
353+
'turfs' => 'turf',
354+
'waves' => 'wave'
355+
);
353356

354357
$singularRules = Set::pushDiff($this->__singularRules, $coreSingularRules);
355358
$uninflected = Set::pushDiff($this->__uninflectedSingular, $coreUninflectedSingular);

cake/tests/cases/libs/inflector.test.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ function testInflectingSingulars() {
108108
$this->assertEqual(Inflector::singularize('taxes'), 'tax');
109109
$this->assertEqual(Inflector::singularize('faxes'), 'fax');
110110
$this->assertEqual(Inflector::singularize('waxes'), 'wax');
111+
$this->assertEqual(Inflector::singularize('waves'), 'wave');
111112
$this->assertEqual(Inflector::singularize(''), '');
112113
}
113114
/**
@@ -151,6 +152,7 @@ function testInflectingPlurals() {
151152
$this->assertEqual(Inflector::pluralize('people'), 'people');
152153
$this->assertEqual(Inflector::pluralize('glove'), 'gloves');
153154
$this->assertEqual(Inflector::pluralize('crisis'), 'crises');
155+
$this->assertEqual(Inflector::pluralize('wave'), 'waves');
154156
$this->assertEqual(Inflector::pluralize(''), '');
155157
}
156158
/**

0 commit comments

Comments
 (0)