Changeset 1932

Timestamp:

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

Author:

rub

Message:

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

Location:

trunk

Files:

• admin/comments.php (modified) (2 diffs)
• admin/group_list.php (modified) (2 diffs)
• admin/history.php (modified) (3 diffs)
• admin/include/functions.php (modified) (1 diff)
• admin/intro.php (modified) (2 diffs)
• admin/tags.php (modified) (2 diffs)
• admin/user_list.php (modified) (2 diffs)
• include/menubar.inc.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• install/upgrade_1.3.0.php (modified) (1 diff)
• install/upgrade_1.3.1.php (modified) (1 diff)
• install/upgrade_1.4.0.php (modified) (1 diff)
• install/upgrade_1.5.0.php (modified) (1 diff)
• install/upgrade_1.6.0.php (modified) (1 diff)
• install/upgrade_1.6.2.php (modified) (1 diff)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (3 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (3 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)

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)
           )

trunk/include/menubar.inc.php

@@ -153 +153 @@
             )
           ),
-        'TITLE' => sprintf(
-          l10n('%d pictures are also linked to current tags'),
-          $tag['counter']
-          ),
+        'TITLE' => l10n_dec(
+            '%d picture are also linked to current tags',
+            '%d pictures are also linked to current tags',
+            $tag['counter']),
         )
       );

trunk/index.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
@@ -229 +228 @@
           ),
         'NAME' => $tag['name'],
-        'TITLE' => sprintf(
-          l10n('%d pictures are also linked to current tags'),
-          $tag['counter']
-          ),
+        'TITLE' => l10n_dec(
+            '%d picture are also linked to current tags',
+            '%d pictures are also linked to current tags',
+            $tag['counter']),
         'CLASS' => 'tagLevel'.$tag['level']
         )

trunk/install/upgrade_1.3.0.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 |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$

trunk/install/upgrade_1.3.1.php

@@ -1 +1 @@
 <?php
+// +-----------------------------------------------------------------------+
 // +-----------------------------------------------------------------------+
 // | 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 |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$

trunk/install/upgrade_1.4.0.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$

trunk/install/upgrade_1.5.0.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 |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$

trunk/install/upgrade_1.6.0.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 |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$

trunk/install/upgrade_1.6.2.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 |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -25 +25 @@
 // +-----------------------------------------------------------------------+
 
+$lang['%d association'] = '%d association';
 $lang['%d associations'] = '%d associations';
-$lang['%d categories including %d physical and %d virtual'] = '%d categories including %d physical and %d virtual';
+$lang['cat_inclu_part1_S'] = '%d category including ';
+$lang['cat_inclu_part1_P'] = '%d categories including ';
+$lang['cat_inclu_part2_S'] = '%d physical';
+$lang['cat_inclu_part2_P'] = '%d physical';
+$lang['cat_inclu_part3_S'] = ' and %d virtual';
+$lang['cat_inclu_part3_P'] = ' and %d virtual';
+$lang['%d category moved'] = '%d category moved';
 $lang['%d categories moved'] = '%d categories moved';
-$lang['%d comments'] = '%d comments';
+$lang['%d element'] = '%d element';
 $lang['%d elements'] = '%d elements';
+$lang['%d group'] = '%d group';
 $lang['%d groups'] = '%d groups';
+$lang['%d member'] = '%d member';
 $lang['%d members'] = '%d members';
+$lang['%d tag'] = '%d tag';
 $lang['%d tags'] = '%d tags';
+$lang['%d user comment rejected'] = '%d user comment rejected';
 $lang['%d user comments rejected'] = '%d user comments rejected';
+$lang['%d user comment validated'] = '%d user comment validated';
 $lang['%d user comments validated'] = '%d user comments validated';
+$lang['%d user deleted'] = '%d user deleted';
 $lang['%d users deleted'] = '%d users deleted';
+$lang['%d user'] = '%d user';
 $lang['%d users'] = '%d users';
 $lang['%d waiting for validation'] = '%d waiting for validation';
@@ -174 +188 @@
 $lang['Tag selection'] = 'Tag selection';
 $lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie';
-$lang['The %d following tags were deleted : %s'] = 'The %d following tags were deleted : %s';
+$lang['The %d following tag were deleted'] = 'The following tag were deleted';
+$lang['The %d following tags were deleted'] = 'The %d following tags were deleted';
 $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Unable to check for upgrade since allow_url_fopen is disabled.';
 $lang['Uninstall'] = 'Uninstall';
