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

allow mixed installations of trunk and 1.4 apps, by reading both langfiles

Browse Source
This commit is contained in:
Ralf Becker 2007-10-19 13:09:04 +00:00
parent 2be30b346a
commit ac86714bc5
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,10 @@
{
define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
}
// Define prefix for langfiles (historically 'phpgw_')
define('EGW_LANGFILE_PREFIX', 'egw_');
define('PHPGW_LANGFILE_PREFIX', 'phpgw_');
class translation
{
@ -238,26 +242,30 @@
*/
function add_setup($lang)
{
$fn = EGW_SERVER_ROOT.'/setup/lang/phpgw_' . $lang . '.lang';
if (!file_exists($fn))
foreach(array(
EGW_SERVER_ROOT.'/setup/lang/' . EGW_LANGFILE_PREFIX . $lang . '.lang',
EGW_SERVER_ROOT.'/setup/lang/' . PHPGW_LANGFILE_PREFIX . $lang . '.lang',
EGW_SERVER_ROOT.'/setup/lang/' . EGW_LANGFILE_PREFIX . 'en.lang',
EGW_SERVER_ROOT.'/setup/lang/' . PHPGW_LANGFILE_PREFIX . 'en.lang',
) as $fn)
{
$fn = EGW_SERVER_ROOT.'/setup/lang/phpgw_en.lang';
}
if (file_exists($fn))
{
$fp = fopen($fn,'r');
while ($data = fgets($fp,8000))
if (file_exists($fn))
{
// explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7
list($message_id,,,$content) = explode("\t",$data);
$phrases[strtolower(trim($message_id))] = str_replace("\n",'',$content);
}
fclose($fp);
foreach($phrases as $message_id => $content)
{
$this->lang_arr[$message_id] = $this->convert($content,$phrases['charset']);
$fp = fopen($fn,'r');
while ($data = fgets($fp,8000))
{
// explode with "\t" and removing "\n" with str_replace, needed to work with mbstring.overload=7
list($message_id,,,$content) = explode("\t",$data);
$phrases[strtolower(trim($message_id))] = str_replace("\n",'',$content);
}
fclose($fp);
foreach($phrases as $message_id => $content)
{
$this->lang_arr[$message_id] = $this->convert($content,$phrases['charset']);
}
}
break;
}
$this->loaded_apps['setup'] = $lang;
}
@ -552,9 +560,10 @@
// Visit each app/setup dir, look for a egw_lang file
foreach($apps as $app)
{
$appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . 'phpgw_' . strtolower($lang) . '.lang';
$appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . EGW_LANGFILE_PREFIX . strtolower($lang) . '.lang';
$old_appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . PHPGW_LANGFILE_PREFIX . strtolower($lang) . '.lang';
//echo '<br>Checking in: ' . $app;
if($GLOBALS['egw_setup']->app_registered($app) && file_exists($appfile))
if($GLOBALS['egw_setup']->app_registered($app) && (file_exists($appfile) || file_exists($appfile=$old_appfile)))
{
//echo '<br>Including: ' . $appfile;
$lines = file($appfile);
@ -679,9 +688,10 @@
$apps['phpgwapi'] = True; // check the api too
foreach($apps as $app => $data)
{
$fname = EGW_SERVER_ROOT . "/$app/setup/phpgw_$lang.lang";
$fname = EGW_SERVER_ROOT . "/$app/setup/" . EGW_LANGFILE_PREFIX . "$lang.lang";
$old_fname = EGW_SERVER_ROOT . "/$app/setup/" . PHPGW_LANGFILE_PREFIX . "$lang.lang";
if (file_exists($fname))
if (file_exists($fname) || file_exists($fname = $old_fname))
{
$ctime = filectime($fname);
/* This is done to avoid string offset error at least in php5 */