Improve the recently-added support for properly pluralized error messages

[postgresql] / src / backend / catalog / dependency.c

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 70c43cdec02dbc32733ec7e1eb8ee33a4b26848d..377ae8b712b451c507436e4884b854abc0fb8b10 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.86 2009/01/22 20:16:00 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.88 2009/06/04 18:33:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -885,8 +885,11 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
        }
 
        if (numNotReportedClient > 0)
-               appendStringInfo(&clientdetail, _("\nand %d other objects "
-                                                                                 "(see server log for list)"),
+               appendStringInfo(&clientdetail, ngettext("\nand %d other object "
+                                                                                                "(see server log for list)",
+                                                                                                "\nand %d other objects "
+                                                                                                "(see server log for list)",
+                                                                                                numNotReportedClient),
                                                 numNotReportedClient);
 
        if (!ok)
@@ -911,8 +914,10 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
        {
                ereport(msglevel,
                                /* translator: %d always has a value larger than 1 */
-                               (errmsg("drop cascades to %d other objects",
-                                               numReportedClient + numNotReportedClient),
+                               (errmsg_plural("drop cascades to %d other object",
+                                                          "drop cascades to %d other objects",
+                                                          numReportedClient + numNotReportedClient,
+                                                          numReportedClient + numNotReportedClient),
                                 errdetail("%s", clientdetail.data),
                                 errdetail_log("%s", logdetail.data)));
        }