Missing one change flat_hint to mode_flat_hint

Review a little l10n_dec

git-svn-id: http://piwigo.org/svn/trunk@1864 68402e56-0260-453c-a942-63ccdbb3a9ee

include/category_default.inc.php

@@ -103,8 +103,7 @@ foreach ($pictures as $row)
       'CLASS'              => 'thumbElmt',
       )
     );
-  if ($user['show_nb_hits']
-      and isset($page['category']))
+  if ($user['show_nb_hits'])
   {
     $template->assign_block_vars(
       'thumbnails.line.thumbnail.nb_hits',
@@ -155,9 +154,7 @@ foreach ($pictures as $row)
       );
   }
 
-  if ($user['show_nb_comments']
-      and isset($page['category'])
-      and $page['category']['commentable'])
+  if ($user['show_nb_comments'])
   {
     $query = '
 SELECT COUNT(*) AS nb_comments

include/functions.inc.php

@@ -1012,12 +1012,14 @@ function l10n($key)
 function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
 {
   global $lang_info;
-  if ( $lang_info['zero_plural'] and $decimal == 0 )
-  {
-    return sprintf(l10n($plural_fmt_key), 0);
-  }
-  return sprintf(l10n(($decimal > 1 ? $plural_fmt_key :
-                                      $singular_fmt_key)), $decimal);
+
+  return
+    sprintf(
+      l10n((
+        (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural']))
+          ? $plural_fmt_key
+          : $singular_fmt_key
+        )), $decimal);
 }
 
 /**

template/yoga/index.tpl

@@ -32,7 +32,7 @@
       <!-- END mode_normal -->
 
       <!-- BEGIN flat -->
-      <li><a href="{flat.URL}" title="{lang:mode_flat_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/flat.png" class="button" alt="{lang:flat_hint}"></a></li>
+      <li><a href="{flat.URL}" title="{lang:mode_flat_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/flat.png" class="button" alt="{lang:mode_flat_hint}"></a></li>
       <!-- END flat -->
 
       <!-- BEGIN mode_posted -->