Changeset 1173

Timestamp:

Apr 14, 2006, 11:12:26 PM (18 years ago)

Author:

rub

Message:

Issue ID 326:

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

Report of svn:1172

Location:

branches/branch-1_6

Files:

• include/category_recent_cats.inc.php (modified) (1 diff)
• include/category_subcats.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• template/yoga/mainpage_categories.tpl (modified) (1 diff)

branches/branch-1_6/include/category_recent_cats.inc.php

@@ -100 +100 @@
           ),
         '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,
         )

branches/branch-1_6/include/category_subcats.inc.php

@@ -161 +161 @@
             ),
           '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'],
           )

branches/branch-1_6/language/en_UK.iso-8859-1/admin.lang.php

@@ -318 +318 @@
 $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';

branches/branch-1_6/language/en_UK.iso-8859-1/common.lang.php

@@ -345 +345 @@
 $lang['yes'] = 'Yes';
 $lang['redirect_msg'] = 'Redirection...';
+$lang['pictures'] = 'pictures';
 ?>

branches/branch-1_6/language/fr_FR.iso-8859-1/admin.lang.php

@@ -321 +321 @@
 $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';

branches/branch-1_6/language/fr_FR.iso-8859-1/common.lang.php

@@ -345 +345 @@
 $lang['yes'] = 'Oui';
 $lang['redirect_msg'] = 'Redirection...';
+$lang['pictures'] = 'images';
 ?>

branches/branch-1_6/template/yoga/mainpage_categories.tpl

@@ -16 +16 @@
           <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>