Changeset 1864 for trunk/include

Timestamp:

Feb 28, 2007, 12:24:53 AM (17 years ago)

Author:

rub

Message:

Missing one change flat_hint to mode_flat_hint
Review a little l10n_dec

Location:

trunk/include

Files:

• category_default.inc.php (modified) (2 diffs)
• functions.inc.php (modified) (1 diff)

trunk/include/category_default.inc.php

@@ -104 +104 @@
       )
     );
-  if ($user['show_nb_hits']
-      and isset($page['category']))
+  if ($user['show_nb_hits'])
   {
     $template->assign_block_vars(
@@ -156 +155 @@
   }
 
-  if ($user['show_nb_comments']
-      and isset($page['category'])
-      and $page['category']['commentable'])
+  if ($user['show_nb_comments'])
   {
     $query = '

trunk/include/functions.inc.php

@@ -1013 +1013 @@
 {
   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);
 }