holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong language in notifications

Browse Source
This commit is contained in:
Ralf Becker 2010-05-20 19:32:52 +00:00
parent c11a4ef210
commit 6799864392
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.bo_tracking.inc.php
View File

@ -468,7 +468,7 @@ abstract class bo_tracking
if (is_numeric($user_or_lang)) // user --> read everything from his prefs
{
$GLOBALS['egw']->preferences->__construct($user_or_lang);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
if ($check && $this->check2pref) $check = $this->check2pref[$check];
if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check])
@ -490,7 +490,7 @@ abstract class bo_tracking
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default;
$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
}
if ($lang != translation::$userlang) // load the right language if needed
if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang) // load the right language if needed
{
translation::init();
}

6
phpgwapi/inc/class.preferences.inc.php
View File

@ -274,12 +274,12 @@ class preferences
*
* the function ready all 3 prefs user/default/forced and merges them to the effective ones
*
* @internal private function should only be called from within this class
* @param boolean $use_session=true should the session prefs get used (default true) or not (false)
* @return array with effective prefs ($this->data)
*/
function read_repository()
function read_repository($use_session=true)
{
$this->session = $GLOBALS['egw']->session->appsession('preferences','preferences');
$this->session = $use_session ? $GLOBALS['egw']->session->appsession('preferences','preferences') : array();
if (!is_array($this->session))
{
$this->session = array();

1
phpgwapi/inc/class.translation.inc.php
View File

@ -173,6 +173,7 @@ class translation
if ($load_translations)
{
self::$lang_arr = self::$loaded_apps = array();
if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'])
{
self::$userlang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];