mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-01 21:58:51 +02:00
API CHANGE Deprecated Translatable::choose_site_lang(), use choose_site_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@74070 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
301180d491
commit
183d5e6336
@ -495,7 +495,7 @@ class Image_Uploader extends Controller {
|
|||||||
|
|
||||||
// set reading lang
|
// set reading lang
|
||||||
if(singleton('SiteTree')->hasExtension('Translatable') && !Director::is_ajax()) {
|
if(singleton('SiteTree')->hasExtension('Translatable') && !Director::is_ajax()) {
|
||||||
Translatable::choose_site_lang(array_keys(Translatable::get_existing_content_languages('SiteTree')));
|
Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree')));
|
||||||
}
|
}
|
||||||
|
|
||||||
parent::init();
|
parent::init();
|
||||||
|
@ -135,7 +135,7 @@ class Translatable extends DataObjectDecorator {
|
|||||||
protected static $reading_locale = null;
|
protected static $reading_locale = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates if the start language has been determined using choose_site_lang
|
* Indicates if the start language has been determined using choose_site_locale()
|
||||||
* @var boolean
|
* @var boolean
|
||||||
*/
|
*/
|
||||||
protected static $language_decided = false;
|
protected static $language_decided = false;
|
||||||
@ -179,7 +179,7 @@ class Translatable extends DataObjectDecorator {
|
|||||||
* @param $langsAvailable array A numerical array of languages which are valid choices (optional)
|
* @param $langsAvailable array A numerical array of languages which are valid choices (optional)
|
||||||
* @return string Selected language (also saved in $reading_locale).
|
* @return string Selected language (also saved in $reading_locale).
|
||||||
*/
|
*/
|
||||||
static function choose_site_lang($langsAvailable = array()) {
|
static function choose_site_locale($langsAvailable = array()) {
|
||||||
$siteMode = Director::get_site_mode(); // either 'cms' or 'site'
|
$siteMode = Director::get_site_mode(); // either 'cms' or 'site'
|
||||||
if(self::$reading_locale) {
|
if(self::$reading_locale) {
|
||||||
self::$language_decided = true;
|
self::$language_decided = true;
|
||||||
@ -231,7 +231,7 @@ class Translatable extends DataObjectDecorator {
|
|||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
static function current_locale() {
|
static function current_locale() {
|
||||||
if (!self::$language_decided) self::choose_site_lang();
|
if (!self::$language_decided) self::choose_site_locale();
|
||||||
return self::$reading_locale;
|
return self::$reading_locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -545,7 +545,7 @@ class Translatable extends DataObjectDecorator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function contentcontrollerInit($controller) {
|
function contentcontrollerInit($controller) {
|
||||||
Translatable::choose_site_lang();
|
Translatable::choose_site_locale();
|
||||||
$controller->Locale = Translatable::current_locale();
|
$controller->Locale = Translatable::current_locale();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1093,6 +1093,13 @@ class Translatable extends DataObjectDecorator {
|
|||||||
function isTranslation() {
|
function isTranslation() {
|
||||||
return ($this->owner->Locale && ($this->owner->Locale != Translatable::default_locale()));
|
return ($this->owner->Locale && ($this->owner->Locale != Translatable::default_locale()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated 2.4 Use choose_site_locale()
|
||||||
|
*/
|
||||||
|
static function choose_site_lang($langsAvail=null) {
|
||||||
|
return self::choose_site_locale($langAvail);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user