adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Proposition of translations about:

Browse Source 
A recent picture is a last picture but a last picture is not a recent picture.
  A recent category is a last category but a last category is not a recent category.
So it's a proposition about last is not like recent.

Improvement of string including decimal number in order to concord singular and plural.
Now, function l10n_dec must be used.

git-svn-id: http://piwigo.org/svn/trunk@1637 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-12-06 23:56:24 +00:00
parent f880be0609
commit fddfd816a7
6 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_notification.inc.php
+11 -18
View File
@@ -347,11 +347,11 @@ function news_exists($start, $end)
/**
* Formats a news line and adds it to the array (e.g. '5 new elements')
*/
function add_news_line(&$news, $count, $format, $url='', $add_url=false)
function add_news_line(&$news, $count, $singular_fmt_key, $plural_fmt_key, $url='', $add_url=false)
{
if ($count > 0)
{
$line = sprintf($format, $count);
$line = l10n_dec($singular_fmt_key, $plural_fmt_key, $count);
if ($add_url and !empty($url) )
{
$line = '<a href="'.$url.'">'.$line.'</a>';
@@ -381,39 +381,32 @@ function news($start, $end, $exclude_img_cats=false, $add_url=false)
if (!$exclude_img_cats)
{
$nb_new_elements = nb_new_elements($start, $end);
if ($nb_new_elements > 0)
{
array_push($news, sprintf(l10n('%d new elements'), $nb_new_elements));
}
add_news_line( $news,
nb_new_elements($start, $end), '%d new element', '%d new elements');
}
if (!$exclude_img_cats)
{
$nb_updated_categories = nb_updated_categories($start, $end);
if ($nb_updated_categories > 0)
{
array_push($news, sprintf(l10n('%d categories updated'),
$nb_updated_categories));
}
{
add_news_line( $news,
nb_updated_categories($start, $end), '%d category updated', '%d categories updated');
}
add_news_line( $news,
nb_new_comments($start, $end), l10n('%d new comments'),
nb_new_comments($start, $end), '%d new comment', '%d new comments',
get_root_url().'comments.php', $add_url );
if (is_admin())
{
add_news_line( $news,
nb_unvalidated_comments($end), l10n('%d comments to validate'),
nb_unvalidated_comments($end), '%d comment to validate', '%d comments to validate',
get_root_url().'admin.php?page=comments', $add_url );
add_news_line( $news,
nb_new_users($start, $end), l10n('%d new users'),
nb_new_users($start, $end), '%d new user', '%d new users',
get_root_url().'admin.php?page=user_list', $add_url );
add_news_line( $news,
nb_waiting_elements(), l10n('%d waiting elements'),
nb_waiting_elements(), '%d waiting element', '%d waiting elements',
get_root_url().'admin.php?page=waiting', $add_url );
}