tonyair/silverstripe-translatable
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-translatable synced 2024-10-22 11:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.0'

Browse Source
This commit is contained in:
Ingo Schommer 2013-06-28 10:12:58 +02:00
commit c551915745
2 changed files with 146 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/model/Translatable.php
View File

@ -1197,7 +1197,7 @@ class Translatable extends DataExtension implements PermissionProvider {
if($this->owner->hasExtension("Versioned")) { if($this->owner->hasExtension("Versioned")) {
if($stage) Versioned::reading_stage($stage); if($stage) Versioned::reading_stage($stage);
$translations = Versioned::get_by_stage( $translations = Versioned::get_by_stage(
$this->owner->class, $baseDataClass,
Versioned::current_stage(), Versioned::current_stage(),
$filter, $filter,
null null
@ -1205,7 +1205,7 @@ class Translatable extends DataExtension implements PermissionProvider {
if($stage) Versioned::reading_stage($currentStage); if($stage) Versioned::reading_stage($currentStage);
} else { } else {
$class = $this->owner->class; $class = $this->owner->class;
$translations = $class::get() $translations = $baseDataClass::get()
->where($filter) ->where($filter)
->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause); ->leftJoin("{$baseDataClass}_translationgroups", $joinOnClause);
} }

197
tests/unit/TranslatableTest.php
View File

@ -41,6 +41,12 @@ class TranslatableTest extends FunctionalTest {
parent::tearDown(); parent::tearDown();
} }
function assertArrayEqualsAfterSort($expected, $actual, $message = null) {
sort($expected);
sort($actual);
return $this->assertEquals($expected, $actual, $message);
}
function testLocaleFilteringEnabledAndDisabled() { function testLocaleFilteringEnabledAndDisabled() {
$this->assertTrue(Translatable::locale_filter_enabled()); $this->assertTrue(Translatable::locale_filter_enabled());
@ -117,13 +123,9 @@ class TranslatableTest extends FunctionalTest {
// test french // test french
$array1=$frPage->getTranslations()->column('Locale'); $this->assertArrayEqualsAfterSort(
$array2=array('en_US','es_ES'); array('en_US','es_ES'),
sort($array1); $frPage->getTranslations()->column('Locale')
sort($array2);
$this->assertEquals(
$array1,
$array2
); );
$this->assertNotNull($frPage->getTranslation('en_US')); $this->assertNotNull($frPage->getTranslation('en_US'));
$this->assertEquals( $this->assertEquals(
@ -137,13 +139,9 @@ class TranslatableTest extends FunctionalTest {
); );
// test english // test english
$expected = array('es_ES', 'fr_FR'); $this->assertArrayEqualsAfterSort(
sort($expected); array('es_ES', 'fr_FR'),
$actual = $enPage->getTranslations()->column('Locale'); $enPage->getTranslations()->column('Locale')
sort($actual);
$this->assertEquals(
$expected,
$actual
); );
$this->assertNotNull($frPage->getTranslation('fr_FR')); $this->assertNotNull($frPage->getTranslation('fr_FR'));
$this->assertEquals( $this->assertEquals(
@ -157,13 +155,9 @@ class TranslatableTest extends FunctionalTest {
); );
// test spanish // test spanish
$actual = $esPage->getTranslations()->column('Locale'); $this->assertArrayEqualsAfterSort(
sort($actual); array('en_US', 'fr_FR'),
$expected = array('en_US', 'fr_FR'); $esPage->getTranslations()->column('Locale')
sort($expected);
$this->assertEquals(
$actual,
$expected
); );
$this->assertNotNull($esPage->getTranslation('fr_FR')); $this->assertNotNull($esPage->getTranslation('fr_FR'));
$this->assertEquals( $this->assertEquals(
@ -177,6 +171,114 @@ class TranslatableTest extends FunctionalTest {
); );
} }
function testChangingClassOfDefaultLocaleTranslationChangesOthers() {
// see https://github.com/silverstripe/silverstripe-translatable/issues/97
// create an English SiteTree
$enST = new SiteTree();
$enST->Locale = 'en_US';
$enST->write();
// create French and Spanish translations
$frST = $enST->createTranslation('fr_FR');
$esST = $enST->createTranslation('es_ES');
// change the class name of the default locale's translation (as CMS admin would)
$enST->setClassName('Page');
$enST->write();
// reload them all to get fresh instances
$enPg = DataObject::get_by_id('Page', $enST->ID, $cache = false);
$frPg = DataObject::get_by_id('Page', $frST->ID, $cache = false);
$esPg = DataObject::get_by_id('Page', $esST->ID, $cache = false);
// make sure they are all the right class
$this->assertEquals('Page', $enPg->ClassName);
$this->assertEquals('Page', get_class($enPg));
$this->assertEquals('Page', $frPg->ClassName);
$this->assertEquals('Page', get_class($frPg));
$this->assertEquals('Page', $esPg->ClassName);
$this->assertEquals('Page', get_class($esPg));
// test that we get the right translations back from each instance
$this->assertArrayEqualsAfterSort(
array('fr_FR', 'es_ES'),
$enPg->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'es_ES'),
$frPg->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'fr_FR'),
$esPg->getTranslations()->column('Locale')
);
}
function testTranslationGroupsWhenTranslationIsSubclass() {
// create an English SiteTree
$enST = new SiteTree();
$enST->Locale = 'en_US';
$enST->write();
// create French and Spanish translations
$frST = $enST->createTranslation('fr_FR');
$esST = $enST->createTranslation('es_ES');
// test that we get the right translations back from each instance
$this->assertArrayEqualsAfterSort(
array('fr_FR', 'es_ES'),
$enST->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'es_ES'),
$frST->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'fr_FR'),
$esST->getTranslations()->column('Locale')
);
// this should be considered an edge-case, but on some sites translations
// may be allowed to be a subclass of the default locale's translation of
// the same page. In this case, we need to support getTranslations returning
// all of the translations, even if one of the translations is a different
// class from others
$esST->setClassName('Page');
$esST->write();
$esPg = DataObject::get_by_id('Page', $esST->ID, $cache = false);
// make sure we successfully changed the class
$this->assertEquals('Page', $esPg->ClassName);
$this->assertEquals('Page', get_class($esPg));
// and make sure that the class of the others did not change
$frST = DataObject::get_by_id('SiteTree', $frST->ID, $cache = false);
$this->assertEquals('SiteTree', $frST->ClassName);
$this->assertEquals('SiteTree', get_class($frST));
$enST = DataObject::get_by_id('SiteTree', $enST->ID, $cache = false);
$this->assertEquals('SiteTree', $enST->ClassName);
$this->assertEquals('SiteTree', get_class($enST));
// now that we know our edge case is successfully configured, we need to
// make sure that we get the right translations back from everything
$this->assertArrayEqualsAfterSort(
array('fr_FR', 'es_ES'),
$enST->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'es_ES'),
$frST->getTranslations()->column('Locale')
);
$this->assertArrayEqualsAfterSort(
array('en_US', 'fr_FR'),
$esPg->getTranslations()->column('Locale')
);
$this->assertEquals($enST->ID, $esPg->getTranslation('en_US')->ID);
$this->assertEquals($frST->ID, $esPg->getTranslation('fr_FR')->ID);
$this->assertEquals($esPg->ID, $enST->getTranslation('es_ES')->ID);
$this->assertEquals($esPg->ID, $frST->getTranslation('es_ES')->ID);
}
function testTranslationGroupNotRemovedWhenSiteTreeUnpublished() { function testTranslationGroupNotRemovedWhenSiteTreeUnpublished() {
$enPage = new Page(); $enPage = new Page();
$enPage->Locale = 'en_US'; $enPage->Locale = 'en_US';
@ -439,16 +541,13 @@ class TranslatableTest extends FunctionalTest {
$child4PageTranslated->write(); $child4PageTranslated->write();
Translatable::set_current_locale('en_US'); Translatable::set_current_locale('en_US');
$actual = $parentPage->Children()->column('ID'); $this->assertArrayEqualsAfterSort(
sort($actual); array(
$expected = array( $child1Page->ID,
$child1Page->ID, $child2Page->ID,
$child2Page->ID, $child3Page->ID
$child3Page->ID ),
); $parentPage->Children()->column('ID'),
$this->assertEquals(
$actual,
$expected,
"Showing Children() in default language doesnt show children in other languages" "Showing Children() in default language doesnt show children in other languages"
); );
@ -495,17 +594,13 @@ class TranslatableTest extends FunctionalTest {
"Showing liveChildren() in default language doesnt show children in other languages" "Showing liveChildren() in default language doesnt show children in other languages"
); );
$this->assertNotNull($parentPage->stageChildren()); $this->assertNotNull($parentPage->stageChildren());
$actual = $parentPage->stageChildren()->column('ID'); $this->assertArrayEqualsAfterSort(
sort($actual); array(
$expected = array( $child1Page->ID,
$child1Page->ID, $child2Page->ID,
$child2Page->ID, $child3Page->ID
$child3Page->ID ),
); $parentPage->stageChildren()->column('ID'),
sort($expected);
$this->assertEquals(
$actual,
$expected,
"Showing stageChildren() in default language doesnt show children in other languages" "Showing stageChildren() in default language doesnt show children in other languages"
); );
@ -691,17 +786,13 @@ class TranslatableTest extends FunctionalTest {
SiteTree::flush_and_destroy_cache(); SiteTree::flush_and_destroy_cache();
$parentPage = $this->objFromFixture('Page', 'parent'); $parentPage = $this->objFromFixture('Page', 'parent');
$children = $parentPage->AllChildrenIncludingDeleted(); $children = $parentPage->AllChildrenIncludingDeleted();
$expected = array( $this->assertArrayEqualsAfterSort(
$child2PageID, array(
$child3PageID, $child2PageID,
$child1PageID // $child1Page was deleted from stage, so the original record doesn't have the ID set $child3PageID,
); $child1PageID // $child1Page was deleted from stage, so the original record doesn't have the ID set
sort($expected); ),
$actual = $parentPage->AllChildrenIncludingDeleted()->column('ID'); $parentPage->AllChildrenIncludingDeleted()->column('ID'),
sort($actual);
$this->assertEquals(
$actual,
$expected,
"Showing AllChildrenIncludingDeleted() in default language doesnt show deleted children in other languages" "Showing AllChildrenIncludingDeleted() in default language doesnt show deleted children in other languages"
); );