aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-03-29 19:04:54 +0000
committerrub <rub@piwigo.org>2007-03-29 19:04:54 +0000
commit7acc304f5543f2210a888e9bb562bb25032aa694 (patch)
tree05e9be787ad2d40f304c9c6d871f39a14f85299b /admin
parentac97e7356502f2300c4e6c6f85e35eb854d5f40a (diff)
o add missing $lang
o use of l10n_dec o normalize file header git-svn-id: http://piwigo.org/svn/trunk@1932 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/comments.php8
-rw-r--r--admin/group_list.php7
-rw-r--r--admin/history.php18
-rw-r--r--admin/include/functions.php4
-rw-r--r--admin/intro.php29
-rw-r--r--admin/tags.php9
-rw-r--r--admin/user_list.php6
7 files changed, 38 insertions, 43 deletions
diff --git a/admin/comments.php b/admin/comments.php
index 70642065d..6bba32a96 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -89,8 +89,8 @@ UPDATE '.COMMENTS_TABLE.'
array_push(
$page['infos'],
- sprintf(
- l10n('%d user comments validated'),
+ l10n_dec(
+ '%d user comment validated', '%d user comments validated',
count($to_validate)
)
);
@@ -107,8 +107,8 @@ DELETE
array_push(
$page['infos'],
- sprintf(
- l10n('%d user comments rejected'),
+ l10n_dec(
+ '%d user comment rejected', '%d user comments rejected',
count($to_reject)
)
);
diff --git a/admin/group_list.php b/admin/group_list.php
index ec0a06191..ccb5a5b80 100644
--- a/admin/group_list.php
+++ b/admin/group_list.php
@@ -2,10 +2,9 @@
// +-----------------------------------------------------------------------+
// | 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$
// | revision : $Revision$
@@ -195,7 +194,7 @@ SELECT COUNT(*)
'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
'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'],
'U_PERM' => $perm_url.$row['id'],
diff --git a/admin/history.php b/admin/history.php
index 59db2e285..0c8f34c33 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -2,9 +2,8 @@
// +-----------------------------------------------------------------------+
// | 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 : $Id$
// | last update : $Date$
// | last modifier : $Author$
@@ -613,25 +612,24 @@ SELECT
$template->assign_block_vars(
'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(
', ',
$member_strings
)
),
- 'GUESTS' => sprintf(
- l10n('%d guests'),
+ 'GUESTS' => l10n_dec(
+ '%d guest', '%d guests',
$summary['nb_guests']
),
)
diff --git a/admin/include/functions.php b/admin/include/functions.php
index ac99539d6..6e97e3908 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1465,8 +1465,8 @@ DELETE FROM '.$table.'
array_push(
$page['infos'],
- sprintf(
- l10n('%d categories moved'),
+ l10n_dec(
+ '%d category moved', '%d categories moved',
count($categories)
)
);
diff --git a/admin/intro.php b/admin/intro.php
index 326e66609..e23c5e9ab 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -4,8 +4,7 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@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$
// | revision : $Revision$
@@ -191,20 +190,20 @@ $template->assign_vars(
'OS' => PHP_OS,
'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',
'PHP_DATATIME' => $php_current_timestamp,
diff --git a/admin/tags.php b/admin/tags.php
index 4344170c6..777281761 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -4,7 +4,6 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
@@ -135,11 +134,11 @@ DELETE
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)
- )
);
}
diff --git a/admin/user_list.php b/admin/user_list.php
index ae1c0af36..bef1005fb 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | 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$
// | last update : $Date$
@@ -270,8 +270,8 @@ if (isset($_POST['delete']) and count($collection) > 0)
}
array_push(
$page['infos'],
- sprintf(
- l10n('%d users deleted'),
+ l10n_dec(
+ '%d user deleted', '%d users deleted',
count($collection)
)
);