tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fix default language not being set

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70079 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2009-01-13 05:02:43 +00:00
parent 2b6842e634
commit aca51f68bc
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/model/Translatable.php
View File

@ -129,30 +129,14 @@ class Translatable extends DataObjectDecorator {
return self::$reading_lang;
}
if(
(isset($_GET['lang']) && !$langsAvailable)
|| (isset($_GET['lang']) && in_array($_GET['lang'], $langsAvailable))
) {
if((isset($_GET['lang']) && !$langsAvailable) || (isset($_GET['lang']) && in_array($_GET['lang'], $langsAvailable))) {
// get from GET parameter
self::set_reading_lang($_GET['lang']);
/*
} elseif(isset($_COOKIE['lang.' . $siteMode]) && $siteMode && (!isset($langsAvailable) || in_array($_COOKIE['lang.' . $siteMode], $langsAvailable))) {
// get from namespaced cookie
self::set_reading_lang($_COOKIE[$siteMode . '.lang']);
} elseif(isset($_COOKIE['lang']) && (!isset($langsAvailable) || in_array($_COOKIE['lang'], $langsAvailable))) {
// get from generic cookie
self::set_reading_lang($_COOKIE['lang']);
} else if(Session::get('lang.' . $siteMode) && (!isset($langsAvailable) || in_array(Session::get('lang.' . $siteMode), $langsAvailable))) {
// get from namespaced session ('cms' or 'site')
self::set_reading_lang(Session::get('lang.' . $siteMode));
} else if(Session::get('lang.global') && (!isset($langsAvailable) || in_array(Session::get('lang.global'), $langsAvailable))) {
// get from global session
self::set_reading_lang(Session::get('lang.global'));
} else {
get default lang stored in class
self::set_reading_lang(self::default_lang());
*/
}
self::$language_decided = true;
return self::$reading_lang;
}
@ -841,4 +825,4 @@ class Translatable_Transformation extends FormTransformation {
}
?>
?>