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

Site language and CMS locale are different, so we can't use one to set the other

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44325 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-11-06 02:38:06 +00:00
parent 758d6806c1
commit 403257de36
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/model/Translatable.php
View File

@ -108,18 +108,14 @@ class Translatable extends DataObjectDecorator {
*/ */
static function choose_site_lang($langsAvailable = null) { static function choose_site_lang($langsAvailable = null) {
if(is_array($langsAvailable)) { if(is_array($langsAvailable)) {
if(isset($_GET['lang']) && in_array($_GET['lang'],$langsAvailable)) { if(isset($_GET['lang']) && in_array($_GET['lang'], $langsAvailable)) {
self::set_reading_lang($_GET['lang']); self::set_reading_lang($_GET['lang']);
} elseif(isset($_COOKIE['lang']) && in_array($_COOKIE['lang'],$langsAvailable)) { } elseif(isset($_COOKIE['lang']) && in_array($_COOKIE['lang'], $langsAvailable)) {
self::set_reading_lang($_COOKIE['lang']); self::set_reading_lang($_COOKIE['lang']);
} else if(Session::get('currentLang') } else if(Session::get('currentLang') && in_array(Session::get('currentLang'), $langsAvailable)) {
&& in_array(Session::get('currentLang'),$langsAvailable)
) {
self::set_reading_lang(Session::get('currentLang')); self::set_reading_lang(Session::get('currentLang'));
} else if (($member = Member::currentUser()) && ($lang = $member->Locale) } else {
&& in_array($lang,$langsAvailable) self::set_reading_lang(self::default_lang());
) {
self::set_reading_lang($lang);
} }
} else { } else {
if(isset($_GET['lang'])) { if(isset($_GET['lang'])) {
@ -128,8 +124,6 @@ class Translatable extends DataObjectDecorator {
self::set_reading_lang($_COOKIE['lang']); self::set_reading_lang($_COOKIE['lang']);
} else if(Session::get('currentLang')) { } else if(Session::get('currentLang')) {
self::set_reading_lang(Session::get('currentLang')); self::set_reading_lang(Session::get('currentLang'));
} else if (($member = Member::currentUser()) && ($lang = $member->Locale)) {
self::set_reading_lang($lang);
} else { } else {
self::set_reading_lang(self::default_lang()); self::set_reading_lang(self::default_lang());
} }