- 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

3 files changed, 17 insertions, 18 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index cd54b760e..653d1d869 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -4,7 +4,6 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -246,7 +245,12 @@ if (count($categories) > 0)
         array(
           'IMAGE'       => $thumbnail_src_of[ $category['representative_picture_id'] ],
           'IMAGE_ALT'   => $category['name'],
-          'IMAGE_TITLE' => $lang['hint_category'],
+          'IMAGE_TITLE' => get_display_images_count
+                                  (
+                                    $category['nb_images'],
+                                    $category['count_images'],
+                                    $category['count_categories']
+                                  ),
 
           'U_IMG_LINK'  => make_index_url(
             array(
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index f7a27c0eb..9b38ae440 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -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');
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index b995ed7cf..751749490 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -458,12 +458,11 @@ function get_html_menu_category($categories)
     }
     $menu.= '>'.$category['name'].'</a>';
 
-    // Count of category is main
-    // if not picture on categorie, test on sub-categories
-    if (($category['nb_images'] > 0) or ($category['count_images'] > 0))
-    {
+    if ( $category['count_images']>0 )
+    {// at least one direct or indirect image
       $menu.= "\n".'<span class="';
-      $menu.= ($category['nb_images'] > 0 ? "menuInfoCat"
+      // at least one image in this category -> class menuInfoCat
+      $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" 
                                           : "menuInfoCatByChild").'"';
       $menu.= ' title="';
       $menu.= ' '.get_display_images_count
@@ -473,8 +472,8 @@ function get_html_menu_category($categories)
                     $category['count_categories'],
                     false
                   ).'">';
-      $menu.= '['.($category['nb_images'] > 0 ? $category['nb_images']
-                                              : $category['count_images']).']';
+      // show total number of images
+      $menu.= '['.$category['count_images'].']';
       $menu.= '</span>';
     }
     $child_date_last = @$category['max_date_last']> @$category['date_last'];