Fix to use the same format specifiers in both branches of a ngettext().

Zdenek Kotala

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 0391b8f4cae4a4f094b003f69cbd0bc2329785c3..2c0cd2260e0746645c83d0ff4a70d4ca295dc1f3 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.212 2009/05/05 02:29:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.213 2009/05/27 20:47:55 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -2036,7 +2036,7 @@ describeRoles(const char *pattern, bool verbose)
                        if (conns == 0)
                                appendPQExpBuffer(&buf, _("No connections"));
                        else
-                               appendPQExpBuffer(&buf, ngettext("1 connection", "%d connections", conns), conns);
+                               appendPQExpBuffer(&buf, ngettext("%d connection", "%d connections", conns), conns);
                }
 
                attr[i] = pg_strdup(buf.data);

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index ab6a04ea1e3faaa5f5937bbe9cb4233d16c03087..fd869c655246ee7973b6ebda9efa73b76458dbbb 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.112 2009/04/11 14:11:45 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.113 2009/05/27 20:47:55 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -2348,7 +2348,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *f
                char            default_footer[100];
 
                total_records = opt->topt.prior_records + cont.nrows;
-               snprintf(default_footer, 100, ngettext("(1 row)", "(%lu rows)", total_records), total_records);
+               snprintf(default_footer, 100, ngettext("(%lu row)", "(%lu rows)", total_records), total_records);
 
                printTableAddFooter(&cont, default_footer);
        }