From 49807c2b3db1f7c9a480d2fccadab036d4a0c422 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <tchvatal@suse.cz>
Date: Sun, 24 Mar 2013 13:32:03 +0100
Subject: Fix remaining plural forms to work with gettext.

---
 plugins/digest/digest.js               | 4 ++--
 plugins/import_export/import_export.js | 2 +-
 plugins/import_export/init.php         | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/digest/digest.js b/plugins/digest/digest.js
index 197847411..c8a08648c 100644
--- a/plugins/digest/digest.js
+++ b/plugins/digest/digest.js
@@ -68,7 +68,7 @@ function catchup_visible_articles(callback) {
 
 		var ids = get_visible_article_ids();
 
-		if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) {
+		if (confirm(ngettext("Mark %d displayed article as read?", "Mark %d displayed articles as read?", ids.length).replace("%d", ids.length))) {
 
 			var query = "?op=rpc&method=catchupSelected" +
 				"&cmode=0&ids=" + param_escape(ids);
@@ -515,7 +515,7 @@ function redraw_feedlist(feeds) {
 			$('feeds-content').innerHTML += "<li id='F-MORE-PROMPT'>" +
 				"<img src='images/blank_icon.gif'>" +
 				"<a href=\"#\" onclick=\"expand_feeds()\">" +
-				__("%d more...").replace("%d", feeds.length-10) +
+				ngettext("%d more...", "%d more...", feeds.length-10).replace("%d", feeds.length-10) +
 				"</a>" + "</li>";
 		}
 
diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js
index b3b760f15..86b0458be 100644
--- a/plugins/import_export/import_export.js
+++ b/plugins/import_export/import_export.js
@@ -37,7 +37,7 @@ function exportData() {
 								} else {
 
 									$("export_status_message").innerHTML =
-										__("Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>.")
+										ngettext("Finished, exported %d article. You can download the data <a class='visibleLink' href='%u'>here</a>.", "Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>.", exported)
 										.replace("%d", exported)
 										.replace("%u", "backend.php?op=pluginhandler&plugin=import_export&subop=exportget");
 
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index 61b9a439f..845245607 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -382,8 +382,10 @@ class Import_Export extends Plugin implements IHandler {
 			}
 
 			print "<p>" .
-				T_sprintf("Finished: %d articles processed, %d imported, %d feeds created.",
-					$num_processed, $num_imported, $num_feeds_created) .
+				vsprintf(__("Finished: ")).
+				vsprintf(ngettext("%d article processed, ", "%d articles processed, ", $num_processed), $num_processed).
+				vsprintf(ngettext("%d imported, ", "%d imported, ", $num_imported), $num_imported).
+				vsprintf(ngettext("%d feed created.", "%d feeds created.", $num_feeds_created), $num_feeds_created).
 					"</p>";
 
 		} else {
-- 
cgit v1.2.3-54-g00ecf