Commit 84f2f5c0 authored by Peter Eisentraut's avatar Peter Eisentraut

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

Zdenek Kotala
parent 6ec07531
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * 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" #include "postgres_fe.h"
...@@ -2036,7 +2036,7 @@ describeRoles(const char *pattern, bool verbose) ...@@ -2036,7 +2036,7 @@ describeRoles(const char *pattern, bool verbose)
if (conns == 0) if (conns == 0)
appendPQExpBuffer(&buf, _("No connections")); appendPQExpBuffer(&buf, _("No connections"));
else 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); attr[i] = pg_strdup(buf.data);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2009, PostgreSQL Global Development Group * 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" #include "postgres_fe.h"
...@@ -2348,7 +2348,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *f ...@@ -2348,7 +2348,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout, FILE *f
char default_footer[100]; char default_footer[100];
total_records = opt->topt.prior_records + cont.nrows; 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); printTableAddFooter(&cont, default_footer);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment