diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 6828e3ff2..ca4ae344f 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -55,7 +55,7 @@ class Pref_Feeds extends Handler_Protected {
$cat['items'] = $this->get_category_items($line['id']);
- $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
+ $cat['param'] = vsprintf(ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
if (count($cat['items']) > 0 || $show_empty_cats)
array_push($items, $cat);
@@ -172,7 +172,7 @@ class Pref_Feeds extends Handler_Protected {
$cat['items'] = $this->get_category_items($line['id']);
- $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
+ $cat['param'] = vsprintf(ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
if (count($cat['items']) > 0 || $show_empty_cats)
array_push($root['items'], $cat);
@@ -214,13 +214,13 @@ class Pref_Feeds extends Handler_Protected {
array_push($cat['items'], $feed);
}
- $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
+ $cat['param'] = vsprintf(ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
if (count($cat['items']) > 0 || $show_empty_cats)
array_push($root['items'], $cat);
$root['param'] += count($cat['items']);
- $root['param'] = T_sprintf('(%d feeds)', $root['param']);
+ $root['param'] = vsprintf(ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
} else {
$feed_result = db_query($this->link, "SELECT id, title, last_error,
@@ -245,7 +245,7 @@ class Pref_Feeds extends Handler_Protected {
array_push($root['items'], $feed);
}
- $root['param'] = T_sprintf('(%d feeds)', count($root['items']));
+ $root['param'] = vsprintf(ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
}
$fl = array();
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 51493a273..4055bca45 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -288,11 +288,9 @@ class Pref_Users extends Handler_Protected {
WHERE id = '$uid'");
if ($show_password) {
- print T_sprintf("Changed password of user %s
- to %s", $login, $tmp_user_pwd);
+ print T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd);
} else {
- print T_sprintf("Sending new password of user %s
- to %s", $login, $email);
+ print T_sprintf("Sending new password of user %s to %s", $login, $email);
}
require_once 'classes/ttrssmailer.php';
diff --git a/db-updater.php b/db-updater.php
index e6b3db06a..17a238d28 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -155,8 +155,8 @@ function confirmOP() {
}
}
- print "
".T_sprintf("Finished. Performed %d update(s) up to schema
- version %d.", $num_updates, $version)."
";
+ print "
".vsprintf(ngettext("Finished. Performed %d update up to schema version %d.",
+ "Finished. Performed %d updates up to schema version %d.", $num_updates), $num_updates, $version)."