extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-implement get_message_id() to check cache too.

Browse Source 
Fixes(?) troubles with using default import definitions with languages other than english.
This commit is contained in:
Nathan Gray 2015-11-30 22:59:26 +00:00
parent b1dd9f69f1
commit e02202982f
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,7 +1033,39 @@ class translation
if ($app) $where['app_name'] = $app;
if ($lang) $where['lang'] = $lang;
return self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
$id = self::$db->select(self::LANG_TABLE,'message_id',$where,__LINE__,__FILE__)->fetchColumn();
// Check cache, since most things aren't in the DB anymore
if(!$id)
{
$ids = array_filter(array_keys(self::$lang_arr), function($haystack) use($translation) {
return stripos(self::$lang_arr[$haystack],$translation) !== false;
});
$id = array_shift($ids);
if(!$id && ($lang && $lang !== 'en' || self::$userlang != 'en'))
{
// Try english
if (in_array($app, self::$instance_specific_translations))
{
$instance_level[] = $app.':en';
}
else
{
$tree_level[] = $app.':en';
}
// load all translations from cache at once
if ($tree_level) $lang_arr = egw_cache::getTree(__CLASS__, $tree_level);
if ($instance_level) $lang_arr = egw_cache::getInstance(__CLASS__, $instance_level);
$lang_arr = $lang_arr[$app.':en'];
$ids = array_filter(array_keys($lang_arr), function($haystack) use($translation, $lang_arr) {
return stripos($lang_arr[$haystack],$translation) !== false;
});
$id = array_shift($ids);
}
}
return $id;
}
/**