tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 20:29:15 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fixing plural_name messing up singular words ending in "e" (#3251)

Browse Source 
This would ideally be fixed with the ability to use an external library
like gettext, but that's an API change. This for now fixes the issue
where a singular like "Page" returns "Pags" for the plural name.
This commit is contained in:
Sean Harvey 2014-08-20 14:50:42 +12:00
parent 552b54201a
commit 61c6dee057
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/DataObject.php
View File

@ -713,9 +713,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return $name; return $name;
} else { } else {
$name = $this->singular_name(); $name = $this->singular_name();
if(substr($name,-1) == 'e') $name = substr($name,0,-1); if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
else if(substr($name,-1) == 'y') $name = substr($name,0,-1) . 'ie';
return ucfirst($name . 's'); return ucfirst($name . 's');
} }
} }

25
tests/model/DataObjectTest.php
View File

@ -949,21 +949,40 @@ class DataObjectTest extends SapphireTest {
* Tests that singular_name() generates sensible defaults. * Tests that singular_name() generates sensible defaults.
*/ */
public function testSingularName() { public function testSingularName() {
$assertions = array ( $assertions = array(
'DataObjectTest_Player' => 'Data Object Test Player', 'DataObjectTest_Player' => 'Data Object Test Player',
'DataObjectTest_Team' => 'Data Object Test Team', 'DataObjectTest_Team' => 'Data Object Test Team',
'DataObjectTest_Fixture' => 'Data Object Test Fixture' 'DataObjectTest_Fixture' => 'Data Object Test Fixture'
); );
foreach($assertions as $class => $expectedSingularName) { foreach($assertions as $class => $expectedSingularName) {
$this->assertEquals ( $this->assertEquals(
$expectedSingularName, $expectedSingularName,
singleton($class)->singular_name(), singleton($class)->singular_name(),
"Assert that the singular_name for '$class' is correct." "Assert that the singular_name for '$class' is correct."
); );
} }
} }
/**
* Tests that plural_name() generates sensible defaults.
*/
public function testPluralName() {
$assertions = array(
'DataObjectTest_Player' => 'Data Object Test Players',
'DataObjectTest_Team' => 'Data Object Test Teams',
'DataObjectTest_Fixture' => 'Data Object Test Fixtures'
);
foreach($assertions as $class => $expectedPluralName) {
$this->assertEquals(
$expectedPluralName,
singleton($class)->plural_name(),
"Assert that the plural_name for '$class' is correct."
);
}
}
public function testHasDatabaseField() { public function testHasDatabaseField() {
$team = singleton('DataObjectTest_Team'); $team = singleton('DataObjectTest_Team');
$subteam = singleton('DataObjectTest_SubTeam'); $subteam = singleton('DataObjectTest_SubTeam');