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

API CHANGE Deprecated Translatable::current_lang(), use Translatable::get_current_locale()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76853 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-05-14 06:05:48 +00:00
parent b1018f5864
commit 67180937ff
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/control/ContentController.php
View File

@ -318,7 +318,7 @@ HTML;
* Returns the xml:lang and lang attributes * Returns the xml:lang and lang attributes
*/ */
function LangAttributes() { function LangAttributes() {
$lang = Translatable::current_locale(); $lang = Translatable::get_current_locale();
return "xml:lang=\"$lang\" lang=\"$lang\""; return "xml:lang=\"$lang\" lang=\"$lang\"";
} }

2
core/control/RootURLController.php
View File

@ -67,7 +67,7 @@ class RootURLController extends Controller {
} }
if(singleton('SiteTree')->hasExtension('Translatable') && !$homePageOBJ) { if(singleton('SiteTree')->hasExtension('Translatable') && !$homePageOBJ) {
$urlSegment = Translatable::get_homepage_urlsegment_by_locale(Translatable::current_locale()); $urlSegment = Translatable::get_homepage_urlsegment_by_locale(Translatable::get_current_locale());
} elseif($homePageOBJ) { } elseif($homePageOBJ) {
$urlSegment = $homePageOBJ->URLSegment; $urlSegment = $homePageOBJ->URLSegment;
} }

2
core/model/SiteTree.php
View File

@ -883,7 +883,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
// get the "long" lang name suitable for the HTTP content-language flag (with hyphens instead of underscores) // get the "long" lang name suitable for the HTTP content-language flag (with hyphens instead of underscores)
$currentLang = ($this->hasExtension('Translatable')) ? Translatable::current_locale() : i18n::get_locale(); $currentLang = ($this->hasExtension('Translatable')) ? Translatable::get_current_locale() : i18n::get_locale();
$tags .= "<meta http-equiv=\"Content-Language\" content=\"". i18n::convert_rfc1766($currentLang) ."\"/>\n"; $tags .= "<meta http-equiv=\"Content-Language\" content=\"". i18n::convert_rfc1766($currentLang) ."\"/>\n";
// DEPRECATED 2.3: Use MetaTags // DEPRECATED 2.3: Use MetaTags

24
core/model/Translatable.php
View File

