extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues 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-14 16:03:50 +00:00
parent 83b6706964
commit 08e1ce3c9e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
}
}
// 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());
}