Issue ID 326:

  o Fix none translations "pictures"
  o Fix display 0 pictures

Report of svn:1172

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1173 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 5 insertions, 5 deletions

diff --git a/include/category_recent_cats.inc.php b/include/category_recent_cats.inc.php
index ae98426bd..b9aebcf2c 100644
--- a/include/category_recent_cats.inc.php
+++ b/include/category_recent_cats.inc.php
@@ -99,7 +99,7 @@ if ($conf['subcatify'])
             )
           ),
         'NAME' => get_cat_display_name_cache($row['uppercats'], null, false),
-        'NB_IMAGES' => $row['nb_images'],
+        'CAPTION_NB_IMAGES' => (($row['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $row['nb_images'])),
         'DESCRIPTION' => $comment,
         )
       );
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index 3e31ecc80..1fc6b2ac4 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -160,7 +160,7 @@ SELECT id, path, tn_ext
               )
             ),
           'NAME' => $category['name'],
-          'NB_IMAGES' => $category['nb_images'],
+          'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
           'DESCRIPTION' => @$category['comment'],
           )
         );
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index ae42dc4e3..82a3ecfe7 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -317,7 +317,6 @@ $lang['path'] = 'path';
 $lang['permissions'] = 'Permissions';
 $lang['permuser_info'] = 'Only private categories are listed. Private/Public category status can be set in screen "Categories > Public / Private"';
 $lang['permuser_only_private'] = 'Only private categories are shown';
-$lang['pictures'] = 'pictures';
 $lang['private'] = 'private';
 $lang['properties'] = 'Properties';
 $lang['public'] = 'public';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 8a96b9981..491a5966c 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -344,4 +344,5 @@ $lang['useful when password forgotten'] = 'useful when password forgotten';
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
 $lang['redirect_msg'] = 'Redirection...';
+$lang['pictures'] = 'pictures';
 ?>
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 9eecdaeec..0f0a2a00c 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -320,7 +320,6 @@ $lang['path'] = 'chemin';
 $lang['permissions'] = 'Permissions';
 $lang['permuser_info'] = 'Seules les catégories privées sont listées.';
 $lang['permuser_only_private'] = 'Seules les catégories privées sont listées.';
-$lang['pictures'] = 'images';
 $lang['private'] = 'privée';
 $lang['properties'] = 'Propriétés';
 $lang['public'] = 'publique';
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index aaa3eb1a0..ca646b862 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -344,4 +344,5 @@ $lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe
 $lang['w_month'] = 'Mois';
 $lang['yes'] = 'Oui';
 $lang['redirect_msg'] = 'Redirection...';
+$lang['pictures'] = 'images';
 ?>
\ No newline at end of file
diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index 1bc0a9e73..cb16d35cc 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -15,7 +15,7 @@
           {categories.category.ICON}
           <a href="{categories.category.URL}">{categories.category.NAME}</a>
         </h3>
-        <p>{categories.category.NB_IMAGES} {lang:pictures}</p>
+        <p>{categories.category.CAPTION_NB_IMAGES}</p>
         <p>{categories.category.DESCRIPTION}</p>
       </div>
     </div>