- without subcatify, category thumbnail alt text is 'x images in y sub-categories'

- improved display of 'x images in y sub-categories' or 'x images in this category' for cases when categories contain both images and sub-categories
- small lang improvement (plural 'Images within the' instead 'Image within the')

git-svn-id: http://piwigo.org/svn/trunk@1840 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-02-20 01:40:40 +00:00
parent ed4b51f1f1
commit f39bf0bb26
5 changed files with 19 additions and 20 deletions
+5 -9
View File
@@ -390,16 +390,12 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
{
$display_text = '';
// Count of category is main
// if not picture on categorie, test on sub-categories
$count = ($cat_nb_images > 0 ? $cat_nb_images : $cat_count_images);
if ($cat_count_images>0)
{//at least one image direct or indirect
$display_text.= l10n_dec('image_available', 'images_available', $cat_count_images);
if ($count > 0)
{
$display_text.= l10n_dec('image_available', 'images_available', $count);
if ($cat_nb_images > 0)
{
if ($cat_count_categories==0 or $cat_nb_images>=$cat_count_images)
{//no descendant categories or descendants do not contain images
if (! $short_message)
{
$display_text.= ' '.l10n('images_available_cpl');