public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 03:25:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #77 from scarabeusiv/master

Browse Source 
Fix pluralized forms and whitespace in translations and fix the l10n tools
This commit is contained in:
Andrew Dolgov
2013-03-24 09:00:55 -07:00
parent 7be3fcd5e1 a28c6ec9db
commit 8850646ff3
44 changed files with 18998 additions and 17163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/pref/feeds.php
View File

@@ -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();

6
classes/pref/users.php
View File

@@ -288,11 +288,9 @@ class Pref_Users extends Handler_Protected {
WHERE id = '$uid'");
if ($show_password) {
print T_sprintf("Changed password of user <b>%s</b>
to <b>%s</b>", $login, $tmp_user_pwd);
print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd);
} else {
print T_sprintf("Sending new password of user <b>%s</b>
to <b>%s</b>", $login, $email);
print T_sprintf("Sending new password of user <b>%s</b> to <b>%s</b>", $login, $email);
}
require_once 'classes/ttrssmailer.php';