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

Keep custom translations as highest precidence.

Browse Source 
Fixes loading translations for another app loses custom translations
This commit is contained in:
Nathan Gray 2014-10-29 14:31:42 +00:00
parent 56ba21e63f
commit a137491ec0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.egw_vfs.inc.php
View File

@ -498,7 +498,7 @@ class egw_vfs extends vfs_stream_wrapper
{ {
self::_check_add($options,$path,$result); self::_check_add($options,$path,$result);
} }
if ($is_dir && (!isset($options['maxdepth']) || $options['maxdepth'] > 0) && ($dir = @opendir($path))) if ($is_dir && (!isset($options['maxdepth']) || ($options['maxdepth'] > 0 && $options['depth'] < $options['maxdepth'])) && ($dir = @opendir($path)))
{ {
while(($file = readdir($dir)) !== false) while(($file = readdir($dir)) !== false)
{ {
@ -517,7 +517,7 @@ class egw_vfs extends vfs_stream_wrapper
{ {
$opts = $options; $opts = $options;
if ($opts['mindepth']) $opts['mindepth']--; if ($opts['mindepth']) $opts['mindepth']--;
if ($opts['maxdepth']) $opts['maxdepth']++; if ($opts['maxdepth']) $opts['depth']++;;
unset($opts['order']); unset($opts['order']);
unset($opts['limit']); unset($opts['limit']);
foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s) foreach(self::find($options['url']?$file:self::parse_url($file,PHP_URL_PATH),$opts,true) as $p => $s)

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

@ -339,6 +339,15 @@ class translation
self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side self::$loaded_apps[$app] = $l; // dont set something not existing to $loaded_apps, no need to load client-side
} }
} }
// Re-merge custom over instance level, they have higher precidence
if($tree_level && !$instance_level && self::$instance_specific_translations)
{
$custom = egw_cache::getInstance(__CLASS__, 'custom:en');
if($custom)
{
self::$lang_arr = array_merge(self::$lang_arr, $custom);
}
}
//error_log(__METHOD__.'('.array2string($apps).", '$lang') took ".(1000*(microtime(true)-$start))." ms, loaded_apps=".array2string(self::$loaded_apps).", loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr));//.": ".function_backtrace()); //error_log(__METHOD__.'('.array2string($apps).", '$lang') took ".(1000*(microtime(true)-$start))." ms, loaded_apps=".array2string(self::$loaded_apps).", loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr));//.": ".function_backtrace());
} }