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

petere · petere · commit 84f2f5c023ee · 2009-05-27T20:47:55.000Z
Zdenek Kotala
diff --git 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
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.212 2009/05/05 02:29:06 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.213 2009/05/27 20:47:55 petere Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include "postgres_fe.h"`
`14`	`14`
`@@ -2036,7 +2036,7 @@ describeRoles(const char *pattern, bool verbose)`
`2036`	`2036`	`if (conns == 0)`
`2037`	`2037`	`appendPQExpBuffer(&buf, _("No connections"));`
`2038`	`2038`	`else`
`2039`		`- appendPQExpBuffer(&buf, ngettext("1 connection", "%d connections", conns), conns);`
	`2039`	`+ appendPQExpBuffer(&buf, ngettext("%d connection", "%d connections", conns), conns);`
`2040`	`2040`	`}`
`2041`	`2041`
`2042`	`2042`	`attr[i] = pg_strdup(buf.data);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.112 2009/04/11 14:11:45 petere Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.113 2009/05/27 20:47:55 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -2348,7 +2348,7 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE fout, FILE f`
`2348`	`2348`	`char default_footer[100];`
`2349`	`2349`
`2350`	`2350`	`total_records = opt->topt.prior_records + cont.nrows;`
`2351`		`- snprintf(default_footer, 100, ngettext("(1 row)", "(%lu rows)", total_records), total_records);`
	`2351`	`+ snprintf(default_footer, 100, ngettext("(%lu row)", "(%lu rows)", total_records), total_records);`
`2352`	`2352`
`2353`	`2353`	`printTableAddFooter(&cont, default_footer);`
`2354`	`2354`	`}`