- RSS feed is PWG charset

- iptc are now converted from iso-8859-1 or utf-8 (automatic detection) to pwg charset
- remove function get_language_filepath
- load_language also checks for the default language


git-svn-id: http://piwigo.org/svn/trunk@2132 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-10-09 22:43:09 +00:00
parent 762562ddbe
commit 5aafffb22b
5 changed files with 16 additions and 77 deletions
-74
View File
@@ -929,80 +929,6 @@ SELECT name
return $groupname;
}
/**
* return the file path of the given language filename, depending on the
* availability of the file
*
* in descending order of preference:
* param language, user language, default language
* PhpWebGallery default language.
*
* @param string filename
* @param string dirname
* @param string language
* @return string filepath
*/
function get_language_filepath($filename, $dirname = '', $language = '')
{
global $user, $conf;
if (empty($dirname))
{
$dirname = PHPWG_ROOT_PATH;
}
$dirname .= 'language'.'/';
$dir_methods = array();
if (!empty($language))
{
$dir_methods[] = 1;
}
$dir_methods[] = 2;
$dir_methods[] = 3;
$dir_methods[] = 4;
foreach ($dir_methods as $dir_method)
{
switch ($dir_method)
{
case '1':
{
$directory = $dirname.$language;
break;
}
case '2':
{
$directory = $dirname.$user['language'];
break;
}
case '3':
{
$directory = $dirname.get_default_language();
break;
}
case '4':
default:
{
$directory = $dirname.PHPWG_DEFAULT_LANGUAGE;
break;
}
{
$directory = '.';
}
}
$filepath = $directory.'/'.$filename;
if (file_exists($filepath))
{
return $filepath;
}
}
return false;
}
/**
* returns the auto login key or false on error