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

Missing file for the patch for moving the lang files in previous rev

Browse Source
This commit is contained in:
Oscar Manuel Gómez Senovilla 2009-11-28 11:34:40 +00:00
parent d47bb7dd88
commit 2d678b8966
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ class translation
// to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer), // to cope with $vars[0] containing '%2' (eg. an urlencoded path like a referer),
// we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder // we first replace '%2' in $ret with '|%2|' and then use that as 2. placeholder
// we do that for %3 as well, ... // we do that for %3 as well, ...
$vars = array_merge(array('|%3|','|%2|'),$vars); // push '|%2|' (and such) as first replacement on $vars array_unshift($vars,array('|%3|','|%2|')); // push '|%2|' (and such) as first replacement on $vars
$ret = str_replace($placeholders,$vars,$ret); $ret = str_replace($placeholders,$vars,$ret);
} }
else else
@ -430,6 +430,37 @@ class translation
return $languages; return $languages;
} }
/**
* provides centralization and compatibility to locate the lang files
*
* @param string $app application name
* @param string $lang language code
* @return the full path of the filename for the requested app and language
*/
static function get_lang_file($app,$lang)
{
// Visit each lang file dir, look for a corresponding ${prefix}_lang file
$langprefix=EGW_SERVER_ROOT . SEP ;
$langsuffix=strtolower($lang) . '.lang';
$new_appfile = $langprefix . $app . SEP . 'lang' . SEP . self::LANGFILE_PREFIX . $langsuffix;
$cur_appfile = $langprefix . $app . SEP . 'setup' . SEP . self::LANGFILE_PREFIX . $langsuffix;
$old_appfile = $langprefix . $app . SEP . 'setup' . SEP . self::OLD_LANGFILE_PREFIX . $langsuffix;
// Note there's no chance for 'lang/phpgw_' files
if (file_exists($new_appfile))
{
$appfile=$new_appfile;
}
elseif (file_exists($cur_appfile))
{
$appfile=$cur_appfile;
}
else
{
$appfile=$old_appfile;
}
return $appfile;
}
/** /**
* returns a list of installed charsets * returns a list of installed charsets
* *
@ -641,13 +672,11 @@ class translation
$setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info); $setup_info = $GLOBALS['egw_setup']->detection->get_db_versions($setup_info);
$raw = array(); $raw = array();
$apps = $only_app ? array($only_app) : array_keys($setup_info); $apps = $only_app ? array($only_app) : array_keys($setup_info);
// Visit each app/setup dir, look for a egw_lang file
foreach($apps as $app) foreach($apps as $app)
{ {
$appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . self::LANGFILE_PREFIX . strtolower($lang) . '.lang'; $appfile=self::get_lang_file($app,$lang);
$old_appfile = EGW_SERVER_ROOT . SEP . $app . SEP . 'setup' . SEP . self::OLD_LANGFILE_PREFIX . strtolower($lang) . '.lang';
//echo '<br>Checking in: ' . $app; //echo '<br>Checking in: ' . $app;
if($GLOBALS['egw_setup']->app_registered($app) && (file_exists($appfile) || file_exists($appfile=$old_appfile))) if($GLOBALS['egw_setup']->app_registered($app) && (file_exists($appfile)))
{ {
//echo '<br>Including: ' . $appfile; //echo '<br>Including: ' . $appfile;
$lines = file($appfile); $lines = file($appfile);
@ -786,7 +815,7 @@ class translation
$apps['phpgwapi'] = True; // check the api too $apps['phpgwapi'] = True; // check the api too
foreach($apps as $app => $data) foreach($apps as $app => $data)
{ {
$fname = EGW_SERVER_ROOT . "/$app/setup/" . self::LANGFILE_PREFIX . "$lang.lang"; $fname=self::get_lang_file($app,$lang);
$old_fname = EGW_SERVER_ROOT . "/$app/setup/" . self::OLD_LANGFILE_PREFIX . "$lang.lang"; $old_fname = EGW_SERVER_ROOT . "/$app/setup/" . self::OLD_LANGFILE_PREFIX . "$lang.lang";
if (file_exists($fname) || file_exists($fname = $old_fname)) if (file_exists($fname) || file_exists($fname = $old_fname))
@ -1198,8 +1227,3 @@ class translation
} }
} }
} }
/*
$msg = 'Bitte %1hier%2 clicken!';
$replace = array('<a href="http://index.php?referer=%2Findex.php">','</a>');
echo "<p>".htmlspecialchars(translation::translate($msg,$replace))."</p>\n";
*/