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

Fixed add_extension() and add_to_class() usage

Browse Source
This commit is contained in:
Ingo Schommer 2013-03-19 09:54:46 +01:00
parent 2f0a629df1
commit 20c2e9a190
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/model/Translatable.php
View File

@ -15,7 +15,7 @@
* <h3>Through Object::add_extension()</h3> * <h3>Through Object::add_extension()</h3>
* Enabling Translatable through {@link Object::add_extension()} in your _config.php: * Enabling Translatable through {@link Object::add_extension()} in your _config.php:
* <code> * <code>
* Object::add_extension('MyClass', 'Translatable'); * MyClass::add_extension('Translatable');
* </code> * </code>
* This is the recommended approach for enabling Translatable. * This is the recommended approach for enabling Translatable.
* *
@ -79,8 +79,8 @@
* Translatable can be used for subclasses of {@link SiteTree} as well. * Translatable can be used for subclasses of {@link SiteTree} as well.
* *
* <code> * <code>
* Object::add_extension('SiteTree', 'Translatable'); * SiteTree::add_extension('Translatable');
* Object::add_extension('SiteConig', 'Translatable'); * SiteConig::add_extension('Translatable');
* </code> * </code>
* *
* If a child page translation is requested without the parent * If a child page translation is requested without the parent
@ -472,25 +472,25 @@ class Translatable extends DataExtension implements PermissionProvider {
/** /**
* Enables the multilingual feature * Enables the multilingual feature
* *
* @deprecated 2.4 Use Object::add_extension('SiteTree', 'Translatable') * @deprecated 2.4 Use SiteTree::add_extension('Translatable')
*/ */
static function enable() { static function enable() {
if(class_exists('SiteTree')) Object::add_extension('SiteTree', 'Translatable'); if(class_exists('SiteTree')) SiteTree::add_extension('Translatable');
} }
/** /**
* Disable the multilingual feature * Disable the multilingual feature
* *
* @deprecated 2.4 Use Object::remove_extension('SiteTree', 'Translatable') * @deprecated 2.4 Use SiteTree::remove_extension('Translatable')
*/ */
static function disable() { static function disable() {
if(class_exists('SiteTree')) Object::remove_extension('SiteTree', 'Translatable'); if(class_exists('SiteTree')) SiteTree::remove_extension('Translatable');
} }
/** /**
* Check whether multilingual support has been enabled * Check whether multilingual support has been enabled
* *
* @deprecated 2.4 Use Object::has_extension('SiteTree', 'Translatable') * @deprecated 2.4 Use SiteTree::has_extension('Translatable')
* @return boolean True if enabled * @return boolean True if enabled
*/ */
static function is_enabled() { static function is_enabled() {
@ -541,15 +541,16 @@ class Translatable extends DataExtension implements PermissionProvider {
} }
} }
static function add_to_class($class, $extensionClass, $args = null) { static function get_extra_config($class, $extensionClass, $args = null) {
Config::inst()->update($class, 'defaults', array( $config = array();
$config['defaults'] = array(
"Locale" => Translatable::default_locale() // as an overloaded getter as well: getLang() "Locale" => Translatable::default_locale() // as an overloaded getter as well: getLang()
)); );
Config::inst()->update($class, 'db', array( $config['db'] = array(
"Locale" => "DBLocale", "Locale" => "DBLocale",
//"TranslationMasterID" => "Int" // optional relation to a "translation master" //"TranslationMasterID" => "Int" // optional relation to a "translation master"
)); );
parent::add_to_class($class, $extensionClass, $args); return $config;
} }
/** /**

3
tests/unit/TranslatableTest.php
View File

@ -1017,5 +1017,4 @@ class TranslatableTest_Page extends Page implements TestOnly {
} }
} }
DataObject::add_extension('TranslatableTest_DataObject', 'TranslatableTest_Extension'); TranslatableTest_DataObject::add_extension('TranslatableTest_Extension');
?>