diff --git a/js/viewfeed.js b/js/viewfeed.js index e32d3a99..e3db5803 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -979,9 +979,9 @@ function deleteSelection() { var str; if (getActiveFeedId() != 0) { - str = __("Delete %d selected articles in %s?"); + str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?" , rows.length); } else { - str = __("Delete %d selected articles?"); + str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length); } str = str.replace("%d", rows.length); @@ -1023,10 +1023,10 @@ function archiveSelection() { var op; if (getActiveFeedId() != 0) { - str = __("Archive %d selected articles in %s?"); + str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length); op = "archive"; } else { - str = __("Move %d archived articles back?"); + str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); op = "unarchive"; } @@ -1070,7 +1070,7 @@ function catchupSelection() { var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - var str = __("Mark %d selected articles in %s as read?"); + var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length); str = str.replace("%d", rows.length); str = str.replace("%s", fn); @@ -1317,7 +1317,7 @@ function catchupRelativeToArticle(below, id) { if (ids_to_mark.length == 0) { alert(__("No articles found to mark")); } else { - var msg = __("Mark %d article(s) as read?").replace("%d", ids_to_mark.length); + var msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length); if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) { diff --git a/plugins/digest/digest.js b/plugins/digest/digest.js index 19784741..c8a08648 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 += "
  • " + "" + "" + - __("%d more...").replace("%d", feeds.length-10) + + ngettext("%d more...", "%d more...", feeds.length-10).replace("%d", feeds.length-10) + "" + "
  • "; } diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js index b3b760f1..86b0458b 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 here.") + ngettext("Finished, exported %d article. You can download the data here.", "Finished, exported %d articles. You can download the data here.", 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 61b9a439..84524560 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 "

    " . - 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). "

    "; } else {