@ -187,7 +187,7 @@ class Translatable extends DataObjectDecorator {
protected $original_values = null; protected $original_values = null;
/** /**
* @var boolean Temporarily override the "auto-filter" for {@link current_locale()} * @var boolean Temporarily override the "auto-filter" for {@link get_current_locale()}
* in {@link augmentSQL()}. IMPORTANT: You must set this value back to TRUE * in {@link augmentSQL()}. IMPORTANT: You must set this value back to TRUE
* after the temporary usage. * after the temporary usage.
*/ */
@ -260,7 +260,7 @@ class Translatable extends DataObjectDecorator {
* Get the current reading language. * Get the current reading language.
* @return string * @return string
*/ */
static function current_locale() { static function get_current_locale() {
if (!self::$language_decided) self::choose_site_locale(); if (!self::$language_decided) self::choose_site_locale();
return self::$reading_locale; return self::$reading_locale;
} }
@ -288,7 +288,7 @@ class Translatable extends DataObjectDecorator {
* @return DataObject * @return DataObject
*/ */
static function get_one_by_locale($class, $locale, $filter = '', $cache = false, $orderby = "") { static function get_one_by_locale($class, $locale, $filter = '', $cache = false, $orderby = "") {
$orig = Translatable::current_locale(); $orig = Translatable::get_current_locale();
Translatable::set_reading_locale($locale); Translatable::set_reading_locale($locale);
$do = DataObject::get_one($class, $filter, $cache, $orderby); $do = DataObject::get_one($class, $filter, $cache, $orderby);
Translatable::set_reading_locale($orig); Translatable::set_reading_locale($orig);
@ -309,7 +309,7 @@ class Translatable extends DataObjectDecorator {
* @return mixed The objects matching the conditions. * @return mixed The objects matching the conditions.
*/ */
static function get_by_locale($class, $locale, $filter = '', $sort = '', $join = "", $limit = "", $containerClass = "DataObjectSet", $having = "") { static function get_by_locale($class, $locale, $filter = '', $sort = '', $join = "", $limit = "", $containerClass = "DataObjectSet", $having = "") {
$oldLang = self::current_locale(); $oldLang = self::get_current_locale();
self::set_reading_locale($locale); self::set_reading_locale($locale);
$result = DataObject::get($class, $filter, $sort, $join, $limit, $containerClass, $having); $result = DataObject::get($class, $filter, $sort, $join, $limit, $containerClass, $having);
self::set_reading_locale($oldLang); self::set_reading_locale($oldLang);
@ -453,7 +453,7 @@ class Translatable extends DataObjectDecorator {
/** /**
* Changes any SELECT query thats not filtering on an ID * Changes any SELECT query thats not filtering on an ID
* to limit by the current language defined in {@link current_locale()}. * to limit by the current language defined in {@link get_current_locale()}.
* It falls back to "Locale='' OR Lang IS NULL" and assumes that * It falls back to "Locale='' OR Lang IS NULL" and assumes that
* this implies querying for the default language. * this implies querying for the default language.
* *
@ -463,7 +463,7 @@ class Translatable extends DataObjectDecorator {
// If the record is saved (and not a singleton), and has a locale, // If the record is saved (and not a singleton), and has a locale,
// limit the current call to its locale. This fixes a lot of problems // limit the current call to its locale. This fixes a lot of problems
// with other extensions like Versioned // with other extensions like Versioned
$locale = ($this->owner->ID && $this->owner->Locale) ? $this->owner->Locale : Translatable::current_locale(); $locale = ($this->owner->ID && $this->owner->Locale) ? $this->owner->Locale : Translatable::get_current_locale();
$baseTable = ClassInfo::baseDataClass($this->owner->class); $baseTable = ClassInfo::baseDataClass($this->owner->class);
$where = $query->where; $where = $query->where;
if( if(
@ -626,7 +626,7 @@ class Translatable extends DataObjectDecorator {
function contentcontrollerInit($controller) { function contentcontrollerInit($controller) {
Translatable::choose_site_locale(); Translatable::choose_site_locale();
$controller->Locale = Translatable::current_locale(); $controller->Locale = Translatable::get_current_locale();
} }
function modelascontrollerInit($controller) { function modelascontrollerInit($controller) {
@ -654,7 +654,7 @@ class Translatable extends DataObjectDecorator {
// of the content, as a "single language" website might be expanded // of the content, as a "single language" website might be expanded
// later on. // later on.
if(!$this->owner->ID && !$this->owner->Locale) { if(!$this->owner->ID && !$this->owner->Locale) {
$this->owner->Locale = Translatable::current_locale(); $this->owner->Locale = Translatable::get_current_locale();
} }
// Specific logic for SiteTree subclasses. // Specific logic for SiteTree subclasses.
@ -1154,10 +1154,10 @@ class Translatable extends DataObjectDecorator {
} }
/** /**
* @deprecated 2.4 Use custom check: self::$default_locale == self::current_locale() * @deprecated 2.4 Use custom check: self::$default_locale == self::get_current_locale()
*/ */
static function is_default_lang() { static function is_default_lang() {
return (self::$default_locale == self::current_locale()); return (self::$default_locale == self::get_current_locale());
} }
/** /**
@ -1175,10 +1175,10 @@ class Translatable extends DataObjectDecorator {
} }
/** /**
* @deprecated 2.4 Use current_locale() * @deprecated 2.4 Use get_current_locale()
*/ */
static function current_lang() { static function current_lang() {
return i18n::get_lang_from_locale(self::current_locale()); return i18n::get_lang_from_locale(self::get_current_locale());
} }
/** /**

6
search/SearchForm.php
View File

@ -6,7 +6,7 @@
* If multilingual content is enabled through the {@link Translatable} extension, * If multilingual content is enabled through the {@link Translatable} extension,
* only pages the currently set language on the holder for this searchform are found. * only pages the currently set language on the holder for this searchform are found.
* The language is set through a hidden field in the form, which is prepoluated * The language is set through a hidden field in the form, which is prepoluated
* with {@link Translatable::current_locale()} when then form is constructed. * with {@link Translatable::get_current_locale()} when then form is constructed.
* *
* @see Use ModelController and SearchContext for a more generic search implementation based around DataObject * @see Use ModelController and SearchContext for a more generic search implementation based around DataObject
* @package sapphire * @package sapphire
@ -55,7 +55,7 @@ class SearchForm extends Form {
} }
if(singleton('SiteTree')->hasExtension('Translatable')) { if(singleton('SiteTree')->hasExtension('Translatable')) {
$fields->push(new HiddenField('locale', 'locale', Translatable::current_locale())); $fields->push(new HiddenField('locale', 'locale', Translatable::get_current_locale()));
} }
if(!$actions) { if(!$actions) {
@ -105,7 +105,7 @@ class SearchForm extends Form {
// set language (if present) // set language (if present)
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) { if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) {
$origLocale = Translatable::current_locale(); $origLocale = Translatable::get_current_locale();
Translatable::set_reading_locale($data['locale']); Translatable::set_reading_locale($data['locale']);
} }

2
tasks/MigrateTranslatableTask.php
View File

@ -152,7 +152,7 @@ class MigrateTranslatableTask extends BuildTask {
} }
// Write the new translation to the database // Write the new translation to the database
$sitelang = Translatable::current_locale(); $sitelang = Translatable::get_current_locale();
Translatable::set_reading_locale($newtrans->Locale); Translatable::set_reading_locale($newtrans->Locale);
$newtrans->writeToStage($stage); $newtrans->writeToStage($stage);
Translatable::set_reading_locale($sitelang); Translatable::set_reading_locale($sitelang);