@@ -586 +601 @@
 $lang['Image id'] = 'Image id';
 $lang['Summary'] = 'Summary';
+$lang['%d line filtered'] = '%d line filtered';
 $lang['%d lines filtered'] = '%d lines filtered';
-$lang['%d members: %s'] = '%d members: %s';
+$lang['%d guest'] = '%d guest';
 $lang['%d guests'] = '%d guests';
 $lang['Hour'] = 'Hour';
 $lang['is_the_guest'] = 'guest';
 $lang['is_the_default'] = 'default values';
+$lang['High filesize'] = 'High filesize';
 ?>

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -307 +307 @@
 $lang['%d new user'] = '%d new user';
 $lang['%d new users'] = '%d new users';
+$lang['%d picture are also linked to current tags'] = '%d picture are also linked to current tags';
 $lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
 $lang['%d waiting element'] = '%d waiting element';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -25 +25 @@
 // +-----------------------------------------------------------------------+
 
+$lang['%d association'] = '%d association';
 $lang['%d associations'] = '%d associations';
-$lang['%d categories including %d physical and %d virtual'] = '%d catégories dont %d physiques et %d virtuelles';
+$lang['cat_inclu_part1_S'] = '%d catégorie dont ';
+$lang['cat_inclu_part1_P'] = '%d catégories dont ';
+$lang['cat_inclu_part2_S'] = '%d physique';
+$lang['cat_inclu_part2_P'] = '%d physiques';
+$lang['cat_inclu_part3_S'] = ' et %d virtuelle';
+$lang['cat_inclu_part3_P'] = ' et %d virtuelles';
+$lang['%d category moved'] = '%d catégorie déplacée';
 $lang['%d categories moved'] = '%d catégories déplacées';
-$lang['%d comments'] = '%d commentaires d\'utilisateurs';
+$lang['%d element'] = '%d élément';
 $lang['%d elements'] = '%d éléments';
+$lang['%d group'] = '%d groupe';
 $lang['%d groups'] = '%d groupes';
+$lang['%d member'] = '%d membre';
 $lang['%d members'] = '%d membres';
+$lang['%d tag'] = '%d tag';
 $lang['%d tags'] = '%d tags';
+$lang['%d user comment rejected'] = '%d commentaire d\'utilisateur rejeté';
 $lang['%d user comments rejected'] = '%d commentaires d\'utilisateurs rejetés';
+$lang['%d user comment validated'] = '%d commentaire d\'utilisateur validé';
 $lang['%d user comments validated'] = '%d commentaires d\'utilisateurs validés';
+$lang['%d user deleted'] = '%d utilisateur supprimé';
 $lang['%d users deleted'] = '%d utilisateurs supprimés';
+$lang['%d user'] = '%d utilisateur';
 $lang['%d users'] = '%d utilisateurs';
 $lang['%d waiting for validation'] = '%d en attente de validation';
@@ -174 +188 @@
 $lang['Tag selection'] = 'Sélection de tags';
 $lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier';
-$lang['The %d following tags were deleted : %s'] = 'Les %d tags suivants ont été supprimés : %s';
+$lang['The %d following tag were deleted'] = 'Le tag suivant a été supprimé';
+$lang['The %d following tags were deleted'] = 'Les %d tags suivants ont été supprimés';
 $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version cat la fonction allow_url_fopen est désactivée.';
 $lang['Uninstall'] = 'Désinstaller';
@@ -585 +600 @@
 $lang['Image id'] = 'Identifiant image';
 $lang['Summary'] = 'Résumé';
+$lang['%d line filtered'] = '%d ligne filtrée';
 $lang['%d lines filtered'] = '%d lignes filtrées';
+$lang['%d member: %s'] = '%d membre: %s';
 $lang['%d members: %s'] = '%d membres: %s';
+$lang['%d guest'] = '%d invité';
 $lang['%d guests'] = '%d invités';
 $lang['Hour'] = 'Heure';
 $lang['is_the_guest'] = 'invité';
 $lang['is_the_default'] = 'valeurs par défaut';
+$lang['High filesize'] = 'Taille du fichier HR';
 ?>

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -307 +307 @@
 $lang['%d new user'] = '%d nouvel utilisateur';
 $lang['%d new users'] = '%d nouveaux utilisateurs';
+$lang['%d picture are also linked to current tags'] = '%d image est également liée aux tags courants';
 $lang['%d pictures are also linked to current tags'] = '%d images sont également liées aux tags courants';
 $lang['%d waiting element'] = '%d élément en attente';