Changeset 1932 for trunk/admin

Timestamp:

Mar 29, 2007, 9:04:54 PM (18 years ago)

Author:

rub

Message:

o add missing $lang
o use of l10n_dec
o normalize file header

Location:

trunk/admin

Files:

• comments.php (modified) (2 diffs)
• group_list.php (modified) (2 diffs)
• history.php (modified) (3 diffs)
• include/functions.php (modified) (1 diff)
• intro.php (modified) (2 diffs)
• tags.php (modified) (2 diffs)
• user_list.php (modified) (2 diffs)

trunk/admin/comments.php

@@ -90 +90 @@
     array_push(
       $page['infos'],
-      sprintf(
-        l10n('%d user comments validated'),
+      l10n_dec(
+        '%d user comment validated', '%d user comments validated',
         count($to_validate)
         )
@@ -108 +108 @@
     array_push(
       $page['infos'],
-      sprintf(
-        l10n('%d user comments rejected'),
+      l10n_dec(
+        '%d user comment rejected', '%d user comments rejected',
         count($to_reject)
         )

trunk/admin/group_list.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -196 +195 @@
       'NAME' => $row['name'],
       'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),
-      'MEMBERS' => sprintf(l10n('%d members'), $counter),
+      'MEMBERS' => l10n_dec('%d member', '%d members', $counter),
       'U_MEMBERS' => $members_url.$row['id'],
       'U_DELETE' => $del_url.$row['id'],

trunk/admin/history.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@@ -614 +613 @@
     'summary',
     array(
-      'NB_LINES' => sprintf(
-        l10n('%d lines filtered'),
+      'NB_LINES' => l10n_dec(
+        '%d line filtered', '%d lines filtered',
         $page['nb_lines']
         ),
       'FILESIZE' => $summary['total_filesize'].' KB',
-      'USERS' => sprintf(
-        l10n('%d users'),
+      'USERS' => l10n_dec(
+        '%d user', '%d users',
         $summary['nb_members'] + $summary['nb_guests']
         ),
       'MEMBERS' => sprintf(
-        l10n('%d members: %s'),
-        $summary['nb_members'],
+        l10n_dec('%d member', '%d members', $summary['nb_members']).': %s',
         implode(
           ', ',
@@ -631 +629 @@
           )
         ),
-      'GUESTS' => sprintf(
-        l10n('%d guests'),
+      'GUESTS' => l10n_dec(
+        '%d guest', '%d guests',
         $summary['nb_guests']
         ),

trunk/admin/include/functions.php

@@ -1466 +1466 @@
   array_push(
     $page['infos'],
-    sprintf(
-      l10n('%d categories moved'),
+    l10n_dec(
+      '%d category moved', '%d categories moved',
       count($categories)
       )

trunk/admin/intro.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -192 +191 @@
     'PHP_VERSION' => phpversion(),
     'MYSQL_VERSION' => $mysql_version,
-    'DB_ELEMENTS' => sprintf(l10n('%d elements'), $nb_elements),
+    'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements),
     'DB_CATEGORIES' =>
-      sprintf(
-        l10n('%d categories including %d physical and %d virtual'),
-        $nb_categories,
-        $nb_physical,
-        $nb_virtual
-        ),
-    'DB_IMAGE_CATEGORY' =>sprintf(l10n('%d associations'), $nb_image_category),
-    'DB_TAGS' => sprintf(l10n('%d tags'), $nb_tags),
-    'DB_IMAGE_TAG' => sprintf(l10n('%d associations'), $nb_image_tag),
-    'DB_USERS' => sprintf(l10n('%d users'), $nb_users),
-    'DB_GROUPS' => sprintf(l10n('%d groups'), $nb_groups),
-    'DB_COMMENTS' => sprintf(l10n('%d comments'), $nb_comments),
+      l10n_dec('cat_inclu_part1_S', 'cat_inclu_part1_P',
+        $nb_categories).
+      l10n_dec('cat_inclu_part2_S', 'cat_inclu_part2_P',
+        $nb_physical).
+      l10n_dec('cat_inclu_part3_S', 'cat_inclu_part3_P',
+        $nb_virtual),
+    'DB_IMAGE_CATEGORY' => l10n_dec('%d association', '%d associations', $nb_image_category),
+    'DB_TAGS' => l10n_dec('%d tag', '%d tags', $nb_tags),
+    'DB_IMAGE_TAG' => l10n_dec('%d association', '%d associations', $nb_image_tag),
+    'DB_USERS' => l10n_dec('%d user', '%d users', $nb_users),
+    'DB_GROUPS' => l10n_dec('%d group', '%d groups', $nb_groups),
+    'DB_COMMENTS' => l10n_dec('%d comment', '%d comments', $nb_comments),
     'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade',
     'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo',

trunk/admin/tags.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
@@ -136 +135 @@
   array_push(
     $page['infos'],
-    sprintf(
-      l10n('The %d following tags were deleted : %s'),
-      count($tag_names),
+    l10n_dec(
+      'The %d following tag were deleted', 
+      'The %d following tags were deleted',
+      count($tag_names)).' : '.
       implode(', ', $tag_names)
-      )
     );
 }

trunk/admin/user_list.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -271 +271 @@
       array_push(
         $page['infos'],
-        sprintf(
-          l10n('%d users deleted'),
+        l10n_dec(
+          '%d user deleted', '%d users deleted',
           count($collection)
           )